aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/values
diff options
context:
space:
mode:
authorDaniel Hammann <github@honnel.de>2014-03-17 22:17:05 +0100
committerDaniel Hammann <github@honnel.de>2014-03-17 22:17:05 +0100
commitb39d37f59c5d1633f22a45a37c7dc94d6c37d010 (patch)
tree8408413c9c0133667b2f5ced6823701930af8929 /OpenPGP-Keychain/src/main/res/values
parentcab7a5c447cf7f834e16a8ed65e2af741c29352e (diff)
downloadopen-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'
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/values')
-rw-r--r--OpenPGP-Keychain/src/main/res/values/arrays.xml2
-rw-r--r--OpenPGP-Keychain/src/main/res/values/strings.xml5
2 files changed, 4 insertions, 3 deletions
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>