diff options
author | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
commit | df63c14617bc8d665bfeac62cde0b29e6aa98873 (patch) | |
tree | b825c0c87bcd9833ecfad85ecc5c0901ea4d77eb /src/main/res/menu/attachment_choices.xml | |
parent | 87e56b534ad41199380c97e16ad25acbd077878c (diff) | |
parent | e17b75511e7c9d8206939b742972021c5c9d6b86 (diff) |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/res/menu/attachment_choices.xml')
-rw-r--r-- | src/main/res/menu/attachment_choices.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index 5139272c..6e8fc51d 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -2,14 +2,21 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item - android:id="@+id/attach_choose_picture" - android:title="@string/attach_choose_picture"/> + android:id="@+id/attach_location" + android:title="@string/send_location"/> + + <item + android:id="@+id/attach_record_voice" + android:title="@string/attach_record_voice"/> + <item android:id="@+id/attach_take_picture" android:title="@string/attach_take_picture"/> - <item - android:id="@+id/attach_record_voice" - android:title="@string/attach_record_voice"/> + + <item + android:id="@+id/attach_choose_picture" + android:title="@string/attach_choose_picture"/> + <item android:id="@+id/attach_choose_file" android:title="@string/choose_file"/> |