diff options
| author | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
| commit | 927dde01a827a91a24495bd868575cefd981f8c2 (patch) | |
| tree | f09ed178937f28b85d1499951cff3faa64988250 /src/main/res | |
| parent | 67eb44af3c5012cdc2da3af4ae94cf7fa51a3ef1 (diff) | |
| parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/menu/message_context.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 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 4096297c7..bc8acede0 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -33,5 +33,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-de/strings.xml b/src/main/res/values-de/strings.xml index f2866f33c..8ff58ede1 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -606,5 +606,6 @@ <string name="preparing_images">Bilder werden für Übertragung vorbereitet</string> <string name="shared_images_with_x">Bilder mit %s geteilt</string> <string name="sharing_files_please_wait">Teile Dateien. Bitte warten…</string> + <string name="delete_x_file">%s löschen</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 52624196d..59d2a7b9d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -386,6 +386,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> |