Remove observed file when requested although the list of observed had to be reinitialized

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 12fbdf6..fd2915c 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -196,8 +196,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>