diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-05-09 21:00:04 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-05-09 21:00:04 +0200 |
| commit | 39d48e727039bc6c81ab04694fb7929f8414df8d (patch) | |
| tree | 052c81948f864911c8abcc649b7a607bd78f5c66 /src/main/res | |
| parent | a2e7c6c800c09bac24334484dd5ae739a6ac5355 (diff) | |
unified copy text and share with context menu entries
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/menu/message_context.xml | 14 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 0c3220683..a7e46bc7f 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -2,26 +2,22 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/copy_text" - android:title="@string/copy_text" - android:visible="false" /> - <item android:id="@+id/select_text" android:title="@string/select_text" android:visible="false" /> <item + android:id="@+id/share_with" + android:title="@string/share_with" + android:visible="false"/> + <item android:id="@+id/retry_decryption" - android:title="Retry decryption" + android:title="@string/retry_decryption" android:visible="false" /> <item android:id="@+id/correct_message" android:title="@string/correct_message" android:visible="false" /> <item - android:id="@+id/share_with" - android:title="@string/share_with" - android:visible="false" /> - <item android:id="@+id/copy_url" android:title="@string/copy_original_url" android:visible="false" /> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 85cb45e7d..0ec2bfd25 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -279,7 +279,6 @@ <string name="not_connected_try_again">Nicht verbunden, bitte später versuchen</string> <string name="check_x_filesize">%s-Größe prüfen</string> <string name="message_options">Nachrichtenoptionen</string> - <string name="copy_text">Text kopieren</string> <string name="copy_original_url">Original-URL kopieren</string> <string name="send_again">Erneut senden</string> <string name="file_url">Datei-URL</string> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 299be7392..0dbf82efd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -349,7 +349,6 @@ <string name="check_x_filesize">Check %s size</string> <string name="check_x_filesize_on_host">Check %1$s size on %2$s</string> <string name="message_options">Message options</string> - <string name="copy_text">Copy text</string> <string name="copy_original_url">Copy original URL</string> <string name="send_again">Send again</string> <string name="file_url">File URL</string> @@ -775,4 +774,5 @@ <string name="send_failed_resend">delivery failed, resending…</string> <string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string> <string name="pref_show_connection_options">Extended connection settings</string> + <string name="retry_decryption">Retry decryption</string> </resources> |