X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/20cd00b22c86ef0ab03ae0b8cd8eedd63844981f..39f7ee996ab2fda8fdd49d5b6b7bfbc789746975:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9cd374c..af5a684d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,12 +15,10 @@
     <string name="actionbar_sort">Sort</string>
     <string name="actionbar_sort_title">Sort by</string>
     <string-array name="actionbar_sortby">
-    	<item>Filename - ascending</item>
-    	<item>Filename - descending</item>
-    	<item>Date - ascending</item>
-    	<item>Date - descending</item>
-    	<item>Filesize - ascending</item>
-    	<item>Filesize - descending</item>
+    	<item>A-Z</item>
+    	<item>Newest - Oldest</item>
+    	<!-- TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>  -->
     </string-array>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
@@ -261,6 +259,7 @@
     <string name="preview_image_error_unknown_format">This image cannot be shown</string>
     
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
+    <string name="prefs_instant_upload_path_title">Upload Path</string>
 
 	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
 		administrator.</string>
@@ -293,7 +292,12 @@
 
 	<string name="prefs_category_accounts">Accounts</string>
 	<string name="prefs_add_account">Add account</string>
-	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
+	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
+
+	<string name="actionbar_logger">Logs</string>
+	<string name="log_send_history_button">Send History</string>
+	<string name="log_mail_subject">ownCloud Android app logs</string>
+	<string name="log_progress_dialog_text">Loading data...</string>
 
 	<string name="saml_authentication_required_text">Authentication required</string>
 	<string name="saml_authentication_wrong_pass">Wrong password</string>
@@ -307,4 +311,7 @@
 	<string name="move_file_error">An error occurred while trying to move this file or folder</string>
 	<string name="forbidden_permissions_move">to move this file</string>
 
+	<string name="prefs_category_instant_uploading">Instant Uploads</string>
+	<string name="prefs_category_security">Security</string>
+
 </resources>