aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-05 10:10:47 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-05 10:10:47 +0200
commit6d10ca678a541dddb26f43c9d415d14f6f5eceaf (patch)
treeee097be93497a90139f982bbf9851eeb2115dafd /OpenKeychain/src/main/res/values/strings.xml
parente48460bb7df8f2d40fe187f8c267fbba3fb43c75 (diff)
parent90b4db07925ec4741fedfa75eed4ed6acc533696 (diff)
downloadopen-keychain-6d10ca678a541dddb26f43c9d415d14f6f5eceaf.tar.gz
open-keychain-6d10ca678a541dddb26f43c9d415d14f6f5eceaf.tar.bz2
open-keychain-6d10ca678a541dddb26f43c9d415d14f6f5eceaf.zip
Merge pull request #603 from timbray/master
Adds first level of keybase support
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0c14efcec..76bf4bd82 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -79,6 +79,7 @@
<string name="menu_create_key_expert">Create key (expert)</string>
<string name="menu_search">Search</string>
<string name="menu_import_from_key_server">Keyserver</string>
+ <string name="menu_import_from_keybase">Import from Keybase.io</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>
@@ -353,6 +354,7 @@
<string name="hint_public_keys">Search Public Keys</string>
<string name="hint_secret_keys">Search Secret Keys</string>
<string name="action_share_key_with">Share Key with…</string>
+ <string name="hint_keybase_search">Search Keybase.io</string>
<!-- key bit length selections -->
<string name="key_size_512">512</string>
@@ -398,6 +400,7 @@
<string name="import_nfc_text">To receive keys via NFC, the device needs to be unlocked.</string>
<string name="import_nfc_help_button">Help</string>
<string name="import_clipboard_button">Get key from clipboard</string>
+ <string name="import_keybase_button">Get key from Keybase.io</string>
<!-- Intent labels -->
<string name="intent_decrypt_file">Decrypt File with OpenKeychain</string>