From 1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3 Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 12 Sep 2014 08:34:51 -0700
Subject: Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs

---
 OpenKeychain/src/main/res/values/strings.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 69bcca5a1..fe9dc0701 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">"&lt;no name&gt;"</string>
     <string name="none">"&lt;none&gt;"</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 (&lt; 16 characters)"</string>
-- 
cgit v1.2.3


From 53bc417f8f77a9f92786457281d02431ef614ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 15 Sep 2014 10:19:55 +0200
Subject: New decrypt activity design (WIP), saner UTF8 decoding (replacing
 non-decodable characters)

---
 OpenKeychain/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e1fcf4a0b..b4f1a2753 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -521,7 +521,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>
-- 
cgit v1.2.3