Fix crash got with: 1. try to rename / delete a file with an outdated access token...

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5afdd86..512f656 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,7 +25,6 @@
     <string name="actionbar_settings">Settings</string>
     
     <string name="prefs_category_general">General</string>
     <string name="actionbar_settings">Settings</string>
     
     <string name="prefs_category_general">General</string>

-    <string name="prefs_category_trackmydevice">Device tracking</string>

     <string name="prefs_add_session">Add new session</string>
     <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
     <string name="prefs_select_oc_account">Select an account</string>
     <string name="prefs_add_session">Add new session</string>
     <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
     <string name="prefs_select_oc_account">Select an account</string>


@@ -111,6 +110,7 @@
     <string name="sync_string_contacts">Contacts</string>
        <string name="sync_fail_ticker">Synchronization failed</string>
     <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
     <string name="sync_string_contacts">Contacts</string>
        <string name="sync_fail_ticker">Synchronization failed</string>
     <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>

+    <string name="sync_fail_content_unauthorized">Invalid credentials for %1$s</string>

        <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
        <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
        <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
        <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>


@@ -176,9 +176,14 @@
        <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
        <string name="auth_secure_connection">Secure connection established</string>
     <string name="auth_login_details">Login details</string>
        <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
        <string name="auth_secure_connection">Secure connection established</string>
     <string name="auth_login_details">Login details</string>

-    <string name="auth_unauthorized">Invalid login / password</string>
+    <string name="auth_unauthorized">Invalid credentials</string>
+       <string name="auth_oauth_error">Unsuccessful authorization</string>
+       <string name="auth_oauth_error_access_denied">Access denied by authorization server</string>

     <string name="auth_not_found">Wrong path given</string>
     <string name="auth_internal">Internal server error, code %1$d</string>
     <string name="auth_not_found">Wrong path given</string>
     <string name="auth_internal">Internal server error, code %1$d</string>

+    <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+    <string name="auth_expired_oauth_token_toast">Your authorization expired.\nPlease, authorize again</string>
+    <string name="auth_expired_basic_auth_toast">Your saved credentials are invalid.\nPlease, enter the current credentials</string>

     
     <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
     <string name="crashlog_send_report">Send report</string>
     
     <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
     <string name="crashlog_send_report">Send report</string>