Merge branch 'develop' into clean_up

[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 a8ba8cc..f7adb5d 100644 (file)
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -24,9 +24,13 @@
   <string name="prefs_log_summary_history">This shows the recorded logs</string>
   <string name="prefs_log_delete_history_button">Delete History</string>
   <string name="prefs_help">Help</string>
+  <string name="prefs_recommend">Recommend to a friend</string>
   <string name="prefs_feedback">Feedback</string>
   <string name="prefs_imprint">Imprint</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_account_name">Account name</string>
   <string name="auth_host_url">Server address</string>
   <string name="auth_username">Username</string>
   <string name="auth_password">Password</string>
@@ -92,6 +96,7 @@
   <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
   <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
   <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronisation. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
+  <string name="sync_current_folder_was_removed">Folder %1$s does not exist anymore</string>
   <string name="foreign_files_move">Move all</string>
   <string name="foreign_files_success">All files were moved</string>
   <string name="foreign_files_fail">Some files could not be moved</string>
@@ -144,7 +149,13 @@
   <string name="auth_oauth_error">Unsuccessful authorisation</string>
   <string name="auth_oauth_error_access_denied">Access denied by authorisation server</string>
   <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+  <string name="auth_expired_oauth_token_toast">Your authorisation expired. Please, authorise again</string>
   <string name="auth_expired_basic_auth_toast">Please enter the current password</string>
+  <string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
+  <string name="auth_connecting_auth_server">Connecting to authentication server…</string>
+  <string name="auth_follow_auth_server">Follow instructions above to get authenticated</string>
+  <string name="auth_unsupported_auth_method">The server does not support this authentication method</string>
+  <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
   <string name="fd_keep_in_sync">Keep file up to date</string>
   <string name="common_rename">Rename</string>
   <string name="common_remove">Remove</string>