diff options
| author | Christian S <christian@pix-art.de> | 2016-03-13 12:07:28 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-13 12:07:28 +0100 |
| commit | ecbf5f6459584fdd694ded4ffc650b685381548e (patch) | |
| tree | 4d17928512dff1b60dd9de0343bf6992dd41aab4 /src/main/res/values/strings.xml | |
| parent | 73907600fa340eb51b9d297e94cdbdca981e0d2b (diff) | |
| parent | 817d344521835622a625c8263141dc1148fff451 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0603fb5ff..0cefd4f46 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -628,4 +628,5 @@ <string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string> <string name="select_image_and_crop">Select image and crop</string> <string name="contacts_have_no_pgp_keys">Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n</string> + <string name="this_account_is_disabled">You have disabled this account</string> </resources> |