diff options
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 | 8 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 2fe1ca22..41233931 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -9,6 +9,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/share_with" android:title="@string/share_with" android:visible="false"/> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ef2249bc..68f1243b 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> @@ -252,8 +251,7 @@ <string name="bookmark_already_exists">This bookmark already exists</string> <string name="you">You</string> <string name="action_edit_subject">Edit conference subject</string> - <string name="conference_not_found">Conference not found</string> - <string name="conference_unknown_error">Unknown error received</string>2 + <string name="joining_conference">Joining conference…</string> <string name="leave">Leave</string> <string name="contact_added_you">Contact added you to contact list</string> <string name="add_back">Add back</string> @@ -354,6 +352,8 @@ <string name="conference_banned">You are banned from this conference</string> <string name="conference_members_only">This conference is members only</string> <string name="conference_kicked">You have been kicked from this conference</string> + <string name="conference_shutdown">The conference was shut down</string> + <string name="conference_unknown_error">You are no longer in this conference</string> <string name="using_account">using account %s</string> <string name="checking_x">Checking %s on HTTP host</string> <string name="not_connected_try_again">You are not connected. Try again later</string> @@ -586,6 +586,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> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 190c2167..0cb1f759 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -193,7 +193,6 @@ <Preference android:key="remove_trusted_certificates" android:summary="@string/pref_remove_trusted_certificates_summary" - android:title="@string/pref_remove_trusted_certificates_title"/> </PreferenceCategory> <PreferenceCategory android:key="connection_options" |