X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/f448a36456da71de80abbdafdeeec7f6ac80267f..fdcf0ebbc8a519dd53b5ac511f664e41f2ef38ee:/res/values-en-rGB/strings.xml?ds=inline

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d8163f3e..f0c7acde 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,10 +19,16 @@
   </string-array>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
+  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+  <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <!--TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_open">Open</string>
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">More</string>
   <string name="prefs_accounts">Accounts</string>
   <string name="prefs_manage_accounts">Manage Accounts</string>
+  <string name="prefs_passcode">Passcode lock</string>
   <string name="prefs_instant_upload">Instant picture uploads</string>
   <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
   <string name="prefs_instant_video_upload">Instant video uploads</string>
@@ -60,12 +66,7 @@
   <string name="uploader_info_uploading">Uploading</string>
   <string name="file_list_seconds_ago">seconds ago</string>
   <string name="file_list_empty">Nothing in here. Upload something!</string>
-  <string name="file_list_loading">Loading...</string>
   <string name="local_file_list_empty">There are no files in this folder.</string>
-  <string name="file_list_folder">folder</string>
-  <string name="file_list_folders">folders</string>
-  <string name="file_list_file">file</string>
-  <string name="file_list_files">files</string>
   <string name="filedetails_select_file">Tap on a file to display additional information.</string>
   <string name="filedetails_size">Size:</string>
   <string name="filedetails_type">Type:</string>
@@ -126,6 +127,15 @@
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remote: %1$s</string>
   <string name="upload_query_move_foreign_files">There is not enough space to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
+  <string name="pass_code_enter_pass_code">Please, insert your passcode</string>
+  <string name="pass_code_configure_your_pass_code">Enter your passcode</string>
+  <string name="pass_code_configure_your_pass_code_explanation">The passcode will be requested every time the app is started</string>
+  <string name="pass_code_reenter_your_pass_code">Please, reenter your passcode</string>
+  <string name="pass_code_remove_your_pass_code">Remove your passcode</string>
+  <string name="pass_code_mismatch">The passcodes are not the same</string>
+  <string name="pass_code_wrong">Incorrect passcode</string>
+  <string name="pass_code_removed">Passcode removed</string>
+  <string name="pass_code_stored">Passcode stored</string>
   <string name="media_notif_ticker">%1$s music player</string>
   <string name="media_state_playing">%1$s (playing)</string>
   <string name="media_state_loading">%1$s (loading)</string>
@@ -178,15 +188,14 @@
 	</string>
   <string name="auth_can_not_auth_against_server">Cannot authenticate against this server</string>
   <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
-  <string name="fd_keep_in_sync">Keep file up to date</string>
+  <string name="favorite">Favourite</string>
+  <string name="unfavorite">Unfavourite</string>
   <string name="common_rename">Rename</string>
   <string name="common_remove">Remove</string>
   <string name="confirmation_remove_alert">Do you really want to remove %1$s?</string>
   <string name="confirmation_remove_folder_alert">Do you really want to remove %1$s and its contents?</string>
   <string name="confirmation_remove_local">Local only</string>
-  <string name="confirmation_remove_folder_local">Local contents only</string>
-  <string name="confirmation_remove_remote">Remove from server</string>
-  <string name="confirmation_remove_remote_and_local">Remote and local</string>
+  <string name="confirmation_remove_folder_local">Local only</string>
   <string name="remove_success_msg">Removal succeeded</string>
   <string name="remove_fail_msg">Removal failed</string>
   <string name="rename_dialog_title">Enter a new name</string>
@@ -201,6 +210,7 @@
   <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="activity_chooser_title">Send link to …</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Copying file from private storage</string>
   <string name="oauth_check_onoff">Log in with oAuth2</string>
   <string name="oauth_login_connection">Connecting to oAuth2 server…</string>
   <string name="ssl_validator_header">The identity of the site could not be verified</string>
@@ -236,11 +246,7 @@
   <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
   <string name="instant_video_upload_on_wifi">Upload videos via WiFi only</string>
   <string name="instant_upload_path">/InstantUpload</string>
-  <string name="conflict_title">Update conflict</string>
-  <string name="conflict_message">Remote file %s is not synchronised with local file. Continuing will replace content of file on server.</string>
   <string name="conflict_keep_both">Keep both</string>
-  <string name="conflict_overwrite">Overwrite</string>
-  <string name="conflict_dont_upload">Don\'t upload</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 folder</string>
@@ -272,7 +278,7 @@
   <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
   <string name="prefs_category_accounts">Accounts</string>
   <string name="prefs_add_account">Add account</string>
-  <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
+  <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
   <string name="actionbar_logger">Logs</string>
   <string name="log_send_history_button">Send History</string>
   <string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
@@ -288,11 +294,12 @@
   <string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
   <string name="move_file_error">An error occurred whilst trying to move this file or folder</string>
   <string name="forbidden_permissions_move">to move this file</string>
+  <string name="copy_file_invalid_overwrite">The file exists already in the destination folder</string>
   <string name="prefs_category_instant_uploading">Instant Uploads</string>
   <string name="prefs_category_security">Security</string>
   <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
   <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
-  <string name="subject_token">%1$s shared \"%2$s\" with you</string>
   <string name="auth_refresh_button">Refresh connection</string>
   <string name="auth_host_address">Server address</string>
+  <string name="common_error_out_memory">Not enough memory</string>
 </resources>