diff options
| author | Daniel Hammann <github@honnel.de> | 2014-03-17 22:17:05 +0100 |
|---|---|---|
| committer | Daniel Hammann <github@honnel.de> | 2014-03-17 22:17:05 +0100 |
| commit | b39d37f59c5d1633f22a45a37c7dc94d6c37d010 (patch) | |
| tree | 8408413c9c0133667b2f5ced6823701930af8929 | |
| parent | cab7a5c447cf7f834e16a8ed65e2af741c29352e (diff) | |
| download | open-keychain-b39d37f59c5d1633f22a45a37c7dc94d6c37d010.tar.gz open-keychain-b39d37f59c5d1633f22a45a37c7dc94d6c37d010.tar.bz2 open-keychain-b39d37f59c5d1633f22a45a37c7dc94d6c37d010.zip | |
#429 4)
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'
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/key_view.xml | 2 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml index cd84cc91a..105368cbb 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml @@ -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" diff --git a/OpenPGP-Keychain/src/main/res/values/arrays.xml b/OpenPGP-Keychain/src/main/res/values/arrays.xml index 5244de419..c84c2648d 100644 --- a/OpenPGP-Keychain/src/main/res/values/arrays.xml +++ b/OpenPGP-Keychain/src/main/res/values/arrays.xml @@ -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> diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 77891d6c7..d6550d63d 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -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> |