diff options
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 4 | ||||
| -rw-r--r-- | src/main/res/menu/encryption_choices.xml | 3 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details_context.xml | 52 |
3 files changed, 37 insertions, 22 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 4ce9e1f3..2076805e 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -20,4 +20,8 @@ <item android:id="@+id/action_change_password_on_server" android:title="@string/change_password" android:showAsAction="never" /> + + <item android:id="@+id/action_clear_devices" + android:title="@string/clear_other_devices" + android:showAsAction="never"/> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml index adf0ad8d..9af2cd34 100644 --- a/src/main/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml @@ -6,6 +6,9 @@ android:id="@+id/encryption_choice_none" android:title="@string/encryption_choice_none"/> <item + android:id="@+id/encryption_choice_axolotl" + android:title="@string/encryption_choice_omemo"/> + <item android:id="@+id/encryption_choice_otr" android:title="@string/encryption_choice_otr"/> <item diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index dc0f5d3e..af5e691b 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -3,30 +3,38 @@ <item android:id="@+id/start_conversation" android:title="@string/start_conversation" - android:visible="false" /> - <item - android:id="@+id/give_membership" + android:visible="false"/> + <item + android:id="@+id/action_contact_details" + android:title="@string/action_contact_details" + android:visible="false"/> + <item + android:id="@+id/send_private_message" + android:title="@string/send_private_message" + android:visible="false"/> + <item + android:id="@+id/give_membership" android:title="@string/grant_membership" - android:visible="false" /> - <item - android:id="@+id/give_admin_privileges" + android:visible="false"/> + <item + android:id="@+id/give_admin_privileges" android:title="@string/grant_admin_privileges" - android:visible="false"/> - <item - android:id="@+id/remove_admin_privileges" + android:visible="false"/> + <item + android:id="@+id/remove_admin_privileges" android:title="@string/remove_admin_privileges" - android:visible="false"/> + android:visible="false"/> - <item - android:id="@+id/remove_membership" - android:title="@string/remove_membership" - android:visible="false"/> - <item - android:id="@+id/ban_from_conference" - android:title="@string/ban_from_conference" - android:visible="false" /> - <item - android:id="@+id/remove_from_room" + <item + android:id="@+id/remove_membership" + android:title="@string/remove_membership" + android:visible="false"/> + <item + android:id="@+id/ban_from_conference" + android:title="@string/ban_from_conference" + android:visible="false"/> + <item + android:id="@+id/remove_from_room" android:title="@string/remove_from_room" - android:visible="false"/> -</menu>
\ No newline at end of file + android:visible="false"/> +</menu> |