diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
| commit | 4b11fa4c69834d8e03b18032e12b0ce788da2f70 (patch) | |
| tree | 05dac279672a3a207699dc78d44e6cede0f07fb5 /src/main/res/menu | |
| parent | 2fdd4e6518e16949ce483b15471714b10e9cb92e (diff) | |
| parent | bfe01c432244e04daf6804d5cfc3b838ea247c4b (diff) | |
Merge tag '1.11.7' into trz/merge_1.11.7
Conflicts:
README.md
build.gradle
gradle/wrapper/gradle-wrapper.properties
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/AvatarService.java
src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
src/main/java/eu/siacs/conversations/services/NotificationService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/muc_details.xml | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 51de4e75..ad79f577 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/action_edit_subject" @@ -8,26 +8,33 @@ android:showAsAction="always" android:title="@string/action_edit_subject"/> <item + android:id="@+id/action_share" + android:icon="?attr/icon_share" + android:showAsAction="always" + android:orderInCategory="15" + android:title="@string/share_uri_with"/> + + <item android:id="@+id/action_show_qr_code" - android:title="@string/show_qr_code" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/show_qr_code"/> <item android:id="@+id/action_save_as_bookmark" - android:title="@string/save_as_bookmark" android:orderInCategory="80" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/save_as_bookmark"/> <item android:id="@+id/action_delete_bookmark" - android:title="@string/delete_bookmark" android:orderInCategory="80" - android:showAsAction="never" /> - <item - android:id="@+id/action_advanced_mode" - android:title="@string/advanced_mode" - android:checkable="true" - android:checked="false" - android:orderInCategory="85" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/delete_bookmark"/> + <item + android:id="@+id/action_advanced_mode" + android:checkable="true" + android:checked="false" + android:orderInCategory="85" + android:showAsAction="never" + android:title="@string/advanced_mode"/> <item android:id="@+id/action_accounts" android:orderInCategory="90" |