X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b232d156072d9d83ee73bb89cbcee80132c0431f..8cfafef514b1cd7979d7a8a4e71f34a9737a0cff:/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 a4243a57..561a719a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -7,7 +7,7 @@
   <string name="actionbar_upload_from_apps">Content from other apps</string>
   <string name="actionbar_upload_files">Files</string>
   <string name="actionbar_open_with">Open with</string>
-  <string name="actionbar_mkdir">Create directory</string>
+  <string name="actionbar_mkdir">New folder</string>
   <string name="actionbar_settings">Settings</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_send_file">Send</string>
@@ -17,8 +17,10 @@
   <string name="prefs_manage_accounts">Manage Accounts</string>
   <string name="prefs_pincode">App PIN</string>
   <string name="prefs_pincode_summary">Protect your client</string>
-  <string name="prefs_instant_upload">Enable instant uploads</string>
-  <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</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>
+  <string name="prefs_instant_video_upload_summary">Instantly upload videos recorded by camera</string>
   <string name="prefs_log_title">Enable Logging</string>
   <string name="prefs_log_summary">This is used to log problems</string>
   <string name="prefs_log_title_history">Logging History</string>
@@ -29,7 +31,7 @@
   <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="recommend_text">\"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s\"\n\t</string>
   <string name="auth_check_server">Check Server</string>
   <string name="auth_host_url">Server address https://…</string>
   <string name="auth_username">Username</string>
@@ -38,7 +40,7 @@
   <string name="sync_string_files">Files</string>
   <string name="setup_btn_connect">Connect</string>
   <string name="uploader_btn_upload_text">Upload</string>
-  <string name="uploader_top_message">Choose upload directory:</string>
+  <string name="uploader_top_message">Choose upload folder:</string>
   <string name="uploader_wrn_no_account_title">No account found</string>
   <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
@@ -47,7 +49,9 @@
   <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
   <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
   <string name="uploader_info_uploading">Uploading</string>
-  <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</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="filedetails_select_file">Tap on a file to display additional information.</string>
   <string name="filedetails_size">Size:</string>
   <string name="filedetails_type">Type:</string>
@@ -73,13 +77,14 @@
   <string name="delete_account">Delete account</string>
   <string name="create_account">Create account</string>
   <string name="upload_chooser_title">Upload from …</string>
-  <string name="uploader_info_dirname">Directory name</string>
+  <string name="uploader_info_dirname">Folder name</string>
   <string name="uploader_upload_in_progress_ticker">Uploading …</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
   <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
   <string name="uploader_upload_failed_ticker">Upload failed</string>
   <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
+  <string name="uploader_upload_failed_credentials_error">Upload failed, you need to login again</string>
   <string name="downloader_download_in_progress_ticker">Downloading …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download succeeded</string>
@@ -87,8 +92,10 @@
   <string name="downloader_download_failed_ticker">Download failed</string>
   <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
   <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
+  <string name="downloader_download_failed_credentials_error">Download failed, you need to login again</string>
   <string name="common_choose_account">Choose account</string>
   <string name="sync_fail_ticker">Synchronisation failed</string>
+  <string name="sync_fail_ticker_unauthorized">Synchronisation failed, you need to relogin</string>
   <string name="sync_fail_content">Synchronisation of %1$s could not be completed</string>
   <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
@@ -96,8 +103,8 @@
   <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
   <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be synced (%2$d conflicts)</string>
   <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 remote file(s) in %5$s they were linked to.</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s folder 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 folder and retain the link to %4$s.\n\nListed below are the local file(s), and 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>
@@ -133,6 +140,7 @@
   <string name="media_rewind_description">Rewind button</string>
   <string name="media_play_pause_description">Play or pause button</string>
   <string name="media_forward_description">Fast-forward button</string>
+  <string name="auth_getting_authorization">Getting authorisation…</string>
   <string name="auth_trying_to_login">Trying to login…</string>
   <string name="auth_no_net_conn_title">No network connection</string>
   <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
@@ -161,13 +169,13 @@
   <string name="auth_connecting_auth_server">Connecting to authentication server…</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="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator</string>
+  <string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator\n\t</string>
   <string name="auth_can_not_auth_against_server">Cannot authenticate against this server</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>
-  <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_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>
@@ -179,8 +187,9 @@
   <string name="rename_server_fail_msg">Rename could not be completed</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="create_dir_fail_msg">Folder could not be created</string>
   <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">File name cannot be empty</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,6 +227,7 @@
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
   <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>
@@ -226,19 +236,8 @@
   <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 directory</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_retryall_btn">retry all selected</string>
-  <string name="failed_upload_headline_delete_all_btn">delete all  selected from uploadqueue</string>
-  <string name="failed_upload_retry_text">retry uploading the image: </string>
-  <string name="failed_upload_load_more_images">Load more Pictures</string>
-  <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
-  <string name="failed_upload_failure_text">Failure Message: </string>
-  <string name="failed_upload_quota_exceeded_text">Please check your server configuration, perhaps your quota is exceeded.</string>
-  <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your administrator.</string>
+  <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
+  <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your\n\t\tadministrator.</string>
   <string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
   <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
   <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
@@ -246,4 +245,19 @@
   <string name="activity_chooser_send_file_title">Send</string>
   <string name="copy_link">Copy link</string>
   <string name="clipboard_text_copied">Copied to clipboard</string>
+  <string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
+  <string name="network_error_socket_exception">An error occurred whilst connecting to the server.</string>
+  <string name="network_error_socket_timeout_exception">An error occurred whilst waiting for the server, the operation couldn\'t be done</string>
+  <string name="network_error_connect_timeout_exception">An error occurred whilst waiting for the server, the operation couldn\'t been done</string>
+  <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
+  <string name="empty"></string>
+  <string name="forbidden_permissions">You do not have permission %s</string>
+  <string name="forbidden_permissions_rename">to rename this file</string>
+  <string name="forbidden_permissions_delete">to delete this file</string>
+  <string name="share_link_forbidden_permissions">to share this file</string>
+  <string name="unshare_link_forbidden_permissions">to unshare this file</string>
+  <string name="forbidden_permissions_create">to create the file</string>
+  <string name="uploader_upload_forbidden_permissions">to upload to this folder</string>
+  <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
+  <string name="prefs_category_accounts">Accounts</string>
 </resources>