X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4e57c008b7c3975745a637780687bee7ad1563e8..0bb59e0f9b0d2edffa76e029fbf327d7182bef13:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 750f4600..f4b735a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name="auth_host_url">ownCloud URL</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
-    <string name="auth_register">I am new at ownCloud</string>
+    <string name="auth_register">I am new to ownCloud</string>
     <string name="new_session_uri_error">Wrong URL given</string>
     <string name="new_session_session_name_error">Wrong session name</string>
     <string name="sync_string_files">Files</string>
@@ -71,8 +71,7 @@
     <string name="filedetails_created">Created:</string>
     <string name="filedetails_modified">Modified:</string>
     <string name="filedetails_download">Download</string>
-	<string name="filedetails_redownload">Redownload</string>
-	<string name="filedetails_download_in_progress">Downloading</string>
+	<string name="filedetails_redownload">Refresh</string>
     <string name="filedetails_open">Open</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
@@ -104,12 +103,15 @@
     <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
     <string name="common_choose_account">Choose account</string>
     <string name="sync_string_contacts">Contacts</string>
-    <string name="use_ssl">Use Secure Connection</string>
+	<string name="sync_fail_ticker">Synchronization failed</string>
+    <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
+	<string name="use_ssl">Use Secure Connection</string>
     <string name="location_no_provider">ownCloud 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_enter_new_pin_code">Please, insert your new App PIN</string>
     <string name="pincode_configure_your_pin">Enter ownCloud App PIN</string>
+    <string name="pincode_configure_your_pin_explanation">It will be requested every time the app is opened</string> 
     <string name="pincode_reenter_your_pincode">Reenter ownCloud App PIN, please</string>
     <string name="pincode_remove_your_pincode">Remove your ownCloud App PIN</string>
     <string name="pincode_mismatch">Both ownCloud App PIN are not the same</string> 
@@ -167,7 +169,7 @@
 	  <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
 	  <string name="confirmation_remove_local">Local only</string>
 	  <string name="confirmation_remove_remote">Remove from server</string>
-	  <string name="confirmation_remove_remote_and_local">Both remote and local</string>
+	  <string name="confirmation_remove_remote_and_local">Remote and local</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>
@@ -181,4 +183,18 @@
 	
     <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please, try other app to select the file"</string>
     <string name="filedisplay_no_file_selected">No file was selected</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_reason_cert_not_yet_valid">- The server certificate is too young</string>
+    <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
+    <string name="ssl_validator_certificate_not_available">The server certificate could not be obtained</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="text_placeholder">This is a placeholder</string>
+    
+    <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
 </resources>