aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 14:40:03 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 14:40:03 +0200
commit1b2ce1a309785de08cbb51e3bd8c3e811da359d0 (patch)
tree344a2ab5fabaa8923655d502ce74327c61e31907 /res/values/strings.xml
parentfa81beac3d5a83498b3973d1ae64cf03bd16ab08 (diff)
parent99a56a2bde1af0e260f795a4c6fbdae63b7d5453 (diff)
Merge pull request #1 from siacs/development
pull
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa41b7b8..61134d29 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,4 +83,7 @@
<string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to mange your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
<string name="restart">Restart</string>
<string name="install">Install</string>
+ <string name="offering">offering&#8230;</string>
+ <string name="no_pgp_key">No openPGP Key found</string>
+ <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup openPGP.</small></string>
</resources>