Move some multi select items in overflow menu, rename import

This commit is contained in:
Dominik Schürmann 2014-10-26 00:30:10 +02:00
parent 94693efbe5
commit f51aebf52d
2 changed files with 15 additions and 8 deletions

View File

@ -1,24 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <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_export"
android:icon="@drawable/ic_action_import_export"
android:title="@string/menu_export_key" />
<item <item
android:id="@+id/menu_key_list_multi_encrypt" android:id="@+id/menu_key_list_multi_encrypt"
android:icon="@drawable/ic_action_secure" android:icon="@drawable/ic_action_secure"
android:title="@string/menu_encrypt_to" /> 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 <item
android:id="@+id/menu_key_list_multi_delete" android:id="@+id/menu_key_list_multi_delete"
android:icon="@drawable/ic_action_discard" android:icon="@drawable/ic_action_discard"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_delete_key" /> android:title="@string/menu_delete_key" />
<item <item
android:id="@+id/menu_key_list_multi_select_all" android:id="@+id/menu_key_list_multi_select_all"
android:icon="@drawable/ic_action_select_all" android:icon="@drawable/ic_action_select_all"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_select_all" /> android:title="@string/menu_select_all" />
</menu> </menu>

View File

@ -89,7 +89,7 @@
<string name="menu_export_key">"Export to file"</string> <string name="menu_export_key">"Export to file"</string>
<string name="menu_delete_key">"Delete key"</string> <string name="menu_delete_key">"Delete key"</string>
<string name="menu_create_key">"Create my 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_search">"Search"</string>
<string name="menu_beam_preferences">"Beam settings"</string> <string name="menu_beam_preferences">"Beam settings"</string>
<string name="menu_key_edit_cancel">"Cancel"</string> <string name="menu_key_edit_cancel">"Cancel"</string>
@ -1044,7 +1044,7 @@
<!-- First Time --> <!-- First Time -->
<string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> <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_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> <string name="first_time_skip">"Skip Setup"</string>
</resources> </resources>