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 index 9ae0848b..5c09e5b1 100644 --- 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 @@ public class SettingsActivity extends AppCompatActivity { 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 @@ public class SettingsActivity extends AppCompatActivity { field_password.setEnabled(enabled); } } -} \ No newline at end of file +} diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c0f4cb2d..ef43a2c1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -29,9 +29,8 @@ Früher - Server - Server Adresse + Server-Adresse Zeigt an, ob die angegebene URL erreichbar ist. WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https". Benutzername @@ -41,23 +40,21 @@ Verbindet… - Verbindung wird hergestellt Verbunden Kein Netzwerk verfügbar - + JSON-Fehler + IO-Fehler + Login fehlgeschlagen URL nicht korrekt - JSON Fehler - IO Fehler Benutzername / Passwort nicht korrekt Einstellungen - Version Sie benutzen aktuell v0.7.0 Maintainer @@ -86,4 +83,4 @@ Alle Notizen Eine Notiz - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml index c4ef0b30..923ed3dd 100644 --- a/app/src/main/res/values-fr/plurals.xml +++ b/app/src/main/res/values-fr/plurals.xml @@ -2,7 +2,7 @@ - %d selectionnée(s) - %d selectionnée(s) + %d selectionnée + %d selectionnées - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 88a8b2c5..14eca0ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,7 +29,6 @@ Earlier - Server Server address Shows if the address can be pinged. @@ -41,16 +40,15 @@ Connecting … - Connecting Connected No network available - - Wrong server address JSON error IO error + Invalid login + Wrong server address Wrong username or password @@ -58,7 +56,6 @@ - Version You are currently using v0.7.0 Maintainer