moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-26 00:48:51 -05:00
Code Issues Releases Wiki Activity

#429 4)

Browse Source 
In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second
icon hint can be 'Keyserver' or just only 'server'
This commit is contained in:
Daniel Hammann 2014-03-17 22:17:05 +01:00
parent cab7a5c447
commit b39d37f59c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain/src/main/res/menu/key_view.xml
View File

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

2
OpenPGP-Keychain/src/main/res/values/arrays.xml
View File

@ -36,7 +36,7 @@
<item>@string/key_size_4096</item> <item>@string/key_size_4096</item>
</string-array> </string-array>
<string-array name="import_action_list" translatable="false"> <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_file</item>
<item>@string/menu_import_from_qr_code</item> <item>@string/menu_import_from_qr_code</item>
<item>@string/import_from_clipboard</item> <item>@string/import_from_clipboard</item>

5
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@ -84,10 +84,11 @@
<string name="menu_create_key">Create key</string> <string name="menu_create_key">Create key</string>
<string name="menu_create_key_expert">Create key (expert)</string> <string name="menu_create_key_expert">Create key (expert)</string>
<string name="menu_search">Search</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_update_key">Update from keyserver</string>
<string name="menu_export_key_to_server">Upload to key server</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_fingerprint">Share fingerprint…</string>
<string name="menu_share_title">Share whole key…</string> <string name="menu_share_title">Share whole key…</string>
<string name="menu_share_default_fingerprint">with…</string> <string name="menu_share_default_fingerprint">with…</string>