diff options
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/attachment_choices.xml | 14 | ||||
-rw-r--r-- | res/menu/contact_details.xml | 4 | ||||
-rw-r--r-- | res/menu/encryption_choices.xml | 6 | ||||
-rw-r--r-- | res/menu/manageaccounts_context.xml | 8 | ||||
-rw-r--r-- | res/menu/newconversation.xml | 6 |
5 files changed, 23 insertions, 15 deletions
diff --git a/res/menu/attachment_choices.xml b/res/menu/attachment_choices.xml new file mode 100644 index 00000000..6a4f295a --- /dev/null +++ b/res/menu/attachment_choices.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/attach_choose_picture" + android:title="@string/attach_choose_picture"/> + <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" + android:visible="false"/> +</menu>
\ No newline at end of file diff --git a/res/menu/contact_details.xml b/res/menu/contact_details.xml index 5d4a8d56..43e8ea6a 100644 --- a/res/menu/contact_details.xml +++ b/res/menu/contact_details.xml @@ -5,13 +5,13 @@ android:orderInCategory="10" android:showAsAction="always" android:icon="@drawable/ic_action_edit" - android:title="Edit name" /> + android:title="@string/action_edit_contact" /> <item android:id="@+id/action_delete_contact" android:orderInCategory="10" android:showAsAction="always" android:icon="@drawable/ic_action_discard" - android:title="Delete from roster" /> + android:title="@string/action_delete_contact" /> <item android:id="@+id/action_accounts" android:orderInCategory="90" diff --git a/res/menu/encryption_choices.xml b/res/menu/encryption_choices.xml index ade17654..0596bfbc 100644 --- a/res/menu/encryption_choices.xml +++ b/res/menu/encryption_choices.xml @@ -4,14 +4,14 @@ <item android:id="@+id/encryption_choice_none" - android:title="Plain text" + android:title="@string/encryption_choice_none" /> <item android:id="@+id/encryption_choice_otr" - android:title="OTR" + android:title="@string/encryption_choice_otr" /> <item android:id="@+id/encryption_choice_pgp" - android:title="OpenPGP"/> + android:title="@string/encryption_choice_pgp"/> </group> </menu> diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml index da8c8bf2..5f76b0e0 100644 --- a/res/menu/manageaccounts_context.xml +++ b/res/menu/manageaccounts_context.xml @@ -5,20 +5,20 @@ android:id="@+id/mgmt_account_edit" android:icon="@drawable/ic_action_edit" android:showAsAction="always" - android:title="Edit Account"/> + android:title="@string/mgmt_account_edit"/> <item android:id="@+id/mgmt_account_delete" android:icon="@drawable/ic_action_delete" android:showAsAction="always" - android:title="Delete"/> + android:title="@string/mgmt_account_delete"/> <item android:id="@+id/mgmt_account_disable" android:showAsAction="never" - android:title="Temporarily disable"/> + android:title="@string/mgmt_account_disable"/> <item android:id="@+id/mgmt_account_enable" android:showAsAction="never" - android:title="Enable" + android:title="@string/mgmt_account_enable" android:visible="false"/> <item android:id="@+id/mgmt_account_announce_pgp" diff --git a/res/menu/newconversation.xml b/res/menu/newconversation.xml index ca6a57e1..4f9b6da0 100644 --- a/res/menu/newconversation.xml +++ b/res/menu/newconversation.xml @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item - android:id="@+id/action_refresh_contacts" - android:orderInCategory="10" - android:showAsAction="always" - android:icon="@drawable/ic_action_refresh" - android:title="Refresh contact list" /> - <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" |