Merge branch 'develop' into release-1.5.4

[pub/Android/ownCloud.git] / res / values-en-rGB / strings.xml

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 678df10..0562dd7 100644 (file)
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -30,7 +30,7 @@
   <string name="recommend_subject">Try %1$s on your smartphone!</string>
   <string name="recommend_text">I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s</string>
   <string name="auth_check_server">Check Server</string>
   <string name="recommend_subject">Try %1$s on your smartphone!</string>
   <string name="recommend_text">I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s</string>
   <string name="auth_check_server">Check Server</string>

-  <string name="auth_host_url">Server address</string>
+  <string name="auth_host_url">Server address https://…</string>

   <string name="auth_username">Username</string>
   <string name="auth_password">Password</string>
   <string name="auth_register">New to %1$s?</string>
   <string name="auth_username">Username</string>
   <string name="auth_password">Password</string>
   <string name="auth_register">New to %1$s?</string>


@@ -175,6 +175,7 @@
   <string name="sync_file_fail_msg">Remote file could not be checked</string>
   <string name="sync_file_nothing_to_do_msg">File contents already synchronised</string>
   <string name="create_dir_fail_msg">Directory could not be created</string>
   <string name="sync_file_fail_msg">Remote file could not be checked</string>
   <string name="sync_file_nothing_to_do_msg">File contents already synchronised</string>
   <string name="create_dir_fail_msg">Directory could not be created</string>

+  <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : \" | ? *</string>

   <string name="wait_a_moment">Wait a moment</string>
   <string name="filedisplay_unexpected_bad_get_content">Unexpected problem; please select the file from a different app</string>
   <string name="filedisplay_no_file_selected">No file was selected</string>
   <string name="wait_a_moment">Wait a moment</string>
   <string name="filedisplay_unexpected_bad_get_content">Unexpected problem; please select the file from a different app</string>
   <string name="filedisplay_no_file_selected">No file was selected</string>


@@ -218,7 +219,7 @@
   <string name="preview_image_description">Image preview</string>
   <string name="preview_image_error_unknown_format">This image cannot be shown</string>
   <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>
   <string name="preview_image_description">Image preview</string>
   <string name="preview_image_error_unknown_format">This image cannot be shown</string>
   <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>

-  <string name="actionbar_failed_instant_upload">Failed InstantUpload\"</string>
+  <string name="actionbar_failed_instant_upload">Failed InstantUpload</string>

   <string name="failed_upload_headline_text">Failed instant uploads</string>
   <string name="failed_upload_headline_hint">Summary of all failed instant uploads</string>
   <string name="failed_upload_all_cb">select all</string>
   <string name="failed_upload_headline_text">Failed instant uploads</string>
   <string name="failed_upload_headline_hint">Summary of all failed instant uploads</string>
   <string name="failed_upload_all_cb">select all</string>