aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-24 09:23:30 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-24 09:23:30 +0100
commitddafa65849e6c7e8d17566208b57ec614de05d5f (patch)
tree0c991e5c3cb803fb2a165989c6b117e037f49222 /src/main/res
parent17b1fcc3eafa078a902c662a6e774bcd7f2927b3 (diff)
parent894b5892a977c6b7ac52f07e00f452a44bdc1168 (diff)
Merge pull request #1715 from fiaxh/gpg_decryption_failed
PGP Retry decryption from message menu
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/menu/message_context.xml4
-rw-r--r--src/main/res/values/strings.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 0d4e66ef..4096297c 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -6,6 +6,10 @@
android:title="@string/copy_text"
android:visible="false"/>
<item
+ android:id="@+id/retry_decryption"
+ android:title="Retry decryption"
+ android:visible="false"/>
+ <item
android:id="@+id/correct_message"
android:title="@string/correct_message"
android:visible="false"/>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 48c3de6c..8e3629ca 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -97,7 +97,6 @@
<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>
<string name="no_pgp_keys">No OpenPGP Keys found</string>
<string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
- <string name="encrypted_message_received"><i>Encrypted message received. Touch to decrypt.</i></string>
<string name="pref_general">General</string>
<string name="pref_xmpp_resource">XMPP resource</string>
<string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>