From dc73a25ae4c0729052f858af830707411463e43f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Thu, 8 May 2014 11:53:00 +0200
Subject: code cleanup

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa41b7b8..c3c7f658 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,4 +83,5 @@
     <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>
 </resources>
-- 
cgit v1.2.3


From 0ed29c1c77c065d73af5c9f1d7769c6c1a1a9c6f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Thu, 8 May 2014 14:23:09 +0200
Subject: more informative dialog if contact doesn't announce public key

---
 res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c3c7f658..61134d29 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -84,4 +84,6 @@
     <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>
-- 
cgit v1.2.3