Merge branch 'develop' into oc_framework_cleanup_and_documentation

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 428dd83..2c06bb8 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 

-    <string name="main_files">Files</string>
-    <string name="main_music">Music</string>
-    <string name="main_contacts">Contacts</string>
-    <string name="main_calendar">Calendar</string>
-    <string name="main_bookmarks">Bookmarks</string>
-    <string name="main_settings">Settings</string>
-    <string name="main_tit_accsetup">Setup Account</string>
-    <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>

     <string name="about_android">%1$s Android App</string>
     <string name="about_version">version %1$s</string>
     <string name="actionbar_sync">Refresh account</string>
     <string name="about_android">%1$s Android App</string>
     <string name="about_version">version %1$s</string>
     <string name="actionbar_sync">Refresh account</string>


@@ -22,7 +14,6 @@
     
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>

-    <string name="prefs_trackmydevice_interval_summary">Update every %1$s minutes</string>

     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage Accounts</string>
     <string name="prefs_pincode">App PIN</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage Accounts</string>
     <string name="prefs_pincode">App PIN</string>


@@ -43,7 +34,7 @@
        <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_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>


@@ -108,13 +99,13 @@
     <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 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 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_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 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 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>
     <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 space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </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 space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>

-    <string name="location_no_provider">%1$s cannot track your device. Please check your location settings</string>

     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     <string name="pincode_configure_your_pin">Enter your App PIN</string>
     <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     <string name="pincode_configure_your_pin">Enter your App PIN</string>
     <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>


@@ -135,7 +126,7 @@
     <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_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">Too much time trying to play</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_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>


@@ -147,7 +138,6 @@
 
     <string name="auth_trying_to_login">Trying to login&#8230;</string>
     <string name="auth_no_net_conn_title">No network connection</string>
 
     <string name="auth_trying_to_login">Trying to login&#8230;</string>
     <string name="auth_no_net_conn_title">No network connection</string>

-    <string name="auth_connect_anyway">Connect anyway</string-->

     <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
     <string name="auth_connection_established">Connection established</string>
     <string name="auth_testing_connection">Testing connection&#8230;</string>
     <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
     <string name="auth_connection_established">Connection established</string>
     <string name="auth_testing_connection">Testing connection&#8230;</string>


@@ -160,7 +150,7 @@
     <string name="auth_timeout_title">The server took too long to respond</string>
     <string name="auth_incorrect_address_title">Malformed URL</string>
     <string name="auth_ssl_general_error_title">SSL initialization failed</string>
     <string name="auth_timeout_title">The server took too long to respond</string>
     <string name="auth_incorrect_address_title">Malformed URL</string>
     <string name="auth_ssl_general_error_title">SSL initialization failed</string>

-    <string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
+    <string name="auth_ssl_unverified_server_title">Couldn\'t verify SSL server\'s identity</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_secure_connection">Secure connection established</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_secure_connection">Secure connection established</string>


@@ -173,10 +163,8 @@
     <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_unsupported_auth_method">The server does not support this authentication method</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_unsupported_auth_method">The server does not support this authentication method</string>    

-       <string name="auth_unsupported_multiaccount">This version of ownCloud doesn\'t support multiaccount</string>
+       <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>

     
     

-    <string name="extensions_avail_title">Extensions available!</string>
-    <string name="extensions_avail_message">Looks like your server instance is supporting advanced extensions. Would you like to see extensions available for android ?</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="fd_keep_in_sync">Keep file up to date</string>
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>


@@ -194,14 +182,14 @@
     <string name="sync_file_fail_msg">Remote file could not be checked</string>
     <string name="sync_file_nothing_to_do_msg">File contents already synchronized</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 synchronized</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>
     

-    <string name="oauth_check_onoff">Login with oAuth2.</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 oAuth2 server…</string>    
         

-    <string name="ssl_validator_title">Warning</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>
     <string name="ssl_validator_reason_cert_expired">- The server certificate expired</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>
     <string name="ssl_validator_reason_cert_expired">- The server certificate expired</string>


@@ -244,7 +232,7 @@
     <string name="preview_image_error_unknown_format">This image can not 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_error_unknown_format">This image can not 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>