diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-15 17:44:51 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-15 17:44:51 +0100 |
| commit | 69ab8a2adbcaaaea3cbb9916ab0273d59f40c778 (patch) | |
| tree | d1973cfe4440ea07474b9e3b98d2e434aff126fc /src/main/res/values/strings.xml | |
| parent | 7ba9854c22c6bcf07356cb018a0cbc2f49377f9f (diff) | |
| parent | 17cec63c14e15d1a78d124f718a4b51e4f4debd1 (diff) | |
Merge pull request #668 from SamWhited/auth-pinning
Auth mechanism pinning
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e720101c..db9f95d4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -141,6 +141,8 @@ <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_incompatible_server">Incompatible server</string> <string name="encryption_choice_none">Plain text</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> |