diff options
author | Christian S <christian@pix-art.de> | 2016-05-05 19:30:53 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-05-05 19:30:53 +0200 |
commit | 27ccf4e08f2547f372196bf381915ed1e6204ad8 (patch) | |
tree | 05749ea85a8421b77daf3c04d316c958895e3601 /src/main/res/values | |
parent | 626d0d3260d792843bebf2a8b8a62c1a026dd314 (diff) | |
parent | 6e0ec9b924173bd2afe3b87646e3b1f4e907b7c1 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res/values')
-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 9c5f2d3af..136c3983e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -167,6 +167,8 @@ <string name="mgmt_account_disable">Temporarily disable</string> <string name="mgmt_account_publish_avatar">Publish avatar</string> <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> + <string name="openpgp_has_been_published">OpenPGP public key has been published.</string> + <string name="republish_pgp_keys">Remember to republish your OpenPGP public keys!</string> <string name="mgmt_account_enable">Enable account</string> <string name="mgmt_account_are_you_sure">Are you sure?</string> <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string> |