Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting...

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9cd374..4c5f57b 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,12 +15,9 @@
     <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>
+       <item>Biggest - Smallest</item>
     </string-array>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
@@ -295,6 +292,11 @@
        <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="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>
        <string name="actionbar_move">Move</string>