Merge pull request #967 from owncloud/fix_upload_fails_sending_another_app

Fixed fail in upload sent from the private storage of other app

diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index c25cd83..ebb6be7 100644 (file)
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -260,6 +260,8 @@
   <string name="share_link_file_error">Terjadi kesalahan saat mencoba membagikan berkas atau folder ini</string>
   <string name="unshare_link_file_no_exist">Tidak dapat menghapus berbagi. Mohon periksa apakah berkas ada</string>
   <string name="unshare_link_file_error">Terjadi kesalahan saat mencoba menghapus berbagi berkas dan folder ini</string>
+  <string name="share_link_password_title">Masukkan sandi</string>
+  <string name="share_link_empty_password">Anda harus memasukkan sandi</string>
   <string name="activity_chooser_send_file_title">Kirim</string>
   <string name="copy_link">Salin tautan</string>
   <string name="clipboard_text_copied">Disalin ke papan klip</string>

diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index 430b55d..77e26fa 100644 (file)
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -303,7 +303,7 @@
   <string name="prefs_category_instant_uploading">自動アップロード</string>
   <string name="prefs_category_security">セキュリティ</string>
   <string name="prefs_instant_video_upload_path_title">動画のアップロードパス</string>
-  <string name="download_folder_failed_content">%1$s ã\81®ã\83\95ã\82©ã\83«ã\83\80ã\81®ã\83\80ã\82¦ã\83³ã\83­ã\83¼ã\83\89ã\81\8cå®\8cäº\86ã\81\97ã\81¾ã\81\9bã\82\93ã\81§ã\81\97ã\81\9fã\80\82</string>
+  <string name="download_folder_failed_content">%1$s ã\83\95ã\82©ã\83«ã\83\80ã\83¼ã\81®ã\83\80ã\82¦ã\83³ã\83­ã\83¼ã\83\89ã\81\8cå®\8cäº\86ã\81\97ã\81¾ã\81\9bã\82\93ã\81§ã\81\97ã\81\9f</string>
   <string name="subject_token">%1$sがあなたと\"%2$s\"を共有しました</string>
   <string name="auth_refresh_button">再接続中</string>
   <string name="auth_host_address">サーバーアドレス</string>