X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/cc1eb7a352525e956e95e8dfd910c6c86edbab2c..85e9a40dbeb521029a592a3d85e9fa583cce0c19:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad5369ac..dbb62247 100644
--- 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,8 @@
     <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">View details</string>
-    <string name="ssl_validator_btn_details_hide">Hide details</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>