Merge pull request #431 from honnel/ui-modification

Ui modification
This commit is contained in:
Dominik Schürmann 2014-03-18 14:57:32 +01:00
commit 72a5d6d870
3 changed files with 5 additions and 4 deletions

View File

@ -52,7 +52,7 @@
android:id="@+id/menu_key_keyserver"
android:icon="@drawable/ic_action_import_export"
app:showAsAction="always"
android:title="@string/menu_share">
android:title="@string/menu_key_server">
<menu>
<item
android:id="@+id/menu_key_view_update"

View File

@ -36,7 +36,7 @@
<item>@string/key_size_4096</item>
</string-array>
<string-array name="import_action_list" translatable="false">
<item>@string/menu_key_server</item>
<item>@string/menu_import_from_key_server</item>
<item>@string/menu_import_from_file</item>
<item>@string/menu_import_from_qr_code</item>
<item>@string/import_from_clipboard</item>

View File

@ -84,10 +84,11 @@
<string name="menu_create_key">Create key</string>
<string name="menu_create_key_expert">Create key (expert)</string>
<string name="menu_search">Search</string>
<string name="menu_key_server">Import from keyserver</string>
<string name="menu_import_from_key_server">Keyserver</string>
<string name="menu_key_server">Keyserver…</string>
<string name="menu_update_key">Update from keyserver</string>
<string name="menu_export_key_to_server">Upload to key server</string>
<string name="menu_share">Share</string>
<string name="menu_share">Share</string>
<string name="menu_share_title_fingerprint">Share fingerprint…</string>
<string name="menu_share_title">Share whole key…</string>
<string name="menu_share_default_fingerprint">with…</string>