fix scenario 1

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c5f57b..af5a684 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,7 +17,8 @@
     <string-array name="actionbar_sortby">
        <item>A-Z</item>
        <item>Newest - Oldest</item>
     <string-array name="actionbar_sortby">
        <item>A-Z</item>
        <item>Newest - Oldest</item>

-       <item>Biggest - Smallest</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>
     </string-array>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>


@@ -258,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="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>
 
        <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
                administrator.</string>


@@ -290,7 +292,7 @@
 
        <string name="prefs_category_accounts">Accounts</string>
        <string name="prefs_add_account">Add account</string>
 
        <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="actionbar_logger">Logs</string>
        <string name="log_send_history_button">Send History</string>


@@ -309,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="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>
 </resources>