Fixed update of right fragment when actions in the context menu of the left fragment...

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 12fbdf6..dbb6224 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,7 +79,9 @@
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
-    <string name="common_cancel">Cancel</string>
+    <string name="common_cancel_download">Cancel download</string>
+    <string name="common_cancel_upload">Cancel upload</string>
+       <string name="common_cancel">Cancel</string>
     <string name="common_save_exit">Save &amp; Exit</string>
     <string name="common_exit">Leave ownCloud</string>
     <string name="common_error">Error</string>
@@ -170,7 +172,9 @@
     <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_local">Local only</string>
+         <string name="confirmation_remove_folder_local">Local contents only</string>
          <string name="confirmation_remove_remote">Remove from server</string>
          <string name="confirmation_remove_remote_and_local">Remote and local</string>
 
@@ -196,8 +200,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>