Merge pull request #902 from comradekingu/language

Revamp of upstream strings

src/main/res/values/strings.xml

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Fingerprint lock</string>
     <string name="prefs_fingerprint_notsetup">No fingerprints have been set up.</string>
     <string name="prefs_show_hidden_files">Show hidden files</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_instant_upload">Instant uploading of pictures</string>
+    <string name="prefs_instant_upload_summary">Upload pictures taken by camera instantly</string>
+    <string name="prefs_instant_video_upload">Instant uploading of video</string>
+    <string name="prefs_instant_video_upload_summary">Upload videos recorded by camera instantly</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>
@@ -58,23 +58,23 @@
     <string name="prefs_calendar_contacts">Sync calendar &amp; contacts</string>
     <string name="prefs_calendar_contacts_summary">Set up DAVdroid (v1.3.0+) for current account</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Server address for account could not be resolved for DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">No Google Play store or F-Droid app installed</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Calendar &amp; contacts sync set up successfully</string>
+    <string name="prefs_calendar_contacts_no_store_error">Neither F-droid nor Google Play is installed</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Calendar &amp; contacts sync set up</string>
     <string name="prefs_help">Help</string>
-    <string name="prefs_recommend">Recommend to a friend</string>
+    <string name="prefs_recommend">Recommend to friend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>
-    <string name="prefs_remember_last_share_location">Remember share location</string>
-    <string name="prefs_remember_last_upload_location_summary">Remember last share upload location</string>
+    <string name="prefs_remember_last_share_location">Remember location of share</string>
+    <string name="prefs_remember_last_upload_location_summary">Remember location of share most recently used</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"</string>
 
     <string name="auth_check_server">Check server</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">Don’t have a server yet?\nClick here to get one from a provider</string>
+    <string name="auth_register">Do you not have a server yet?\nClick here to get one from a provider</string>
     <string name="sync_string_files">Files</string>
     <string name="setup_btn_connect">Connect</string>
     <string name="uploader_btn_upload_text">Upload</string>
@@ -86,43 +86,43 @@
     <string name="uploader_error_title_no_file_to_upload">No file to upload</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s cannot upload a piece of text as a file.</string>
     <string name="uploader_error_message_no_file_to_upload">Received data did not include a valid file.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">File cannot be uploaded</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">This file can not be uploaded</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s is not allowed to read a received file</string>
-    <string name="uploader_error_message_source_file_not_found">File to upload was not found in its location. Please check whether the file exists.</string>
-    <string name="uploader_error_message_source_file_not_copied">An error occurred while copying the file to a temporary folder. Please try to send again.</string>
+    <string name="uploader_error_message_source_file_not_found">File selected for upload not found. Please check whether the file exists.</string>
+    <string name="uploader_error_message_source_file_not_copied">Could not copy file to a temporary folder. Try to resend it.</string>
     <string name="uploader_upload_files_behaviour">Upload option:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to Nextcloud folder</string>
     <string name="uploader_upload_files_behaviour_only_upload">Keep file in source folder</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Delete file from source folder</string>
     <string name="file_list_seconds_ago">seconds ago</string>
-    <string name="file_list_empty_headline">No files in here</string>
-    <string name="file_list_empty">Upload some content or sync with your devices!</string>
-    <string name="file_list_empty_favorites">Favorite some files or sync with your devices!</string>
-    <string name="file_list_empty_favorites_filter_list">Files and folders you mark as favorite will show up here</string>
-    <string name="file_list_empty_favorites_filter">No favorited files found for your query!</string>
+    <string name="file_list_empty_headline">No files here</string>
+    <string name="file_list_empty">Upload some content or sync with your devices.</string>
+    <string name="file_list_empty_favorites">Favorite some files or sync with your devices.</string>
+    <string name="file_list_empty_favorites_filter_list">Files and folders you mark as favorites will show up here</string>
+    <string name="file_list_empty_favorites_filter">Your search returned no favorited files.</string>
     <string name="file_list_loading">Loading&#8230;</string>
-    <string name="file_list_no_app_for_file_type">No app found for file type!</string>
+    <string name="file_list_no_app_for_file_type">No app set up to handle this file type.</string>
     <string name="local_file_list_empty">There are no files in this folder.</string>
     <string name="file_list_empty_headline_search">No results in this folder</string>
     <string name="file_list_empty_headline_server_search">No results</string>
-    <string name="file_list_empty_favorite_headline">No favorites yet</string>
+    <string name="file_list_empty_favorite_headline">Nothing favorited yet</string>
     <string name="file_list_empty_shared_headline">Nothing shared yet</string>
     <string name="file_list_empty_shared">Files and folders you share will show up here</string>
     <string name="file_list_empty_headline_server_search_videos">No videos</string>
     <string name="file_list_empty_headline_server_search_photos">No photos</string>
-    <string name="file_list_empty_search">Try looking in another folder?</string>
-    <string name="file_list_empty_recently_modified">No files modified in the last 7 days found</string>
-    <string name="file_list_empty_recently_modified_filter">No files for your query that were modified
-        in the last 7 days found!</string>
-    <string name="file_list_empty_recently_added">No recently added files found</string>
-    <string name="file_list_empty_recently_added_filter">No recently added files for your query found!</string>
-    <string name="file_list_empty_text_photos">Upload some photos or activate auto upload!</string>
-    <string name="file_list_empty_text_photos_filter">No photos for your query found!</string>
-    <string name="file_list_empty_text_videos">Upload some videos or activate auto upload!</string>
-    <string name="file_list_empty_text_videos_filter">No videos for your query found!</string>
+    <string name="file_list_empty_search">Maybe it is in a different folder?</string>
+    <string name="file_list_empty_recently_modified">Found no files modified during the last 7 days</string>
+    <string name="file_list_empty_recently_modified_filter">Your search returned no files modified
+        in the last 7 days.</string>
+    <string name="file_list_empty_recently_added">Found no recently added files</string>
+    <string name="file_list_empty_recently_added_filter">Your search returned no recently added files.</string>
+    <string name="file_list_empty_text_photos">Upload some photos or activate auto upload.</string>
+    <string name="file_list_empty_text_photos_filter">Your search returned no photos.</string>
+    <string name="file_list_empty_text_videos">Upload some videos or activate auto upload.</string>
+    <string name="file_list_empty_text_videos_filter">Your search returned no videos.</string>
     <string name="upload_list_empty_headline">No uploads available</string>
-    <string name="upload_list_empty_text">Upload some content or activate instant upload!</string>
-    <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload!</string>
+    <string name="upload_list_empty_text">Upload some content or activate instant uploading.</string>
+    <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
     <string name="file_list_folder">folder</string>
     <string name="file_list_folders">folders</string>
     <string name="file_list_file">file</string>
@@ -134,14 +134,14 @@
     <string name="filedetails_modified">Modified:</string>
     <string name="filedetails_download">Download</string>
     <string name="filedetails_sync_file">Synchronize</string>
-    <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
-    <string name="list_layout">List layout</string>
+    <string name="filedetails_renamed_in_upload_msg">File renamed to %1$s during upload</string>
+    <string name="list_layout">Listed layout</string>
     <string name="action_share">Share</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
     <string name="common_remove_upload">Remove upload</string>
-    <string name="common_retry_upload">Retry upload</string>
+    <string name="common_retry_upload">Retry uploading</string>
     <string name="common_cancel_sync">Cancel sync</string>
     <string name="common_cancel">Cancel</string>
     <string name="common_back">Back</string>
@@ -161,10 +161,10 @@
     <string name="uploader_info_dirname">Folder name</string>
     <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</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_ticker">Uploaded</string>
     <string name="uploader_upload_succeeded_content_single">%1$s 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_content_single">Could not upload %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Upload failed, you need to log in again</string>
     <string name="uploads_view_title">Uploads</string>
     <string name="uploads_view_group_current_uploads">Current</string>
@@ -181,38 +181,38 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Local file not found</string>
     <string name="uploads_view_upload_status_failed_permission_error">Permission error</string>
     <string name="uploads_view_upload_status_conflict">Conflict</string>
-    <string name="uploads_view_upload_status_service_interrupted">App was terminated</string>
+    <string name="uploads_view_upload_status_service_interrupted">App terminated</string>
     <string name="uploads_view_upload_status_unknown_fail">Unknown error</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Waiting for wifi connectivity</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Waiting for Wi-Fi connectivity</string>
     <string name="uploads_view_later_waiting_to_upload">Waiting to upload</string>
     <string name="uploads_view_group_header" translatable="false">%1$s (%2$d)</string>
     <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Download succeeded</string>
+    <string name="downloader_download_succeeded_ticker">Downloaded</string>
     <string name="downloader_download_succeeded_content">%1$s downloaded</string>
     <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_download_failed_content">Could not download %1$s</string>
     <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
     <string name="downloader_download_failed_credentials_error">Download failed, you need to log in again</string>
     <string name="common_choose_account">Choose account</string>
     <string name="sync_fail_ticker">Sync failed</string>
-    <string name="sync_fail_ticker_unauthorized">Sync failed; you need to log in again</string>
-    <string name="sync_fail_content">Sync of %1$s could not be completed</string>
-    <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
+    <string name="sync_fail_ticker_unauthorized">Sync failed, you need to log in again</string>
+    <string name="sync_fail_content">Could not complete sync of %1$s</string>
+    <string name="sync_fail_content_unauthorized">Wrong password for %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
     <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
     <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 sync\'ed (%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 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 synchronization. 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="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 with earlier versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. 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">The 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>
     <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="upload_query_move_foreign_files">Insufficient space prevents copying the selected files into the %1$s folder. Would you like to move them there instead?</string>
     <string name="pass_code_enter_pass_code">Please enter your passcode</string>
     
     <string name="pass_code_configure_your_pass_code">Enter your passcode</string>
@@ -230,16 +230,16 @@
     <string name="media_event_done">"%1$s playback finished"</string>
     <string name="media_err_nothing_to_play">No media file found</string>
     <string name="media_err_no_account">No account provided</string>
-    <string name="media_err_not_in_owncloud">File not in a valid account</string>
+    <string name="media_err_not_in_owncloud">The file is not in a valid account</string>
     <string name="media_err_unsupported">Unsupported media codec</string>
-    <string name="media_err_io">Media file could not be read</string>
-    <string name="media_err_malformed">Media file not correctly encoded</string>
-    <string name="media_err_timeout">Timed out while trying to play</string>
-    <string name="media_err_invalid_progressive_playback">Media file cannot be streamed</string>
-    <string name="media_err_unknown">Media file cannot be played with the stock media player</string>
-    <string name="media_err_security_ex">Security error trying to play %1$s</string>
-    <string name="media_err_io_ex">Input error trying to play %1$s</string>
-    <string name="media_err_unexpected">Unexpected error trying to play %1$s</string>
+    <string name="media_err_io">Could not read the media file</string>
+    <string name="media_err_malformed">The media file has incorrect encoding</string>
+    <string name="media_err_timeout">Attempt to play file timed out</string>
+    <string name="media_err_invalid_progressive_playback">The media file can not be streamed</string>
+    <string name="media_err_unknown">The stock media player is unable to play the media file</string>
+    <string name="media_err_security_ex">A security error was encountered trying to play %1$s</string>
+    <string name="media_err_io_ex">Input error while trying to play %1$s</string>
+    <string name="media_err_unexpected">Unexpected error while trying to play %1$s</string>
     <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>
@@ -251,31 +251,31 @@
 	<string name="auth_connection_established">Connection established</string>
 	<string name="auth_testing_connection">Testing connection</string>
 	<string name="auth_not_configured_title">Malformed server configuration</string>
-	<string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
+	<string name="auth_account_not_new">An account for the same user and server already exists on the device</string>
 	<string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
 	<string name="auth_unknown_error_title">Unknown error occurred!</string>
-	<string name="auth_unknown_host_title">Couldn\'t find host</string>
-	<string name="auth_incorrect_path_title">Server instance not found</string>
+	<string name="auth_unknown_host_title">Could not find host</string>
+	<string name="auth_incorrect_path_title">Server not found</string>
 	<string name="auth_timeout_title">The server took too long to respond</string>
-	<string name="auth_incorrect_address_title">Wrong server address format</string>
+	<string name="auth_incorrect_address_title">Wrong address format for server</string>
 	<string name="auth_ssl_general_error_title">SSL initialization failed</string>
-	<string name="auth_ssl_unverified_server_title">Couldn\'t verify SSL server\'s identity</string>
+	<string name="auth_ssl_unverified_server_title">Could not verify the identity of the SSL server</string>
 	<string name="auth_bad_oc_version_title">Unrecognized server version</string>
-	<string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
+	<string name="auth_wrong_connection_title">Could not establish connection</string>
 	<string name="auth_secure_connection">Secure connection established</string>
 	<string name="auth_unauthorized">Wrong username or password</string>
 	<string name="auth_oauth_error">Unsuccessful authorization</string>
 	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
-	<string name="auth_wtf_reenter_URL">Unexpected state; please enter the server address again</string>
+	<string name="auth_wtf_reenter_URL">Unexpected state, please enter the server address again</string>
 	<string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize 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_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</string>
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
-    <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
+    <string name="auth_account_does_not_exist">Account does not exist on the device yet</string>
     
     <string name="favorite">Set as available offline</string>
     <string name="unfavorite">Unset as available offline</string>
@@ -284,28 +284,28 @@
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     <string name="confirmation_remove_file_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_folder_alert">"Do you really want to remove %1$s the contents thereof?"</string>
     <string name="confirmation_remove_local">Local only</string>
-    <string name="remove_success_msg">"Removal succeeded"</string>
+    <string name="remove_success_msg">"Removed"</string>
     <string name="remove_fail_msg">"Removal failed"</string>
     <string name="rename_dialog_title">Enter a new name</string>
-    <string name="rename_local_fail_msg">"Local copy could not be renamed; try a different name"</string>
-    <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="rename_local_fail_msg">"Local copy could not be renamed, try a different name"</string>
+    <string name="rename_server_fail_msg">"Could not give server new name"</string>
+    <string name="sync_file_fail_msg">Could not check remote file</string>
     <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string>
-    <string name="create_dir_fail_msg">Folder could not be created</string>
+    <string name="create_dir_fail_msg">Could not create folder</string>
     <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : " | ? *</string>
     <string name="filename_forbidden_charaters_from_server">File name contains at least one invalid character</string>
     <string name="filename_empty">File name cannot be empty</string>
-    <string name="wait_a_moment">Wait a moment</string>
+    <string name="wait_a_moment">Wait a moment…</string>
     <string name="wait_checking_credentials">Checking stored credentials</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="filedisplay_unexpected_bad_get_content">"Unexpected problem, please select the file from a different app"</string>
+    <string name="filedisplay_no_file_selected">No file selected</string>
     <string name="activity_chooser_title">Send link to &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copying file from private storage</string>
     
     <string name="oauth_check_onoff">Login with oAuth2</string> 
-    <string name="oauth_login_connection">Connecting to oAuth2 server…</string>    
+    <string name="oauth_login_connection">Connecting to OAuth 2 server…</string>    
         
     <string name="ssl_validator_header">The identity of the site could not be verified</string>
     <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
@@ -313,7 +313,7 @@
     <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate valid dates are in the future</string>
     <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
     <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
-    <string name="ssl_validator_not_saved">The certificate could not be saved</string>
+    <string name="ssl_validator_not_saved">Could not save certificate</string>
     <string name="ssl_validator_btn_details_see">Details</string>
     <string name="ssl_validator_btn_details_hide">Hide</string>
     <string name="ssl_validator_label_subject">Issued to:</string>
@@ -337,26 +337,26 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG Image</string>
+    <string name="placeholder_filetype">PNG image</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Upload via wifi only</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_video_upload_on_charging">Upload when charging only</string>
-    <string name="instant_upload_on_charging">Upload when charging only</string>
+    <string name="auto_upload_on_wifi">Only upload on Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Only upload pictures on Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Only upload videos on Wi-Fi</string>
+    <string name="instant_video_upload_on_charging">Only upload when charging</string>
+    <string name="instant_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="conflict_title">File conflict</string>
-    <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
+    <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number appended to its name.</string>
     <string name="conflict_keep_both">Keep both</string>
     <string name="conflict_use_local_version">local version</string>
     <string name="conflict_use_server_version">server version</string>
 
-    <string name="preview_sorry">Sorry about that!</string>
+    <string name="preview_sorry">Sorry.</string>
     <string name="preview_image_description">Image preview</string>
-    <string name="preview_image_error_unknown_format">Image can\'t be shown</string>
+    <string name="preview_image_error_unknown_format">Unable to show image</string>
 
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
     <string name="prefs_instant_upload_path_title">Instant upload folder</string>
@@ -365,7 +365,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Use subfolders</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Store in subfolders based on year and month</string>
 
-	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your administrator.</string>
+	<string name="share_link_no_support_share_api">Sharing is not enabled on your server. Please contact your administrator.</string>
 	<string name="share_link_file_no_exist">Unable to share. Please check whether the file 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. Please check whether the file exists</string>
@@ -379,58 +379,57 @@
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Copied to clipboard</string>
-    <string name="clipboard_no_text_to_copy">No text received to copy to clipboard</string>
+    <string name="clipboard_no_text_to_copy">Received no text to copy to clipboard</string>
     <string name="clipboard_uxexpected_error">Unexpected error while copying to clipboard</string>
     <string name="clipboard_label">Text copied from %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
+    <string name="error_cant_bind_to_operations_service">Critical error: Unable to perform operations</string>
 
-    <string name="network_error_socket_exception">An error occurred while connecting with the server.</string>
-    <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server; the operation couldn\'t be completed</string>
-    <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server; the operation couldn\'t be completed</string>
-    <string name="network_host_not_available">The operation couldn\'t be completed; server is unavailable</string>
-    <string name="empty" translatable="false" />
+    <string name="network_error_socket_exception">An error occurred during connection to the server.</string>
+    <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server. Could not complete operation.</string>
+    <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server. Could not complete operation.</string>
+    <string name="network_host_not_available">Could not complete operation. Server unavailable</string>
 
-    <string name="forbidden_permissions">You do not have permission %s</string>
+    <string name="forbidden_permissions">You are not permitted %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="update_link_forbidden_permissions">to update this share</string>
-    <string name="forbidden_permissions_create">to create the file</string>
-    <string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
+    <string name="forbidden_permissions_create">to create this 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="file_migration_dialog_title">Updating storage path</string>
     <string name="file_migration_finish_button">Finish</string>
-    <string name="file_migration_preparing">Preparing for migration&#8230;</string>
+    <string name="file_migration_preparing">Preparing migration&#8230;</string>
     <string name="file_migration_checking_destination">Checking destination&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Saving accounts configuration&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Waiting for unfinished synchronizations&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Saving configuration of accounts&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Waiting for all synchronizations to finish&#8230;</string>
     <string name="file_migration_migrating">Moving data&#8230;</string>
     <string name="file_migration_updating_index">Updating index&#8230;</string>
     <string name="file_migration_cleaning">Cleaning&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Restoring accounts configuration&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Restoring configuration of accounts&#8230;</string>
     <string name="file_migration_ok_finished">Finished</string>
-    <string name="file_migration_failed_not_enough_space">ERROR: Not enough space</string>
-    <string name="file_migration_failed_not_writable">ERROR: File is not writable</string>
-    <string name="file_migration_failed_not_readable">ERROR: File is not readable</string>
+    <string name="file_migration_failed_not_enough_space">ERROR: Insufficient space</string>
+    <string name="file_migration_failed_not_writable">ERROR: File not writable</string>
+    <string name="file_migration_failed_not_readable">ERROR: File not readable</string>
     <string name="file_migration_failed_dir_already_exists">ERROR: Nextcloud directory already exists</string>
-    <string name="file_migration_failed_while_coping">ERROR: While migrating</string>
-    <string name="file_migration_failed_while_updating_index">ERROR: While updating index</string>
+    <string name="file_migration_failed_while_coping">ERROR: Failed during migration</string>
+    <string name="file_migration_failed_while_updating_index">ERROR: Failed to updating index</string>
 
-    <string name="file_migration_directory_already_exists">Data folder already exists, what to do?</string>
-    <string name="file_migration_override_data_folder">Override</string>
-    <string name="file_migration_use_data_folder">Use existing</string>
+    <string name="file_migration_directory_already_exists">Data folder exists already. Choose one of the folowing:</string>
+    <string name="file_migration_override_data_folder">Replace</string>
+    <string name="file_migration_use_data_folder">Use</string>
 
     <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Add account</string>
     <string name="drawer_manage_accounts">Manage accounts</string>
-    <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
+    <string name="auth_redirect_non_secure_connection_title">Secure connection 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. Please install a mail app.</string>
+	<string name="log_send_no_mail_app">No app for sending logs found. Please install an e-mail client.</string>
 	<string name="log_send_mail_subject">%1$s Android app logs</string>
 	<string name="log_progress_dialog_text">Loading data &#8230;</string>
 
@@ -438,26 +437,26 @@
 	<string name="saml_authentication_wrong_pass">Wrong password</string>
 	<string name="actionbar_move">Move</string>
     <string name="actionbar_copy">Copy</string>
-	<string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
+	<string name="file_list_empty_moving">Nothing in here. You can add a folder.</string>
 	<string name="folder_picker_choose_button_text">Choose</string>
 
-    <string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
-    <string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
-    <string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
+    <string name="move_file_not_found">Unable to move file. Please check whether it exists</string>
+    <string name="move_file_invalid_into_descendent">It is not possible to move a folder into one of its own underlying folders</string>
+    <string name="move_file_invalid_overwrite">The file is already present in the destination folder</string>
     <string name="move_file_error">An error occurred while trying to move this file or folder</string>
     <string name="forbidden_permissions_move">to move this file</string>
 
 
     <string name="copy_file_not_found">Unable to copy. Please check whether the file exists</string>
-    <string name="copy_file_invalid_into_descendent">It is not possible to copy a folder into a descendant</string>
-    <string name="copy_file_invalid_overwrite">The file exists already in the destination folder</string>
+    <string name="copy_file_invalid_into_descendent">It is not possible to copy a folder into one of its own underlying folders</string>
+    <string name="copy_file_invalid_overwrite">The file is already present in the destination folder</string>
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
     <string name="prefs_category_instant_uploading">Instant uploads</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Instant upload video folder</string>
+	<string name="prefs_instant_video_upload_path_title">Video folder for instant uploads</string>
     <string name="sync_folder_failed_content">Synchronization of %1$s folder could not be completed</string>
 
 	<string name="shared_subject_header">shared</string>
@@ -499,7 +498,7 @@
     <string name="share_add_user_or_group">Add user or group</string>
     <string name="share_via_link_section_title">Share link</string>
     <string name="share_via_link_expiration_date_label">Set expiration date</string>
-    <string name="share_via_link_password_label">Password protect</string>
+    <string name="share_via_link_password_label">Protect with password</string>
     <string name="share_via_link_password_title">Secured</string>
     <string name="share_via_link_edit_permission_label">Allow editing</string>
     <string name="share_via_link_hide_file_listing_permission_label">Hide file listing</string>
@@ -515,7 +514,7 @@
     <string name="share_email_clarification">%1$s (email)</string>
     <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>
 
-    <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.\nPlease contact your administrator</string>
+    <string name="share_sharee_unavailable">Upgrade the server version to allow sharing between users from within their clients.\nPlease contact your administrator</string>
     <string name="share_privilege_can_share">can share</string>
     <string name="share_privilege_can_edit">can edit</string>
     <string name="share_privilege_can_edit_create">create</string>
@@ -524,50 +523,50 @@
     <string name="edit_share_unshare">Stop sharing</string>
     <string name="edit_share_done">done</string>
 
-    <string name="action_retry_uploads">Retry failed</string>
+    <string name="action_retry_uploads">New attempt failed</string>
     <string name="action_clear_failed_uploads">Clear failed</string>
-    <string name="action_clear_successful_uploads">Clear successful</string>
-    <string name="action_clear_finished_uploads">Clear all finished</string>
+    <string name="action_clear_successful_uploads">Cleared</string>
+    <string name="action_clear_finished_uploads">Clear finished uploads</string>
 
     <string name="action_switch_grid_view">Grid view</string>
     <string name="action_switch_list_view">List view</string>
 
     <string name="manage_space_title">Manage space</string>
-    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
+    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take a while.</string>
     <string name="manage_space_clear_data">Clear data</string>
     <string name="manage_space_error">Some files could not be deleted.</string>
 
-    <string name="permission_storage_access">Additional permissions required to upload &amp; download files.</string>
-    <string name="local_file_not_found_toast">The file was not found in the local file system</string>
+    <string name="permission_storage_access">Additional permissions required to upload and download files.</string>
+    <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Waiting for device charging</string>
+    <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>
     <string name="files_drop_not_supported">This is a Nextcloud feature, please update.</string>
     <string name="learn_more">Learn more</string>
     <string name="drawer_folder_sync">Auto upload</string>
     <string name="drawer_participate">Participate</string>
-    <string name="participate_testing_headline">Help us testing</string>
-    <string name="participate_testing_bug_text">Found a bug? Something is odd?</string>
+    <string name="participate_testing_headline">Help by testing</string>
+    <string name="participate_testing_bug_text">Found a bug? Oddments?</string>
     <string name="participate_testing_report_text">Report an issue on Github</string>
-    <string name="participate_testing_version_text">Interested in helping us testing the next Version?</string>
+    <string name="participate_testing_version_text">Interested in helping out by testing the next version?</string>
     <string name="participate_beta_headline">Test the dev version</string>
-    <string name="participate_beta_text">This includes all upcoming features and is very bleeding edge. Bugs/errors can occur and if they do, please report them to us.</string>
+    <string name="participate_beta_text">This includes all upcoming features and it is on the very bleeding edge. Bugs/errors can occur, if and when they do, please report of your findings.</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
-    <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and it is expected to be stable. Testing your individual setup could help to ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
+    <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
     <string name="participate_contribute_headline">Actively Contribute</string>
     <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Help others on the &lt;a href="%1$s">forum&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">Translate&lt;/a> the app</string>
-    <string name="participate_contribute_github_text">Contribute as a developer, see &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> for details</string>
+    <string name="participate_contribute_github_text">Review, amend and write code, see &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> for details</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose folder&#8230;</string>
     <string name="folder_sync_loading_folders">Loading folders&#8230;</string>
     <string name="folder_sync_no_results">No media folders found.</string>
-    <string name="folder_sync_preferences">Auto upload preferences</string>
+    <string name="folder_sync_preferences">Preferences for auto uploading</string>
     <string name="folder_sync_settings">Settings</string>
-    <string name="folder_sync_new_info">Instant upload has been revamped completely. Please see the main menu and re-configure your auto upload. Sorry for the inconvenience.\n\nEnjoy the new and extended auto upload capabilities!</string>
+    <string name="folder_sync_new_info">Instant uploading has been revamped completely. Re-configure your auto upload from within the main menu.\n\nEnjoy the new and extended auto uploading.</string>
     <string name="folder_sync_preferences_folder_path">For %1$s</string>
     <plurals name="items_selected_count">
         <!--
@@ -588,7 +587,7 @@
     <string name="notifications_no_results_headline">No notifications</string>
     <string name="notifications_no_results_message">Please check back later.</string>
 
-    <string name="upload_file_dialog_title">Input upload filename and filetype</string>
+    <string name="upload_file_dialog_title">Input filename and filetype to upload</string>
     <string name="upload_file_dialog_filename">Filename</string>
     <string name="upload_file_dialog_filetype">Filetype</string>
     <string name="upload_file_dialog_filetype_snippet_text">Snippet text file(.txt)</string>
@@ -604,7 +603,7 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">A safe home for all your data</string>
-    <string name="welcome_feature_1_text">Access, share &amp; protect your files at home and in your enterprise</string>
+    <string name="welcome_feature_1_text">Access, share and protect your files at home and at work</string>
 
     <string name="welcome_feature_2_title">Multi account</string>
     <string name="welcome_feature_2_text">Connect to all your clouds</string>
@@ -619,7 +618,7 @@
 
     <!-- User information -->
     <string name="user_info_full_name">Full name</string>
-    <string name="user_info_email">Email</string>
+    <string name="user_info_email">E-mail</string>
     <string name="user_info_phone">Phone number</string>
     <string name="user_info_address">Address</string>
     <string name="user_info_website">Website</string>
@@ -629,23 +628,23 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">No activity yet</string>
-    <string name="activities_no_results_message">This stream will show events like\nadditions, changes &amp; shares</string>
+    <string name="activities_no_results_message">This stream will show events like\nadditions, changes and shares</string>
     <string name="webview_error">Error occurred</string>
     <string name="prefs_category_about">About</string>
 
-    <string name="actionbar_contacts">Contacts backup</string>
-    <string name="contacts_backup_button">Backup now</string>
+    <string name="actionbar_contacts">Backup contacts</string>
+    <string name="contacts_backup_button">Now</string>
     <string name="contacts_restore_button">Restore last backup</string>
     <string name="contacts_header_restore">Restore</string>
     <string name="contacts_header_backup">Backup</string>
     <string name="contacts_automatic_backup">Contacts backup</string>
     <string name="contacts_last_backup">Last backup</string>
-    <string name="contacts_read_permission">Read permission of contacts is needed</string>
-    <string name="contacts_write_permission">Write permission for contacts is needed</string>
+    <string name="contacts_read_permission">Permission to read contact list needed</string>
+    <string name="contacts_write_permission">Permission to change contact list needed</string>
     <string name="contactlist_title">Restore contacts</string>
     <string name="contaclist_restore_selected">Restore selected contacts</string>
-    <string name="contactlist_account_chooser_title">Choose account for import</string>
-    <string name="contactlist_no_permission">No permission, nothing imported!</string>
+    <string name="contactlist_account_chooser_title">Choose account to import</string>
+    <string name="contactlist_no_permission">No permission given, nothing imported!</string>
     <string name="contacts_preference_choose_date">Choose date</string>
     <string name="contacts_preference_backup_never">never</string>
     <string name="contacts_preferences_no_file_found">No file found</string>