X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/97f21ee7beafbf9598c76134a5bcbd92fece47ce..3f2081e6073bd0c11d672890f350da80abc554b2:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 400b665c..0428f411 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,8 +74,10 @@
     <string name="filedetails_created">Created:</string>
     <string name="filedetails_modified">Modified:</string>
     <string name="filedetails_download">Download</string>
-	<string name="filedetails_redownload">Refresh</string>
+    <string name="filedetails_sync_file">Refresh</string>
+	<string name="filedetails_redownload">Redownload</string>
     <string name="filedetails_open">Open</string>
+    <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
@@ -108,13 +110,17 @@
     <string name="sync_string_contacts">Contacts</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="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="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_configure_your_pin_explanation">The PIN will be requested every time the app is started</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> 
@@ -169,10 +175,10 @@
     <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_local">Local 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_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">Remote and local</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>
@@ -180,6 +186,9 @@
     <string name="rename_local_fail_msg">"Local copy could not be renamed; try a differente new 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="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="wait_a_moment">Wait a moment</string>
@@ -196,8 +205,28 @@
     <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="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>
+    <string name="ssl_validator_label_issuer">Issued by:</string>
+    <string name="ssl_validator_label_CN">Common name:</string>
+    <string name="ssl_validator_label_O">Organization:</string>
+	<string name="ssl_validator_label_OU">Organizational unit:</string>
+	<string name="ssl_validator_label_C">Country:</string>
+	<string name="ssl_validator_label_ST">State:</string>
+	<string name="ssl_validator_label_L">Location:</string>
+    <string name="ssl_validator_label_validity">Validity:</string>
+    <string name="ssl_validator_label_validity_from">From:</string>
+	<string name="ssl_validator_label_validity_to">To:</string>
+	<string name="ssl_validator_label_signature">Signature:</string>
+	<string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
+			
     <string name="text_placeholder">This is a placeholder</string>
     
     <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
+    <string name="conflict_title">Update conflict</string>
+    <string name="conflict_message">Remote file %s is not synchronized 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>
 </resources>