diff options
| author | Christian S <christian@pix-art.de> | 2016-02-27 10:57:11 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-27 10:57:11 +0100 |
| commit | ff337163b7ccd5b580d132e7ffbc8643ef095ee0 (patch) | |
| tree | daa287001337dd7a7206916c444fe200c73101a4 /src/main/res | |
| parent | 737b53a4866c3e06188d0f2271249b05bc179505 (diff) | |
| parent | c17b19c40c9b66c3892f1a9d7a6548b7f72b0330 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/menu/message_context.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 0d4e66efc..4096297c7 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 f97e59bd3..49f3730d6 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -96,7 +96,6 @@ <string name="no_pgp_key">No OpenPGP Key found</string> <string name="contact_has_no_pgp_key">Pix-Art Messenger 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">Pix-Art Messenger 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> @@ -525,6 +524,8 @@ <string name="username">Username</string> <string name="username_hint">Username</string> <string name="invalid_username">This is not a valid username</string> + <string name="conference_name">Conference name</string> + <string name="invalid_conference_name">This is not a valid conference name</string> <string name="download_failed_server_not_found">Download failed: Server not found</string> <string name="download_failed_file_not_found">Download failed: File not found</string> <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> |