diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 00:30:10 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 00:30:10 +0200 |
| commit | f51aebf52d36a43c8c38ed23b6111a005c1b2a4d (patch) | |
| tree | 7ca94a107a3f4859a5857b2afb1a1b1aaf969b79 /OpenKeychain/src/main/res | |
| parent | 94693efbe56a7786cc468e061e5647e2a423cf1a (diff) | |
| download | open-keychain-f51aebf52d36a43c8c38ed23b6111a005c1b2a4d.tar.gz open-keychain-f51aebf52d36a43c8c38ed23b6111a005c1b2a4d.tar.bz2 open-keychain-f51aebf52d36a43c8c38ed23b6111a005c1b2a4d.zip | |
Move some multi select items in overflow menu, rename import
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_list_multi.xml | 19 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml index 087521177..3e0f87692 100644 --- a/OpenKeychain/src/main/res/menu/key_list_multi.xml +++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/menu_key_list_multi_export" - android:icon="@drawable/ic_action_import_export" - android:title="@string/menu_export_key" /> +<menu xmlns:tools="http://schemas.android.com/tools" + xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/menu_key_list_multi_encrypt" @@ -12,13 +8,24 @@ android:title="@string/menu_encrypt_to" /> <item + android:id="@+id/menu_key_list_multi_export" + android:icon="@drawable/ic_action_import_export" + android:showAsAction="never" + tools:ignore="AppCompatResource" + android:title="@string/menu_export_key" /> + + <item android:id="@+id/menu_key_list_multi_delete" android:icon="@drawable/ic_action_discard" + android:showAsAction="never" + tools:ignore="AppCompatResource" android:title="@string/menu_delete_key" /> <item android:id="@+id/menu_key_list_multi_select_all" android:icon="@drawable/ic_action_select_all" + android:showAsAction="never" + tools:ignore="AppCompatResource" android:title="@string/menu_select_all" /> </menu> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 73d5c612c..80e52f6e2 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -89,7 +89,7 @@ <string name="menu_export_key">"Export to file"</string> <string name="menu_delete_key">"Delete key"</string> <string name="menu_create_key">"Create my key"</string> - <string name="menu_import_existing_key">"Import existing key"</string> + <string name="menu_import_existing_key">"Import from file"</string> <string name="menu_search">"Search"</string> <string name="menu_beam_preferences">"Beam settings"</string> <string name="menu_key_edit_cancel">"Cancel"</string> @@ -1044,7 +1044,7 @@ <!-- First Time --> <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> <string name="first_time_create_key">"Create my key"</string> - <string name="first_time_import_key">"Import existing key"</string> + <string name="first_time_import_key">"Import from file"</string> <string name="first_time_skip">"Skip Setup"</string> </resources> |