From c05441667e151dceb6f5874b290d70a53258061b Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 7 Nov 2014 12:28:27 -0800
Subject: Moved from WebView to Spannables, some proof cleanup too

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

(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 e2b92d875..f582bd746 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -44,6 +44,9 @@
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
+    <string name="section_should_you_trust">"Should you trust this key?"</string>
+    <string name="section_proof_details">Proof verification</string>
+    <string name="section_cloud_evidence">"Evidence from the cloud"</string>
     <string name="section_keys">"Subkeys"</string>
     <string name="section_cloud_search">"Cloud search"</string>
     <string name="section_general">"General"</string>
@@ -525,6 +528,7 @@
     <string name="key_view_tab_share">"Share"</string>
     <string name="key_view_tab_keys">"Subkeys"</string>
     <string name="key_view_tab_certs">"Certificates"</string>
+    <string name="key_view_tab_trust">"Trust this key?"</string>
     <string name="user_id_info_revoked_title">"Revoked"</string>
     <string name="user_id_info_revoked_text">"This identity has been revoked by the key owner. It is no longer valid."</string>
     <string name="user_id_info_certified_title">"Certified"</string>
@@ -534,6 +538,37 @@
     <string name="user_id_info_invalid_title">"Invalid"</string>
     <string name="user_id_info_invalid_text">"Something is wrong with this identity!"</string>
 
+    <!-- Key trust -->
+    <string name="key_trust_already_verified">"You have already certified this key!"</string>
+    <string name="key_trust_it_is_yours">"This is one of your keys!"</string>
+    <string name="key_trust_maybe">"This key is neither revoked nor expired.\nYou haven’t certified it, but you may choose to trust it."</string>
+    <string name="key_trust_revoked">"This key has been revoked by its owner. You should not trust it."</string>
+    <string name="key_trust_expired">"This key has expired. You should not trust it."</string>
+    <string name="key_trust_old_keys">" It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
+    <string name="key_trust_no_cloud_evidence">"No evidence from the cloud on this key’s trustworthiness."</string>
+    <string name="key_trust_start_cloud_search">"Start search"</string>
+    <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>
+
+    <!-- keybase proof stuff -->
+    <string name="keybase_narrative_twitter">"Posts to Twitter as"</string>
+    <string name="keybase_narrative_github">"Is known on GitHub as"</string>
+    <string name="keybase_narrative_dns">"Controls the domain name(s)"</string>
+    <string name="keybase_narrative_web_site">"Can post to the Web site(s)"</string>
+    <string name="keybase_narrative_reddit">"Posts to Reddit as"</string>
+    <string name="keybase_narrative_coinbase">"Is known on Coinbase as"</string>
+    <string name="keybase_narrative_hackernews">"Posts to Hacker News as"</string>
+    <string name="keybase_narrative_unknown">"Unknown proof type"</string>
+    <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
+    <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
+    <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_no_prover_found">"No proof checker found for"</string>
+    <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
+    <string name="keybase_message_fetching_data">"Fetching proof evidence"</string>
+    <string name="keybase_proof_succeeded">"This proof has been verified!"</string>
+    <string name="keybase_a_post">"A post"</string>
+    <string name="keybase_fetched_from">"fetched from"</string>
+    <string name="keybase_contained_signature">"contains a message which could only have been created by the owner of this key."</string>
+
     <!-- Edit key -->
     <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
     <string name="edit_key_action_add_identity">"Add Identity"</string>
@@ -894,6 +929,19 @@
     <string name="msg_dc_trail_unknown">"Encountered trailing data of unknown type"</string>
     <string name="msg_dc_unlocking">"Unlocking secret key"</string>
 
+    <!-- Messages for VerifySignedLiteralData operation -->
+    <string name="msg_vl">"Starting signature check"</string>
+    <string name="msg_vl_error_no_siglist">"No signature list in signed literal data"</string>
+    <string name="msg_vl_error_wrong_key">"Message not signed with right key"</string>
+    <string name="msg_vl_error_missing_literal">"No payload in signed literal data"</string>
+    <string name="msg_vl_clear_meta_file">"Filename: %s"</string>
+    <string name="msg_vl_clear_meta_mime">"MIME type: %s"</string>
+    <string name="msg_vl_clear_meta_time">"Modification time: %s"</string>
+    <string name="msg_vl_clear_meta_size">"Filesize: %s"</string>
+    <string name="msg_vl_clear_signature_check">"Verifying signature data"</string>
+    <string name="msg_vl_error_integrity_check">"Integrity check error!"</string>
+    <string name="msg_vl_ok">"OK"</string>
+
     <!-- Messages for SignEncrypt operation -->
     <string name="msg_se_asymmetric">"Preparing public keys for encryption"</string>
     <string name="msg_se_clearsign_only">"Signing of cleartext input not supported!"</string>
-- 
cgit v1.2.3


From 36bac67dd5f19b72a58584f2fab104e6e26df66a Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Tue, 11 Nov 2014 18:45:36 -0800
Subject: All keybase proofs now in place

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

(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 f582bd746..9596cccc1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -567,7 +567,14 @@
     <string name="keybase_proof_succeeded">"This proof has been verified!"</string>
     <string name="keybase_a_post">"A post"</string>
     <string name="keybase_fetched_from">"fetched from"</string>
+    <string name="keybase_for_the_domain">"for the domain"</string>
     <string name="keybase_contained_signature">"contains a message which could only have been created by the owner of this key."</string>
+    <string name="keybase_twitter_proof">"A tweet"</string>
+    <string name="keybase_dns_proof">"A DNS TXT record"</string>
+    <string name="keybase_web_site_proof">"A text file"</string>
+    <string name="keybase_github_proof">"A gist"</string>
+    <string name="keybase_reddit_proof">"A JSON file"</string>
+    <string name="keybase_reddit_attribution">"attributed by Reddit to"</string>
 
     <!-- Edit key -->
     <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
-- 
cgit v1.2.3


From 0f59e6bd950087d99a0909e55276e649639bb51b Mon Sep 17 00:00:00 2001
From: Tim Bray <tbray@textuality.com>
Date: Tue, 18 Nov 2014 22:12:50 -0800
Subject: In the ImportKeysList display, arrange for Keybase UserIDs to sort
 below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website

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

(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 9596cccc1..27c81fe21 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -575,6 +575,7 @@
     <string name="keybase_github_proof">"A gist"</string>
     <string name="keybase_reddit_proof">"A JSON file"</string>
     <string name="keybase_reddit_attribution">"attributed by Reddit to"</string>
+    <string name="keybase_verify">"Verify"</string>
 
     <!-- Edit key -->
     <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
-- 
cgit v1.2.3


From b5cdeb7f5a54be7443894ca2cb4bd27359fae9ce Mon Sep 17 00:00:00 2001
From: Tim Bray <tbray@textuality.com>
Date: Wed, 19 Nov 2014 14:35:05 -0800
Subject: Prevent multiple cloud-trust-search launches.  Handle DNS query
 failure gracefully.  Fixes #1007 & #1008.

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

(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 27c81fe21..59c0ce408 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -561,6 +561,7 @@
     <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
     <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
     <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_dns_query_failure">"DNS TXT Record retrieval failed"</string>
     <string name="keybase_no_prover_found">"No proof checker found for"</string>
     <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
     <string name="keybase_message_fetching_data">"Fetching proof evidence"</string>
-- 
cgit v1.2.3


From 2a608c12ca592c8662586898a161e7054fc0693c Mon Sep 17 00:00:00 2001
From: Tim Bray <tbray@textuality.com>
Date: Sat, 22 Nov 2014 09:27:28 -0800
Subject: Check fingerprint match between proof & database

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

(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 b98f47146..cac38c361 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -562,6 +562,7 @@
     <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
     <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
     <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_key_mismatch">"Key fingerprint doesn’t match that in proof post"</string>
     <string name="keybase_dns_query_failure">"DNS TXT Record retrieval failed"</string>
     <string name="keybase_no_prover_found">"No proof checker found for"</string>
     <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
-- 
cgit v1.2.3