aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-05-10 21:01:57 +0200
committerChristian Schneppe <christian@pix-art.de>2017-05-10 21:01:57 +0200
commitc1d2b6690ce7f2a89a477f1076be1449a414bfa6 (patch)
tree536f603af369271d5b7193f3401a176f59456c2c /src/main/res
parent10e4be7c4c19a88acd36649fb61ed578d3652adb (diff)
unified all account state exceptions
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml2
-rw-r--r--src/main/res/values/strings.xml4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 0ec2bfd25..1102a95a9 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -140,7 +140,7 @@
<string name="account_status_regis_conflict">Benutzername wird bereits verwendet</string>
<string name="account_status_regis_success">Registrierung abgeschlossen</string>
<string name="account_status_regis_not_sup">Der Server unterstützt keine Registrierung</string>
- <string name="account_status_security_error">Sicherheitsfehler</string>
+ <string name="account_status_security_error">TLS-Fehler</string>
<string name="account_status_incompatible_server">Inkompatibler Server</string>
<string name="encryption_choice_unencrypted">Unverschlüsselt</string>
<string name="encryption_choice_otr">OTR</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ad6d67d33..375179423 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -150,7 +150,7 @@
<string name="account_status_regis_conflict">Username already in use</string>
<string name="account_status_regis_success">Registration completed</string>
<string name="account_status_regis_not_sup">Server does not support registration</string>
- <string name="account_status_security_error">Security error</string>
+ <string name="account_status_tls_error">TLS error</string>
<string name="account_status_policy_violation">Policy violation</string>
<string name="account_status_incompatible_server">Incompatible server</string>
<string name="account_status_stream_error">Stream error</string>
@@ -777,4 +777,6 @@
<string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string>
<string name="pref_show_connection_options">Extended connection settings</string>
<string name="retry_decryption">Retry decryption</string>
+ <string name="session_failure">Session failure</string>
+ <string name="downgrade_attack">Downgrade attack</string>
</resources>