diff options
| author | Christian S <christian@pix-art.de> | 2015-07-20 23:04:07 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-20 23:04:07 +0200 |
| commit | 5ffeed8edb2ad89f942631b93472282313d1559b (patch) | |
| tree | 5be64514c3a3452101b90fecd0cb829474528dc8 /src/main/res/menu | |
| parent | 7640c4d1d44ef9d83be4ad23ae4481879d0c351b (diff) | |
| parent | 8be0e8a27ddd4d55a48a38efc5434a581be6f1b3 (diff) | |
copy commits
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 | 48 |
3 files changed, 33 insertions, 22 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 4ce9e1f39..2076805ef 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 adf0ad8dc..1b3fe76ef 100644 --- a/src/main/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml @@ -11,6 +11,9 @@ <item android:id="@+id/encryption_choice_pgp" android:title="@string/encryption_choice_pgp"/> + <item + android:id="@+id/encryption_choice_axolotl" + android:title="@string/encryption_choice_axolotl"/> </group> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index e691e858a..713378942 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -7,30 +7,34 @@ <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/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> |