diff options
| author | lookshe <github@lookshe.org> | 2016-03-25 20:04:37 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-25 20:04:37 +0100 |
| commit | 27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (patch) | |
| tree | 20740102fb6502dd6b130f51054a681275f44431 /src/main/res | |
| parent | 86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff) | |
| parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) | |
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/menu/message_context.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 292a4938..0c7d8eef 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -32,5 +32,8 @@ android:id="@+id/cancel_transmission" android:title="@string/cancel_transmission" android:visible="false"/> - + <item + android:id="@+id/delete_file" + android:title="@string/delete_x_file" + android:visible="false"/> </menu>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 49207841..3e939114 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -399,6 +399,7 @@ <string name="choose_file">Choose file</string> <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string> <string name="download_x_file">Download %s</string> + <string name="delete_x_file">Delete %s</string> <string name="file">file</string> <string name="open_x_file">Open %s</string> <string name="sending_file">sending (%1$d%% completed)</string> |