From: purigarcia <pgarcia@solidgear.es>
Date: Tue, 10 Mar 2015 09:30:31 +0000 (+0100)
Subject: Merge branch 'develop' into share_password_support
X-Git-Tag: oc-android-1.7.1_signed^2~27^2^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/24d67823860c34bccb1bd0ba6c127ba1bb5c6fd1?hp=40ca3d9b219505a935d0aadd5834d5448a6a88ce

Merge branch 'develop' into share_password_support
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 16523c3d..0dd68c1f 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 16523c3d4ef9a5ec70820bea74f90bdd8ff1c2fe
+Subproject commit 0dd68c1f65c31bd716b2de26e644c87c98e9b9c2
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f1ad81e8..b58f7983 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -187,6 +187,7 @@
   <string name="auth_fail_get_user_name">서버에서 올바른 사용자 ID를 반환하지 않았습니다. 관리자에게 연락하십시오
 	</string>
   <string name="auth_can_not_auth_against_server">이 서버에 인증할 수 없음</string>
+  <string name="auth_account_does_not_exist">장치에 아직 계정이 존재하지 않습니다.</string>
   <string name="fd_keep_in_sync">파일을 최신 정보로 유지</string>
   <string name="common_rename">이름 바꾸기</string>
   <string name="common_remove">삭제</string>
@@ -298,4 +299,5 @@
   <string name="prefs_category_security">보안</string>
   <string name="prefs_instant_video_upload_path_title">동영상 업로드 경로</string>
   <string name="download_folder_failed_content">%1$s 폴더를 다운로드할 수 없습니다</string>
+  <string name="subject_token">%1$s에서 \"%2$s\"를 당신과 공유하였습니다.</string>
 </resources>