mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-25 14:26:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from stefan-niedermann/master

Browse source 
Update from original
This commit is contained in:
ageru 2016-03-03 23:27:30 +00:00
commit 2a423a502b
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
View file

@ -239,7 +239,7 @@ public class SettingsActivity extends AppCompatActivity {
Log.e("Note", "invalid login"); Log.e("Note", "invalid login");
btn_submit.setText(R.string.settings_submit); btn_submit.setText(R.string.settings_submit);
setInputsEnabled(true); 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();
} }
} }

11
app/src/main/res/values-de/strings.xml
View file

@ -29,9 +29,8 @@
<string name="listview_updated_earlier">Früher</string> <string name="listview_updated_earlier">Früher</string>
<!-- Settings --> <!-- Settings -->
<string name="settings_server">Server</string> <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_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_url_warn_http">WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https".</string>
<string name="settings_username">Benutzername</string> <string name="settings_username">Benutzername</string>
@ -41,23 +40,21 @@
<string name="settings_submitting">Verbindet&#8230;</string> <string name="settings_submitting">Verbindet&#8230;</string>
<!-- Network --> <!-- Network -->
<string name="network_connecting">Verbindung wird hergestellt</string> <string name="network_connecting">Verbindung wird hergestellt</string>
<string name="network_connected">Verbunden</string> <string name="network_connected">Verbunden</string>
<string name="network_disconnected">Kein Netzwerk verfügbar</string> <string name="network_disconnected">Kein Netzwerk verfügbar</string>
<!-- Error --> <!-- 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_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> <string name="error_username_password_invalid">Benutzername / Passwort nicht korrekt</string>
<!-- Snackbar Actions --> <!-- Snackbar Actions -->
<string name="snackbar_settings">Einstellungen</string> <string name="snackbar_settings">Einstellungen</string>
<!-- About --> <!-- About -->
<string name="about_version_title">Version</string> <string name="about_version_title">Version</string>
<string name="about_version">Sie benutzen aktuell <strong>v0.7.0</strong></string> <string name="about_version">Sie benutzen aktuell <strong>v0.7.0</strong></string>
<string name="about_maintainer_title">Maintainer</string> <string name="about_maintainer_title">Maintainer</string>

4
app/src/main/res/values-fr/plurals.xml
View file

@ -2,7 +2,7 @@
<resources> <resources>
<plurals <plurals
name="ab_selected"> name="ab_selected">
<item quantity="one">%d selectionnée(s)</item> <item quantity="one">%d selectionnée</item>
<item quantity="other">%d selectionnée(s)</item> <item quantity="other">%d selectionnées</item>
</plurals> </plurals>
</resources> </resources>

7
app/src/main/res/values/strings.xml
View file

@ -29,7 +29,6 @@
<string name="listview_updated_earlier">Earlier</string> <string name="listview_updated_earlier">Earlier</string>
<!-- Settings --> <!-- Settings -->
<string name="settings_server">Server</string> <string name="settings_server">Server</string>
<string name="settings_url">Server address</string> <string name="settings_url">Server address</string>
<string name="settings_url_check_description">Shows if the address can be pinged.</string> <string name="settings_url_check_description">Shows if the address can be pinged.</string>
@ -41,16 +40,15 @@
<string name="settings_submitting">Connecting &#8230;</string> <string name="settings_submitting">Connecting &#8230;</string>
<!-- Network --> <!-- Network -->
<string name="network_connecting">Connecting</string> <string name="network_connecting">Connecting</string>
<string name="network_connected">Connected</string> <string name="network_connected">Connected</string>
<string name="network_disconnected">No network available</string> <string name="network_disconnected">No network available</string>
<!-- Error --> <!-- Error -->
<string name="error_url_malformed">Wrong server address</string>
<string name="error_json">JSON error</string> <string name="error_json">JSON error</string>
<string name="error_io">IO 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> <string name="error_username_password_invalid">Wrong username or password</string>
<!-- Snackbar Actions --> <!-- Snackbar Actions -->
@ -58,7 +56,6 @@
<!-- About --> <!-- About -->
<string name="about_version_title">Version</string> <string name="about_version_title">Version</string>
<string name="about_version">You are currently using <strong>v0.7.0</strong></string> <string name="about_version">You are currently using <strong>v0.7.0</strong></string>
<string name="about_maintainer_title">Maintainer</string> <string name="about_maintainer_title">Maintainer</string>