Merge pull request #2 from stefan-niedermann/master

Update from original
nextcloud · Mar 3, 2016 · 2a423a5 · 2a423a5
2 parents 3e4a883 + 2f5f0b3
commit 2a423a5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
@@ -239,7 +239,7 @@ protected void onPostExecute(Boolean isValidLogin) {
                 Log.e("Note", "invalid login");
                 btn_submit.setText(R.string.settings_submit);
                 setInputsEnabled(true);
-                Toast.makeText(getApplicationContext(), getString(R.string.error_username_password_invalid), Toast.LENGTH_LONG).show();
+                Toast.makeText(getApplicationContext(), getString(R.string.invalid_login), Toast.LENGTH_LONG).show();
             }
         }
 
@@ -255,4 +255,4 @@ private void setInputsEnabled(boolean enabled) {
             field_password.setEnabled(enabled);
         }
     }
-}
+}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -29,9 +29,8 @@
     <string name="listview_updated_earlier">Früher</string>
 
     <!-- Settings -->
-
     <string name="settings_server">Server</string>
-    <string name="settings_url">Server Adresse</string>
+    <string name="settings_url">Server-Adresse</string>
     <string name="settings_url_check_description">Zeigt an, ob die angegebene URL erreichbar ist.</string>
     <string name="settings_url_warn_http">WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https".</string>
     <string name="settings_username">Benutzername</string>
@@ -41,23 +40,21 @@
     <string name="settings_submitting">Verbindet&#8230;</string>
 
     <!-- Network -->
-
     <string name="network_connecting">Verbindung wird hergestellt</string>
     <string name="network_connected">Verbunden</string>
     <string name="network_disconnected">Kein Netzwerk verfügbar</string>
 
     <!-- Error -->
-
+    <string name="error_json">JSON-Fehler</string>
+    <string name="error_io">IO-Fehler</string>
+    <string name="error_invalid login">Login fehlgeschlagen</string>
     <string name="error_url_malformed">URL nicht korrekt</string>
-    <string name="error_json">JSON Fehler</string>
-    <string name="error_io">IO Fehler</string>
     <string name="error_username_password_invalid">Benutzername / Passwort nicht korrekt</string>
 
     <!-- Snackbar Actions -->
     <string name="snackbar_settings">Einstellungen</string>
 
     <!-- About -->
-
     <string name="about_version_title">Version</string>
     <string name="about_version">Sie benutzen aktuell <strong>v0.7.0</strong></string>
     <string name="about_maintainer_title">Maintainer</string>
@@ -86,4 +83,4 @@
 
     <string name="widget_all_notes_title">Alle Notizen</string>
     <string name="widget_single_note_title">Eine Notiz</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml
@@ -2,7 +2,7 @@
 <resources>
     <plurals
         name="ab_selected">
-        <item quantity="one">%d selectionnée(s)</item>
-        <item quantity="other">%d selectionnée(s)</item>
+        <item quantity="one">%d selectionnée</item>
+        <item quantity="other">%d selectionnées</item>
     </plurals>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -29,7 +29,6 @@
     <string name="listview_updated_earlier">Earlier</string>
 
     <!-- Settings -->
-
     <string name="settings_server">Server</string>
     <string name="settings_url">Server address</string>
     <string name="settings_url_check_description">Shows if the address can be pinged.</string>
@@ -41,24 +40,22 @@
     <string name="settings_submitting">Connecting &#8230;</string>
 
     <!-- Network -->
-
     <string name="network_connecting">Connecting</string>
     <string name="network_connected">Connected</string>
     <string name="network_disconnected">No network available</string>
 
     <!-- Error -->
-
-    <string name="error_url_malformed">Wrong server address</string>
     <string name="error_json">JSON error</string>
     <string name="error_io">IO error</string>
+    <string name="error_invalid_login">Invalid login</string>
+    <string name="error_url_malformed">Wrong server address</string>
     <string name="error_username_password_invalid">Wrong username or password</string>
 
     <!-- Snackbar Actions -->
     <string name="snackbar_settings">Settings</string>
 
 
     <!-- About -->
-
     <string name="about_version_title">Version</string>
     <string name="about_version">You are currently using <strong>v0.7.0</strong></string>
     <string name="about_maintainer_title">Maintainer</string>