From d46fc3740bbfc3bac0b1133a3e9d47c7ce3e06e2 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 18 Mar 2015 21:12:31 +0100
Subject: yubikey certifications!

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f1c14bd32..2eb167c8c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1099,9 +1099,9 @@
     <string name="msg_crt_error_master_not_found">"Master key not found!"</string>
     <string name="msg_crt_error_nothing">"No keys certified!"</string>
     <string name="msg_crt_error_unlock">"Error unlocking master key!"</string>
-    <string name="msg_crt_error_divert">"Certification with NFC is not (yet) supported!"</string>
     <string name="msg_crt">"Certifying keyrings"</string>
     <string name="msg_crt_master_fetch">"Fetching certifying master key"</string>
+    <string name="msg_crt_nfc_return">"Returning for NFC input"</string>
     <string name="msg_crt_save">"Saving certified key %s"</string>
     <string name="msg_crt_saving">"Saving keyrings"</string>
     <string name="msg_crt_unlock">"Unlocking master key"</string>
-- 
cgit v1.2.3


From 3b04636f5daf3d171449296a5d9a67440abfbf75 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Mar 2015 02:27:05 +0100
Subject: support yubikeys in (some) edit key operations

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2eb167c8c..e8bcbcc31 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -897,6 +897,7 @@
 
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">"Modifying keyring %s"</string>
+    <string name="msg_mf_divert">"Will divert to card/nfc for crypto operations"</string>
     <string name="msg_mf_error_divert_serial">"The serial number of a divert-to-card key must be 16 bytes! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_encode">"Encoding exception!"</string>
     <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string>
@@ -911,6 +912,7 @@
     <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
+    <string name="msg_mf_input_required">"Diverting to card/nfc for crypto operations"</string>
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -987,7 +989,6 @@
     <string name="msg_pr_success">"Key successfully promoted"</string>
 
     <!-- Other messages used in OperationLogs -->
-    <string name="msg_ek_error_divert">"Editing of NFC keys is not (yet) supported!"</string>
     <string name="msg_ek_error_dummy">"Cannot edit keyring with stripped master key!"</string>
     <string name="msg_ek_error_not_found">"Key not found!"</string>
 
-- 
cgit v1.2.3


From 3e51da3afa542c62b82bbcf9a953cdcd379950a2 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Mar 2015 18:45:00 +0100
Subject: fix unit tests (for real)

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a7e9cdf7e..76514575c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -913,7 +913,7 @@
     <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
-    <string name="msg_mf_input_required">"Diverting to card/nfc for crypto operations"</string>
+    <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -923,8 +923,10 @@
     <string name="msg_mf_passphrase_fail">"Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)"</string>
     <string name="msg_mf_primary_replace_old">"Replacing certificate of previous primary user ID"</string>
     <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
+    <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
     <string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
-    <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
+    <string name="msg_mf_require_divert">"Diverting to card/nfc for crypto operations"</string>
+    <string name="msg_mf_require_passphrase">"Passphrase required for operations"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
     <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
     <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
-- 
cgit v1.2.3


From 88ca41d55586e5084cc3f177eb12617aa640ae1d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Mar 2015 18:55:16 +0100
Subject: add edit key unit test for no-op

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 76514575c..6c8ccd340 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -910,6 +910,7 @@
     <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string>
     <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string>
+    <string name="msg_mf_error_noop">"Nothing to do!"</string>
     <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
-- 
cgit v1.2.3


From a7c52a1c9f8bca83b2981347a0eceeec68a92790 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 02:36:10 +0100
Subject: move yubikey import into viewkeyfragment

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6c8ccd340..bcee267fd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -48,6 +48,7 @@
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
+    <string name="section_yubikey">"Yubikey"</string>
     <string name="section_linked_system_contact">"Linked System Contact"</string>
     <string name="section_should_you_trust">"Should you trust this key?"</string>
     <string name="section_proof_details">Proof verification</string>
@@ -1267,5 +1268,6 @@
     <string name="nfc_write_succesful">Successfully written on NFC tag</string>
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
+    <string name="snack_yubikey_view">View</string>
 
 </resources>
-- 
cgit v1.2.3


From 22063cdd6eca32e83e7937a849e70185a1faee2a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 03:34:34 +0100
Subject: improve status reporting in yubikey dialogue

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index bcee267fd..f7a9a671e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1269,5 +1269,9 @@
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
     <string name="snack_yubikey_view">View</string>
+    <string name="button_bind_key">Bind Key</string>
+    <string name="yubikey_serno">"Serial No: %s"</string>
+    <string name="yubikey_key_holder">"Key holder: "</string>
+    <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
 
 </resources>
-- 
cgit v1.2.3


From 2151411219b4e5d609d25fcbb574ccf399f54d6f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 03:56:58 +0100
Subject: actually promote to divert, pass yubikey's AID

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f7a9a671e..6dfdb8997 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -988,7 +988,6 @@
 
     <!-- Promote key -->
     <string name="msg_pr">"Promoting public key to secret key"</string>
-    <string name="msg_pr_error_already_secret">"Key is already a secret key!"</string>
     <string name="msg_pr_error_key_not_found">"Key not found!"</string>
     <string name="msg_pr_fetching">"Fetching key to modify (%s)"</string>
     <string name="msg_pr_success">"Key successfully promoted"</string>
@@ -1273,5 +1272,8 @@
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
+    <string name="yubikey_status_bound">Yubikey matches, bound to key</string>
+    <string name="yubikey_status_unbound">Yubikey matches, can be bound to key</string>
+    <string name="yubikey_status_partly">Yubikey matches, partly bound to key</string>
 
 </resources>
-- 
cgit v1.2.3


From 212bba18693ebfce2dfa62afde8b11e8f0c2da0d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 06:36:27 +0100
Subject: finish ui flow for yubikey import

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6dfdb8997..27eda28a0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1124,7 +1124,7 @@
     <string name="msg_import_fetch_error_decode">"Error decoding retrieved keyring!"</string>
     <string name="msg_import_fetch_error">"Key could not be retrieved! (Network problems?)"</string>
     <string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string>
-    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keybase!"</string>
+    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keyservers: %s"</string>
     <string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string>
     <string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string>
     <string name="msg_import_keyserver">"Using keyserver %s"</string>
@@ -1267,13 +1267,15 @@
     <string name="nfc_write_succesful">Successfully written on NFC tag</string>
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
-    <string name="snack_yubikey_view">View</string>
-    <string name="button_bind_key">Bind Key</string>
+    <string name="snack_yubikey_view">"View"</string>
+    <string name="snack_yubikey_import">"Import"</string>
+    <string name="button_bind_key">"Bind Key"</string>
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
-    <string name="yubikey_status_bound">Yubikey matches, bound to key</string>
-    <string name="yubikey_status_unbound">Yubikey matches, can be bound to key</string>
-    <string name="yubikey_status_partly">Yubikey matches, partly bound to key</string>
+    <string name="yubikey_status_bound">"Yubikey matches, bound to key"</string>
+    <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string>
+    <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
+    <string name="btn_import">"Import"</string>
 
 </resources>
-- 
cgit v1.2.3


From 2e838e4cce32a5926466b6069a58c6a3579c12bf Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 06:48:33 +0100
Subject: enable nfc in import dialog as well

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 27eda28a0..6aefbc7f5 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1273,9 +1273,10 @@
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
-    <string name="yubikey_status_bound">"Yubikey matches, bound to key"</string>
+    <string name="yubikey_status_bound">"Yubikey matches and is bound to key"</string>
     <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string>
     <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
     <string name="btn_import">"Import"</string>
+    <string name="snack_yubi_other">Different key stored on Yubikey!</string>
 
 </resources>
-- 
cgit v1.2.3


From 3bb194fc080e5945dc8bdbeea9b91cf801406c32 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 23 Mar 2015 01:09:39 +0100
Subject: nicer handling of nfc errors

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6aefbc7f5..402dcdf7c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1278,5 +1278,6 @@
     <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
     <string name="btn_import">"Import"</string>
     <string name="snack_yubi_other">Different key stored on Yubikey!</string>
+    <string name="error_nfc">"NFC Error: %s"</string>
 
 </resources>
-- 
cgit v1.2.3


From c694d73cab1edf91cb94d53cc8352ca93f0eb6ce Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 23 Mar 2015 01:44:14 +0100
Subject: further improve yubikey error handling

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 402dcdf7c..c8e5ea7ca 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1279,5 +1279,6 @@
     <string name="btn_import">"Import"</string>
     <string name="snack_yubi_other">Different key stored on Yubikey!</string>
     <string name="error_nfc">"NFC Error: %s"</string>
+    <string name="error_pin_nodefault">Default PIN was rejected!</string>
 
 </resources>
-- 
cgit v1.2.3


From 726ff0b501644e0cef6d5d4a086e73c258b2361c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 29 Mar 2015 21:00:36 +0200
Subject: Fix strings with email address

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 274504315..78940aa9e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -262,7 +262,7 @@
     <string name="error_external_storage_not_ready">"external storage not ready"</string>
     <string name="error_key_size_minimum512bit">"key size must be at least 512bit"</string>
     <string name="error_unknown_algorithm_choice">"unknown algorithm choice"</string>
-    <string name="error_user_id_no_email">"no email found"</string>
+    <string name="error_user_id_no_email">"no email address found"</string>
     <string name="error_key_needs_a_user_id">"need at least one identity"</string>
     <string name="error_no_signature_passphrase">"no passphrase given"</string>
     <string name="error_no_signature_key">"no signature key given"</string>
@@ -630,7 +630,7 @@
     <string name="create_key_edit">"Change key configuration"</string>
     <string name="create_key_add_email">"Add email address"</string>
     <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
-    <string name="create_key_email_already_exists_text">"Email has already been added"</string>
+    <string name="create_key_email_already_exists_text">"Email address has already been added"</string>
 
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
-- 
cgit v1.2.3


From 39b131c7e58c358adf93bb64fe297884664a4ae1 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 30 Mar 2015 23:35:32 +0200
Subject: fix Encrypt* with RequiredInputParcel

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 78940aa9e..6d29ce3fd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1048,7 +1048,6 @@
     <string name="msg_se_error_input_uri_not_found">"Error opening URI for reading!"</string>
     <string name="msg_se_error_output_uri_not_found">"Error opening URI for writing!"</string>
     <string name="msg_se_error_too_many_inputs">"More inputs than outputs specified! This is probably a programming error, please report!"</string>
-    <string name="msg_se_warn_output_left">"Got outputs left but no inputs. This is probably a programming error, please report!"</string>
     <string name="msg_se_success">"Sign/encrypt operation successful"</string>
 
     <!-- Messages for PgpSignEncrypt operation -->
-- 
cgit v1.2.3


From aea52f2e6f5463b0a957a36a14604d56b342069c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 31 Mar 2015 00:24:08 +0200
Subject: Simplify passphrase dialog design

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6d29ce3fd..8d148c8fe 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="title_encrypt_text">"Encrypt"</string>
     <string name="title_encrypt_files">"Encrypt"</string>
     <string name="title_decrypt">"Decrypt"</string>
-    <string name="title_unlock">"Unlock Key"</string>
     <string name="title_add_subkey">"Add subkey"</string>
     <string name="title_edit_key">"Edit Key"</string>
     <string name="title_preferences">"Settings"</string>
@@ -86,6 +85,7 @@
     <string name="btn_encrypt_files">"Encrypt files"</string>
     <string name="btn_encrypt_text">"Encrypt text"</string>
     <string name="btn_add_email">"Add additional email address"</string>
+    <string name="btn_unlock">"Unlock"</string>
 
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
-- 
cgit v1.2.3


From 7c258bdedde0c7906253f82bb352ec9de170bb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 31 Mar 2015 00:32:48 +0200
Subject: From passphrase to password

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8d148c8fe..78ab45cf3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="title_preferences">"Settings"</string>
     <string name="title_api_registered_apps">"Apps"</string>
     <string name="title_key_server_preference">"Keyservers"</string>
-    <string name="title_change_passphrase">"Change Passphrase"</string>
+    <string name="title_change_passphrase">"Change Password"</string>
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
     <string name="title_share_file">"Share file with…"</string>
@@ -48,7 +48,7 @@
     <string name="section_cloud_evidence">"Proofs from the cloud"</string>
     <string name="section_keys">"Subkeys"</string>
     <string name="section_cloud_search">"Cloud search"</string>
-    <string name="section_passphrase_cache">"Passphrase Cache"</string>
+    <string name="section_passphrase_cache">"Password Cache"</string>
     <string name="section_certify">"Confirm"</string>
     <string name="section_actions">"Actions"</string>
     <string name="section_share_key">"Key"</string>
@@ -109,11 +109,11 @@
     <string name="label_file">"File"</string>
     <string name="label_files">"File(s)"</string>
     <string name="label_file_colon">"File:"</string>
-    <string name="label_no_passphrase">"No Passphrase"</string>
-    <string name="label_passphrase">"Passphrase"</string>
+    <string name="label_no_passphrase">"No Password"</string>
+    <string name="label_passphrase">"Password"</string>
     <string name="label_unlock">"Unlocking…"</string>
-    <string name="label_passphrase_again">"Repeat Passphrase"</string>
-    <string name="label_show_passphrase">"Show Passphrase"</string>
+    <string name="label_passphrase_again">"Repeat Password"</string>
+    <string name="label_show_passphrase">"Show Password"</string>
     <string name="label_algorithm">"Algorithm"</string>
     <string name="label_ascii_armor">"File ASCII Armor"</string>
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
@@ -128,9 +128,9 @@
     <string name="label_delete_after_decryption">"Delete after decryption"</string>
     <string name="label_encryption_algorithm">"Encryption algorithm"</string>
     <string name="label_hash_algorithm">"Hash algorithm"</string>
-    <string name="label_symmetric">"Encrypt with passphrase"</string>
+    <string name="label_symmetric">"Encrypt with password"</string>
     <string name="label_passphrase_cache_ttl">"Cache time"</string>
-    <string name="label_passphrase_cache_subs">"Cache passphrases by subkey"</string>
+    <string name="label_passphrase_cache_subs">"Cache passwords by subkey"</string>
     <string name="label_message_compression">"Text compression"</string>
     <string name="label_file_compression">"File compression"</string>
     <string name="label_keyservers">"Keyservers"</string>
@@ -203,12 +203,12 @@
     <string name="flag_authenticate">"Authenticate"</string>
 
     <!-- sentences -->
-    <string name="wrong_passphrase">"Wrong passphrase."</string>
+    <string name="wrong_passphrase">"Wrong password."</string>
     <string name="no_filemanager_installed">"No compatible file manager installed."</string>
-    <string name="passphrases_do_not_match">"The passphrases didn't match."</string>
-    <string name="passphrase_must_not_be_empty">"Please enter a passphrase."</string>
+    <string name="passphrases_do_not_match">"The passwords didn't match."</string>
+    <string name="passphrase_must_not_be_empty">"Please enter a password."</string>
     <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string>
-    <string name="passphrase_for">"Enter passphrase for '%s'"</string>
+    <string name="passphrase_for">"Enter password for '%s'"</string>
     <string name="pin_for">"Enter PIN for '%s'"</string>
     <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
     <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
@@ -264,11 +264,11 @@
     <string name="error_unknown_algorithm_choice">"unknown algorithm choice"</string>
     <string name="error_user_id_no_email">"no email address found"</string>
     <string name="error_key_needs_a_user_id">"need at least one identity"</string>
-    <string name="error_no_signature_passphrase">"no passphrase given"</string>
+    <string name="error_no_signature_passphrase">"no password given"</string>
     <string name="error_no_signature_key">"no signature key given"</string>
     <string name="error_invalid_data">"No valid encrypted or signed OpenPGP content!"</string>
     <string name="error_integrity_check_failed">"integrity check failed! Data has been modified!"</string>
-    <string name="error_wrong_passphrase">"wrong passphrase"</string>
+    <string name="error_wrong_passphrase">"wrong password"</string>
     <string name="error_could_not_extract_private_key">"could not extract private key"</string>
 
     <!-- errors without preceeding Error: -->
@@ -325,7 +325,7 @@
     <string name="progress_modify_subkeyrevoke">"revoking subkeys…"</string>
     <string name="progress_modify_subkeystrip">"stripping subkeys…"</string>
     <string name="progress_modify_subkeyadd">"adding subkeys…"</string>
-    <string name="progress_modify_passphrase">"changing passphrase…"</string>
+    <string name="progress_modify_passphrase">"changing passwords…"</string>
 
     <plurals name="progress_exporting_key">
         <item quantity="one">"exporting key…"</item>
@@ -592,7 +592,7 @@
     <string name="keybase_verify">"Verify"</string>
 
     <!-- Edit key -->
-    <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
+    <string name="edit_key_action_change_passphrase">"Change Password"</string>
     <string name="edit_key_action_add_identity">"Add Identity"</string>
     <string name="edit_key_action_add_subkey">"Add Subkey"</string>
     <string name="edit_key_edit_user_id_title">"Select an action!"</string>
@@ -618,14 +618,14 @@
     <!-- Create key -->
     <string name="create_key_upload">"Synchronize with the cloud"</string>
     <string name="create_key_empty">"This field is required"</string>
-    <string name="create_key_passphrases_not_equal">"Passphrases do not match"</string>
+    <string name="create_key_passphrases_not_equal">"Passwords do not match"</string>
     <string name="create_key_final_text">"You entered the following identity:"</string>
     <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string>
     <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string>
     <string name="create_key_custom">"(custom key configuration)"</string>
     <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string>
     <string name="create_key_email_text">"Enter your main email address used for secure communication."</string>
-    <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string>
+    <string name="create_key_passphrase_text">"Choose a strong password. It protects your key when your device gets stolen."</string>
     <string name="create_key_hint_full_name">"Full Name or Nickname"</string>
     <string name="create_key_edit">"Change key configuration"</string>
     <string name="create_key_add_email">"Add email address"</string>
@@ -777,7 +777,7 @@
     <string name="msg_is_pubring_generate">"Generating public keyring from secret keyring"</string>
     <string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string>
     <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string>
-    <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty passphrase"</string>
+    <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty password"</string>
     <string name="msg_is_subkey_pin">"Marked secret subkey %s as available, with PIN"</string>
     <string name="msg_is_subkey_stripped">"Marked secret subkey %s as stripped"</string>
     <string name="msg_is_subkey_divert">"Marked secret subkey %s as 'divert to smartcard/NFC'"</string>
@@ -896,7 +896,7 @@
     <string name="msg_mf_error_master_none">"No master certificate found to operate on! (All revoked?)"</string>
     <string name="msg_mf_error_noexist_primary">"Bad primary user ID specified!"</string>
     <string name="msg_mf_error_noexist_revoke">"Bad user ID for revocation specified!"</string>
-    <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string>
+    <string name="msg_mf_error_restricted">"Tried to execute restricted operation without password! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string>
     <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_noop">"Nothing to do!"</string>
@@ -907,16 +907,16 @@
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
-    <string name="msg_mf_passphrase">"Changing passphrase for keyring"</string>
-    <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new passphrase"</string>
-    <string name="msg_mf_passphrase_empty_retry">"Setting new passphrase failed, trying again with empty old passphrase"</string>
-    <string name="msg_mf_passphrase_fail">"Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)"</string>
+    <string name="msg_mf_passphrase">"Changing password for keyring"</string>
+    <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new password"</string>
+    <string name="msg_mf_passphrase_empty_retry">"Setting new password failed, trying again with empty old password"</string>
+    <string name="msg_mf_passphrase_fail">"Password for subkey could not be changed! (Does it have a different one from the other keys?)"</string>
     <string name="msg_mf_primary_replace_old">"Replacing certificate of previous primary user ID"</string>
     <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
     <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
     <string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
     <string name="msg_mf_require_divert">"Diverting to card/nfc for crypto operations"</string>
-    <string name="msg_mf_require_passphrase">"Passphrase required for operations"</string>
+    <string name="msg_mf_require_passphrase">"Password required for operations"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
     <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
     <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
@@ -968,7 +968,7 @@
 
     <!-- Edit Key (higher level than modify) -->
     <string name="msg_ed">"Performing key operation"</string>
-    <string name="msg_ed_caching_new">"Caching new passphrase"</string>
+    <string name="msg_ed_caching_new">"Caching new password"</string>
     <string name="msg_ed_error_no_parcel">"Missing SaveKeyringParcel! (this is a bug, please report)"</string>
     <string name="msg_ed_error_key_not_found">"Key not found!"</string>
     <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string>
@@ -1002,7 +1002,7 @@
     <string name="msg_dc_clear_signature_ok">"Signature check OK"</string>
     <string name="msg_dc_clear_signature">"Saving signature data for later"</string>
     <string name="msg_dc_clear">"Processing cleartext data"</string>
-    <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad passphrase!"</string>
+    <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad password!"</string>
     <string name="msg_dc_error_extract_key">"Unknown error unlocking key!"</string>
     <string name="msg_dc_error_integrity_check">"Integrity check error!"</string>
     <string name="msg_dc_error_integrity_missing">"Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack."</string>
@@ -1014,9 +1014,9 @@
     <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string>
     <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string>
     <string name="msg_dc_ok">"Decryption/Verification finished"</string>
-    <string name="msg_dc_pass_cached">"Using passphrase from cache"</string>
+    <string name="msg_dc_pass_cached">"Using password from cache"</string>
     <string name="msg_dc_pending_nfc">"NFC token required, requesting user input…"</string>
-    <string name="msg_dc_pending_passphrase">"Passphrase required, requesting user input…"</string>
+    <string name="msg_dc_pending_passphrase">"Password required, requesting user input…"</string>
     <string name="msg_dc_prep_streams">"Preparing streams for decryption"</string>
     <string name="msg_dc">"Starting decrypt operation…"</string>
     <string name="msg_dc_sym_skip">"Symmetric data not allowed, skipping…"</string>
@@ -1055,13 +1055,13 @@
     <string name="msg_pse_clearsign_only">"Signing of cleartext input not supported!"</string>
     <string name="msg_pse_compressing">"Preparing compression"</string>
     <string name="msg_pse_encrypting">"Encrypting data"</string>
-    <string name="msg_pse_error_bad_passphrase">"Bad passphrase!"</string>
+    <string name="msg_pse_error_bad_passphrase">"Bad password!"</string>
     <string name="msg_pse_error_hash_algo">"Requested hashing algorithm is not supported by this key!"</string>
     <string name="msg_pse_error_io">"Encountered IO Exception during operation!"</string>
     <string name="msg_pse_error_key_sign">"Selected signing key cannot sign data!"</string>
     <string name="msg_pse_error_sign_key">"Error fetching signing key!"</string>
     <string name="msg_pse_error_nfc">"NFC data error!"</string>
-    <string name="msg_pse_error_no_passphrase">"No passphrase provided!"</string>
+    <string name="msg_pse_error_no_passphrase">"No password provided!"</string>
     <string name="msg_pse_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_pse_error_sig">"Encountered OpenPGP signature exception!"</string>
     <string name="msg_pse_error_unlock">"Unknown error unlocking key!"</string>
@@ -1070,7 +1070,7 @@
     <string name="msg_pse_key_warn">"Bad key for encryption: %s"</string>
     <string name="msg_pse_ok">"Sign/Encrypt operation successful!"</string>
     <string name="msg_pse_pending_nfc">"NFC token required, requesting user input…"</string>
-    <string name="msg_pse_pending_passphrase">"Passphrase required, requesting user input…"</string>
+    <string name="msg_pse_pending_passphrase">"Password required, requesting user input…"</string>
     <string name="msg_pse_signing">"Signing data (without encryption)"</string>
     <string name="msg_pse_signing_cleartext">"Creating cleartext signature"</string>
     <string name="msg_pse_signing_detached">"Creating detached signature"</string>
@@ -1181,11 +1181,11 @@
     <string name="msg_export_log_success">"Log exported successfully!"</string>
 
     <!-- PassphraseCache -->
-    <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>
-    <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string>
-    <string name="passp_cache_notif_keys">"Cached Passphrases:"</string>
+    <string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string>
+    <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string>
+    <string name="passp_cache_notif_keys">"Cached Passwords:"</string>
     <string name="passp_cache_notif_clear">"Clear Cache"</string>
-    <string name="passp_cache_notif_pwd">"Passphrase"</string>
+    <string name="passp_cache_notif_pwd">"Password"</string>
 
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
@@ -1211,7 +1211,7 @@
     <string name="error_key_processing">"Error processing key!"</string>
     <string name="key_stripped">"stripped"</string>
     <string name="key_divert">"divert to smartcard/NFC"</string>
-    <string name="key_no_passphrase">"no passphrase"</string>
+    <string name="key_no_passphrase">"no password"</string>
     <string name="key_unavailable">"unavailable"</string>
     <string name="secret_cannot_multiple">"Your own keys can only be deleted individually!"</string>
     <string name="title_view_cert">"View Certificate Details"</string>
@@ -1231,20 +1231,20 @@
     <!-- Passphrase wizard -->
     <!-- TODO: rename all the things! -->
     <string name="title_unlock_method">Choose an unlock method</string>
-    <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
-    <string name="enter_passphrase">Enter passphrase</string>
-    <string name="passphrase">Passphrase</string>
-    <string name="noPassphrase">No passphrase</string>
-    <string name="no_passphrase_set">No passphrase set</string>
-    <string name="passphrases_match">Passphrases do match</string>
-    <string name="passphrase_saved">Passphrase saved</string>
-    <string name="passphrase_invalid">Passphrase invalid</string>
-    <string name="missing_passphrase">Missing passphrase</string>
+    <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
+    <string name="enter_passphrase">Enter password</string>
+    <string name="passphrase">Password</string>
+    <string name="noPassphrase">No password</string>
+    <string name="no_passphrase_set">No password set</string>
+    <string name="passphrases_match">Passwords do match</string>
+    <string name="passphrase_saved">Password saved</string>
+    <string name="passphrase_invalid">Password invalid</string>
+    <string name="missing_passphrase">Missing password</string>
     <string name="passphrase_again">Again</string>
     <string name="lockpattern">Lockpattern</string>
     <string name="lockpatternNFC">NFC + Lockpattern</string>
     <string name="unlock_method">Unlock method</string>
-    <string name="set_passphrase">Set passphrase</string>
+    <string name="set_passphrase">Set password</string>
     <string name="draw_lockpattern">Draw lockpattern</string>
     <string name="nfc_title">NFC</string>
     <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
-- 
cgit v1.2.3


From 6c706f8a90940bac1088a6c4bdd21e2df5089eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 31 Mar 2015 10:49:33 +0200
Subject: Rename advanced to extended

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 78ab45cf3..c1e3b51f9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="title_help">"Help"</string>
     <string name="title_log_display">"Log"</string>
     <string name="title_exchange_keys">"Exchange Keys"</string>
-    <string name="title_advanced_key_info">"Advanced Key Info"</string>
+    <string name="title_advanced_key_info">"Extended Information"</string>
     <string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string>
     <string name="title_export_log">"Export Log"</string>
     <string name="title_manage_my_keys">"Manage my keys"</string>
@@ -100,7 +100,7 @@
     <string name="menu_select_all">"Select all"</string>
     <string name="menu_export_all_keys">"Export all keys"</string>
     <string name="menu_update_all_keys">"Update all keys"</string>
-    <string name="menu_advanced">"Show advanced info"</string>
+    <string name="menu_advanced">"Extended information"</string>
     <string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
     <string name="menu_export_log">"Export Log"</string>
 
@@ -478,10 +478,10 @@
     <string name="intent_send_decrypt">"Decrypt with OpenKeychain"</string>
 
     <!-- Remote API -->
-    <string name="api_settings_show_info">"Show advanced information"</string>
-    <string name="api_settings_hide_info">"Hide advanced information"</string>
-    <string name="api_settings_show_advanced">"Show advanced settings"</string>
-    <string name="api_settings_hide_advanced">"Hide advanced settings"</string>
+    <string name="api_settings_show_info">"Show extended information"</string>
+    <string name="api_settings_hide_info">"Hide extended information"</string>
+    <string name="api_settings_show_advanced">"Show extended settings"</string>
+    <string name="api_settings_hide_advanced">"Hide extended settings"</string>
     <string name="api_settings_no_key">"No key selected"</string>
     <string name="api_settings_select_key">"Select key"</string>
     <string name="api_settings_create_key">"Create new key"</string>
@@ -494,7 +494,7 @@
     <string name="api_settings_package_name">"Package Name"</string>
     <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string>
     <string name="api_settings_accounts">"Accounts (deprecated API)"</string>
-    <string name="api_settings_advanced">"Advanced Information"</string>
+    <string name="api_settings_advanced">"Extended Information"</string>
     <string name="api_settings_allowed_keys">"Allowed Keys"</string>
     <string name="api_settings_settings">"Settings"</string>
     <string name="api_settings_key">"Account key:"</string>
-- 
cgit v1.2.3