diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
| commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
| tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/values | |
| parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
| parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
| download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 883c3c878..5d0127f5c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -16,6 +16,7 @@ <string name="title_add_subkey">"Add subkey"</string> <string name="title_edit_key">"Edit Key"</string> <string name="title_preferences">"Preferences"</string> + <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string> <string name="title_api_registered_apps">"Apps"</string> <string name="title_key_server_preference">"Keyserver Preference"</string> <string name="title_change_passphrase">"Change Passphrase"</string> @@ -39,6 +40,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> <string name="section_keys">"Subkeys"</string> + <string name="section_cloud_search">"Cloud search"</string> <string name="section_general">"General"</string> <string name="section_defaults">"Defaults"</string> <string name="section_advanced">"Advanced"</string> @@ -125,6 +127,8 @@ <string name="label_send_key">"Upload key to selected keyserver after certification"</string> <string name="label_fingerprint">"Fingerprint"</string> <string name="expiry_date_dialog_title">"Set expiry date"</string> + <string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string> + <string name="label_preferred">"preferred"</string> <string name="user_id_no_name">"<no name>"</string> <string name="none">"<none>"</string> @@ -323,7 +327,7 @@ <!-- action strings --> <string name="hint_keyserver_search_hint">"Name/Email/Key ID…"</string> - <string name="hint_keybase_search_hint">"Name/Email/Proof/Key…"</string> + <string name="hint_cloud_search_hint">"Name/Email/Proof/Key…"</string> <!-- key bit length selections --> <string name="key_size_512">"512"</string> @@ -364,9 +368,9 @@ <!-- Import --> <string name="import_tab_keyserver">"Keyserver"</string> + <string name="import_tab_cloud">"Search Cloud"</string> <string name="import_tab_direct">"File/Clipboard"</string> <string name="import_tab_qr_code">"QR Code/NFC"</string> - <string name="import_tab_keybase">"Keybase.io"</string> <string name="import_import">"Import selected keys"</string> <string name="import_qr_code_wrong">"QR Code malformed! Please try again!"</string> <string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (< 16 characters)"</string> @@ -519,7 +523,6 @@ <!-- hints --> <string name="encrypt_content_edit_text_hint">"Type text"</string> - <string name="decrypt_content_edit_text_hint">"Enter ciphertext here to decrypt and/or verify…"</string> <!-- certs --> <string name="cert_default">"default"</string> |