From 05accb49066a2693cfc1c92e29ad10112f957495 Mon Sep 17 00:00:00 2001 From: "tdjogi010@gmail.com" Date: Wed, 2 Mar 2016 02:51:25 +0530 Subject: Alert for Stripping Subkeys. --- OpenKeychain/src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 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 9920d8057..f4c51e8c5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ "Advanced" "Delete YOUR key '%s'?" "Manage my keys" + "Strip this Subkey" "Identities" @@ -291,6 +292,7 @@ "Error: %s" "Dark" "Light" + "Strip it" "Certify" @@ -331,6 +333,7 @@ "Delete key '%s'?" "Also export secret keys" "You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys." + "Stripping this Subkey will render it useless." "Successfully exported 1 key." "Successfully exported %d keys." -- cgit v1.2.3 From 1cbecb1b3ba581c3ede9f37d2dd5f86c60fde986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 3 Mar 2016 15:18:31 +0100 Subject: Add missing 2 EUR selection for donation --- 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 9920d8057..70db4029b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1733,6 +1733,7 @@ OpenKeychain Donation 1 EUR + 2 EUR 3 EUR 5 EUR 10 EUR -- cgit v1.2.3 From 7efeebc6381784a9362e5514fb50084c662dd335 Mon Sep 17 00:00:00 2001 From: Lubo Viluda Date: Sun, 20 Mar 2016 11:52:36 +0100 Subject: #1661 - Don't expose CertifyActivity *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity --- 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 70db4029b..acc0c7f20 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1740,4 +1740,6 @@ 50 EUR 100 EUR + RedirectKeyActivity + Settings -- cgit v1.2.3 From cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638 Mon Sep 17 00:00:00 2001 From: Advaita Date: Tue, 15 Mar 2016 23:07:27 +0530 Subject: Final commit All changes included Improvements -Reformatted code wherever required -Only active wifi connections trigger events -Improve sync reliability -Removed extra permission Minor Changes -Refactored 2 variables for easier readbility -Wifi-Only-Sync is now enabled by default --- 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 70db4029b..c8a07c8ef 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -201,6 +201,7 @@ "Automatic key updates" "Every three days, keys are updated from the preferred keyserver" "Keys are not automatically updated" + "Sync only on Wi-Fi" "Link keys to contacts" "Link keys to contacts based on names and email addresses. This happens completely offline on your device." "New keys will not be linked to contacts" -- cgit v1.2.3 From 298f89d36e5239f272709b6ec86e4b4b5d29b2a6 Mon Sep 17 00:00:00 2001 From: Lubo Viluda Date: Thu, 24 Mar 2016 00:54:28 +0100 Subject: upgrade of Redirect import activity -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified --- OpenKeychain/src/main/res/values/strings.xml | 7 +++++-- 1 file changed, 5 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 acc0c7f20..95e089275 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1740,6 +1740,9 @@ 50 EUR 100 EUR - RedirectKeyActivity - Settings + "Import key attempt" + "You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe" + Scan again + Close + Key import redirection -- cgit v1.2.3 From 360b5a658a412d9402a5fc9ea204329c91d306c3 Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Fri, 11 Mar 2016 00:50:11 +0100 Subject: Handle encrypted files while importing keys --- 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 c8a07c8ef..f9838ba72 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -359,6 +359,7 @@ "have not been deleted. Delete them manually!" %s has already been added. "file not found" + "Bad data!" "no suitable secret key found" "external storage not ready" "key size must be at least 512bit" -- cgit v1.2.3 From 705a55a7a3090024575c28a68658ff59e34e179d Mon Sep 17 00:00:00 2001 From: Victor Hazali Date: Wed, 30 Mar 2016 06:09:13 +0800 Subject: Corrected capitalisation of subkey --- 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 23ac87841..9a21f95f7 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -40,7 +40,7 @@ "Advanced" "Delete YOUR key '%s'?" "Manage my keys" - "Strip this Subkey" + "Strip this subkey" "Identities" @@ -334,7 +334,7 @@ "Delete key '%s'?" "Also export secret keys" "You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys." - "Stripping this Subkey will render it useless." + "Stripping this subkey will render it useless." "Successfully exported 1 key." "Successfully exported %d keys." -- cgit v1.2.3 From 8673777ae5475e92524c30d980e4cf6d7ad1834d Mon Sep 17 00:00:00 2001 From: Victor Hazali Date: Fri, 1 Apr 2016 10:34:27 +0800 Subject: Corrected warning message --- 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 9a21f95f7..efa2c80d2 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -334,7 +334,7 @@ "Delete key '%s'?" "Also export secret keys" "You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys." - "Stripping this subkey will render it useless." + "Stripping this subkey will make it unusable on this device!" "Successfully exported 1 key." "Successfully exported %d keys." -- cgit v1.2.3 From cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92 Mon Sep 17 00:00:00 2001 From: Alex Fong Date: Mon, 21 Mar 2016 21:37:19 +0800 Subject: Redesigned subkey creation dialog and changed default key type created to RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key. --- OpenKeychain/src/main/res/values/strings.xml | 29 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 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 70db4029b..4ac0037ac 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -13,6 +13,7 @@ "Encrypt" "Decrypt" "Add subkey" + Change master key "Edit Key" "Create a Linked Identity" "Settings" @@ -165,6 +166,7 @@ "Select OpenPGP keyservers" "Key ID" "Key created %s" + "Type" "Creation" "Expiry" "Usage" @@ -281,23 +283,26 @@ "8 hours" "forever" "Select a Key" - "DSA" - "ElGamal" - "RSA" - "ECDH" - "ECDSA" "Open…" + "RSA 2048" + "smaller filesize, considered secure until 2030" + "RSA 3072" + "recommended, considered secure until 2040" + "RSA 4096" + "larger file size, considered secure until 2040+" + "ECC P-256" + "very tiny filesize, considered secure until 2040 <br/> <u>experimental and not supported by all implementations</u>" + "ECC P-521" + "tiny filesize, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations"</u> + "None (subkey binding only)" + "Sign" + "Encrypt" + "Sign & Encrypt" "Error" "Error: %s" "Dark" "Light" - - "Certify" - "Sign" - "Encrypt" - "Authenticate" - "Wrong password." "No compatible file manager installed." @@ -746,7 +751,7 @@ "Move Subkey to Security Token" "new subkey" - "Please select at least one flag!" + "Please select key usage!" "Add at least one identity!" "Add at least one subkey!" "Algorithm not supported by Security Token!" -- cgit v1.2.3 From 84769999224c22a645b68d1ffa3e9d767bc408ed Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Mon, 11 Apr 2016 00:02:05 +0600 Subject: Add missing keyholder string param --- 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 d77d64a27..8bb5093eb 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1553,7 +1553,7 @@ "Import" "Bind Key" "Serial No: %s" - "Key holder: " + "Key holder: %s" ]]> "Security Token matches and is bound to key" "Security Token matches, can be bound to key" -- cgit v1.2.3 From a7a0d9dd4b545ea65444efad5ca96cb7bca919ef Mon Sep 17 00:00:00 2001 From: Lubo Viluda Date: Tue, 12 Apr 2016 15:41:42 +0200 Subject: Unnecesary code removed and string repaired - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired --- OpenKeychain/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 95e089275..725cd7b41 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1742,7 +1742,7 @@ "Import key attempt" "You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe" - Scan again - Close - Key import redirection + "Scan again" + "Close" + "Key import redirection" -- cgit v1.2.3 From ff9226c25ce3a26e86c7dc9ed06e6ecc3e5f386d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 12 Apr 2016 16:15:07 +0200 Subject: Fix strings --- OpenKeychain/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 18007c53f..e6a336853 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -287,15 +287,15 @@ "Select a Key" "Open…" "RSA 2048" - "smaller filesize, considered secure until 2030" + "smaller file size, considered secure until 2030" "RSA 3072" "recommended, considered secure until 2040" "RSA 4096" "larger file size, considered secure until 2040+" "ECC P-256" - "very tiny filesize, considered secure until 2040 <br/> <u>experimental and not supported by all implementations</u>" + "very tiny file size, considered secure until 2040 <br/> <u>experimental and not supported by all implementations</u>" "ECC P-521" - "tiny filesize, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations"</u> + "tiny file size, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations"</u>" "None (subkey binding only)" "Sign" "Encrypt" -- cgit v1.2.3 From ab323bddabc3f39b4c2e3cc932438826f1301ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 13 Apr 2016 17:00:24 +0200 Subject: Fix string --- 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 e6a336853..a2a3497f5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -295,7 +295,7 @@ "ECC P-256" "very tiny file size, considered secure until 2040 <br/> <u>experimental and not supported by all implementations</u>" "ECC P-521" - "tiny file size, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations"</u>" + "tiny file size, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations</u>" "None (subkey binding only)" "Sign" "Encrypt" -- cgit v1.2.3 From 8f88efe13fc9b895654d02459b4fab6afdff0406 Mon Sep 17 00:00:00 2001 From: Durgesh <007durgesh219@gmail.com> Date: Tue, 5 Apr 2016 04:01:24 +0530 Subject: Fix Crash when no encryption subkey is available, Issue #1817 Signed-off-by: Durgesh <007durgesh219@gmail.com> --- 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 a2a3497f5..a46e03e43 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1259,6 +1259,7 @@ "Internal OpenPGP error!" "Encountered OpenPGP signature exception!" "Unknown error unlocking key!" + "Revoked/Expired key cannot be used for sign or encryption" "Encrypting for key: %s" "Missing key for encryption: %s" "Bad key for encryption: %s" -- cgit v1.2.3 From 249b8d7d785c9f5703de0c12a9d00e9a391a75a9 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 15 Apr 2016 01:21:15 +0200 Subject: Handle user input on key creation more generously Allow empty name and do not regex-check email fixes #1825 --- 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 d77d64a27..c147b7ea5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -768,6 +768,7 @@ "Passwords do not match" "You entered the following identity:" "Creating a key may take a while, have a cup of coffee in the meantime…" + "Many applications work better when provided with keys only containing valid email addresses" "(3 subkeys, RSA, 4096 bit)" "(custom key configuration)" "Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'." @@ -778,7 +779,7 @@ "Add email address" "Additional email addresses are also associated to this key and can be used for secure communication." "Email address has already been added" - "Email address format is invalid" + "Email address can not be empty" "Please choose a PIN with 6 numbers." "Please write down the Admin PIN and store it in a safe place (required when you used a wrong PIN 3 times)." "PIN" -- cgit v1.2.3 From f1b14d338c2e0ad5294d060fec2557ff6d5afeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 16 Apr 2016 00:51:31 +0200 Subject: Fix string --- 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 a2a3497f5..57b2c8ce1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1191,7 +1191,7 @@ "Saving signature data for later" "Processing cleartext data" "Error unlocking key, bad password!" - "Error decrypting data! (Bad passphrase?)" + "Error decrypting data! (Bad password?)" "Data is corrupt!" "Unknown error unlocking key!" "Integrity check error!" -- cgit v1.2.3 From a87c65c3f480ae06070607f2cd0f5227012d6cd3 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sat, 16 Apr 2016 01:43:13 +0600 Subject: Check if security token keys match required once before signing/decryption --- 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 a2a3497f5..5e486d5d9 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -380,6 +380,7 @@ "integrity check failed! Data has been modified!" "wrong password" "could not extract private key" + "this security token doesn't contain required key" "You need Android 4.1 to use Android's NFC Beam feature!" -- cgit v1.2.3 From 15ed1c9a63fb0505651e4edf4f4ef65644640429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 18 Apr 2016 07:31:31 +0200 Subject: Fix delete_fail --- 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 57b2c8ce1..22d79d9b8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -576,7 +576,7 @@ "Successfully deleted %1$d keys%2$s." - "Error deleting one key%2$s." + "Error deleting one key." "Error deleting %1$d keys." "Nothing to delete." -- cgit v1.2.3 From afeaf5c457311fb96fdfee3413d50aaa2fbd580e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 18 Apr 2016 07:39:02 +0200 Subject: Fix strings --- 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 48187c342..57c70d7bc 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1635,7 +1635,7 @@ Twitter Handle "Touch either button to tweet the message!" "You can edit the Tweet before posting it, so long as the text inside the brackets is unmodified." - "Once your Tweet is published as <b>@%s</b>, touch the Verify button to scan your timeline for it." + "Once your Tweet is published as @%s, touch the Verify button to scan your timeline for it." "After successful verification, touch Finish button to add the Linked Identity to your keyring and finish the process." "Verify" @@ -1658,7 +1658,7 @@ "A 'linked identity' connects your PGP key to a resource on the web." "Please select a type:" "This file claims ownership of the OpenPGP key with long id %2$s.\n\nToken for proof:\n%1$s" - "This Gist confirms the Linked Identity in my OpenPGP key, and links it to this GitHub account.\n\nToken for proof:\n%1$s" + "This Gist confirms the Linked Identity in my OpenPGP key, and links it to this GitHub account.\n\nToken for proof:\n%1$s" "Verifying…" "Verified!" "Verification error!" -- cgit v1.2.3 From 7b24679094b40c0f99f11d728554bf7c288de24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 29 Apr 2016 22:22:10 +0200 Subject: Re-enable move-to-card option, improve strings --- 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 4c89bd6ee..e322baebd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -762,7 +762,7 @@ "Add at least one subkey!" "Algorithm not supported by Security Token!" "Key size not supported by Security Token!" - "Cannot move key to Security Token (either stripped or 'divert-to-card')!" + "Cannot move key to Security Token (either stripped or already on Security Token)!" "Synchronize with the Internet" @@ -953,7 +953,7 @@ "Marked secret subkey %s as available, with empty password" "Marked secret subkey %s as available, with PIN" "Marked secret subkey %s as stripped" - "Marked secret subkey %s as 'divert-to-card'" + "Marked secret subkey %s as key on Security Token" "Keyring contains no new data, nothing to do" "Successfully imported secret keyring" @@ -1062,9 +1062,9 @@ "Modifying keyring %s" - "Will divert to Security Token for crypto operations" - "Creation of new subkeys is not supported for 'divert-to-card' primary keys!" - "The serial number of a 'divert-to-card' key must be 16 bytes! This is a programming error, please file a bug report!" + "Will use Security Token for crypto operations" + "Creation of new subkeys is not supported for primary keys on Security Tokens!" + "The serial number of a key on Security Tokens must be 16 bytes! This is a programming error, please file a bug report!" "Encoding exception!" "Actual key fingerprint does not match the expected one!" "No key ID. This is an internal error, please file a bug report!" @@ -1097,7 +1097,7 @@ "Generating new certificate for new primary user ID" "Changing to restricted operation mode" "Modifying subkey %s" - "Diverting to Security Token for crypto operations" + "Using Security Token for crypto operations" "Password required for operations" "Adding new subkey of type %s" "New subkey ID: %s" @@ -1498,7 +1498,7 @@ "Key not found!" "Error processing key!" "stripped" - "divert to Security Token" + "on Security Token" "no password" "unavailable" "Your own keys can only be deleted individually!" -- cgit v1.2.3 From b4af7a06a51bb65ed43af1c0fcb8035705b2a24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 29 Apr 2016 23:14:24 +0200 Subject: Use proper ImportKeysProxyActivity to scan QR Codes --- 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 387522fc1..2f4cb9552 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1752,8 +1752,8 @@ 50 EUR 100 EUR - "Import key attempt" - "You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe" + "Scan with OpenKeychain!" + "You scanned a OpenPGP QR Code with another app, please scan with Openkeychain directly to be safe." "Scan again" "Close" "Key import redirection" -- cgit v1.2.3 From 562d0016be676795bb837761db90ab8dfef3f6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 30 Apr 2016 14:46:51 +0200 Subject: Improve security_token_error_iso_dep_not_supported --- 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 7a27ee9ef..1b8bc5661 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1586,7 +1586,7 @@ "Security Token expected last command in a chain." "Security Token reported invalid %s byte." "Security Token has been taken off too early. Keep the Security Token at the back until the operation finishes." - "Tag does not support ISO-DEP (ISO 14443-4)" + "Security Token does not support the required communication standard (ISO-DEP, ISO 14443-4)" "Try again" Delete original file -- cgit v1.2.3 From b97971a29c6a2a80d86ff068ca8f4109d8027646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 30 Apr 2016 16:46:22 +0200 Subject: Fix error codes for ykneo-openpgp 1.0.11 --- OpenKeychain/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 1b8bc5661..ab935b042 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1576,13 +1576,13 @@ "Incorrect PIN!\n%d tries remaining." "Security Token in termination state." - "Entered PIN is too short. PINs are at least 6 digits long." + "Entered PIN is too short. PINs are at least 6 digits long.\n(Error: Wrong length)" "Conditions of use not satisfied." - "Security status not satisfied." + "Incorrect PIN!\n(Keep in mind that you have only 3 tries!)" "PIN blocked after too many attempts." "Key or object not found." "Unknown Error" - "Security Token reported invalid data." + "Entered PIN is too short. PINs are at least 6 digits long.\n(Error: Invalid data)" "Security Token expected last command in a chain." "Security Token reported invalid %s byte." "Security Token has been taken off too early. Keep the Security Token at the back until the operation finishes." -- cgit v1.2.3 From 525788359c6821a958ee7306ef3aa34d7b211a6f Mon Sep 17 00:00:00 2001 From: Alex Fong Date: Tue, 15 Mar 2016 10:24:28 +0800 Subject: (WIP) Change password when key is stripped #1692 Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead. --- 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 ab935b042..0af027ec1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1063,6 +1063,7 @@ "Modifying keyring %s" "Will use Security Token for crypto operations" + All keys are stripped! "Creation of new subkeys is not supported for primary keys on Security Tokens!" "The serial number of a key on Security Tokens must be 16 bytes! This is a programming error, please file a bug report!" "Encoding exception!" @@ -1077,6 +1078,7 @@ "Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!" "Nothing to do!" "Fatal error decrypting master key! This is likely a programming error, please file a bug report!" + "Error changing all passphrases!" "Internal OpenPGP error!" "Signature exception!" "Cannot modify stripped subkey %s!" -- cgit v1.2.3 From dfcde9242d7b39bf1ab9f0b66fc5829fb0af0f8c Mon Sep 17 00:00:00 2001 From: Alex Fong Date: Thu, 17 Mar 2016 08:03:22 +0800 Subject: Removed unrequired code, standardized terms used. --- 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 0af027ec1..2a44307f8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1078,7 +1078,7 @@ "Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!" "Nothing to do!" "Fatal error decrypting master key! This is likely a programming error, please file a bug report!" - "Error changing all passphrases!" + "No password changed!" "Internal OpenPGP error!" "Signature exception!" "Cannot modify stripped subkey %s!" -- cgit v1.2.3 From 9d35dcb0e924a7f8afcfcaa86752efb40799a456 Mon Sep 17 00:00:00 2001 From: Alex Fong Date: Sun, 17 Apr 2016 13:33:41 +0800 Subject: Added warning dialog for importing keys --- 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 2a44307f8..b15bd5775 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -526,6 +526,8 @@ "Fingerprint is too short!" "Scan QR Code" "Place your camera over the QR Code!" + "Warning" + "Imported keys will overwrite existing keys that have the same IDs!" "No search query defined. You can still manually search on this keyserver." -- cgit v1.2.3 From 6cf3e4c89123284b58796cd7e348799b70fac02e Mon Sep 17 00:00:00 2001 From: Alex Fong Date: Thu, 5 May 2016 07:40:08 +0800 Subject: Slight amendments for clarity --- 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 b15bd5775..07d2dc8db 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -527,7 +527,7 @@ "Scan QR Code" "Place your camera over the QR Code!" "Warning" - "Imported keys will overwrite existing keys that have the same IDs!" + "Import will overwrite existing keys that have the same IDs!" "No search query defined. You can still manually search on this keyserver." -- cgit v1.2.3 From 4278aa1bf1614d8b41e240a4f99328f85202041b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 5 May 2016 14:29:56 +0300 Subject: Revert "Added warning dialog for importing keys" This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml --- OpenKeychain/src/main/res/values/strings.xml | 2 -- 1 file changed, 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 07d2dc8db..2a44307f8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -526,8 +526,6 @@ "Fingerprint is too short!" "Scan QR Code" "Place your camera over the QR Code!" - "Warning" - "Import will overwrite existing keys that have the same IDs!" "No search query defined. You can still manually search on this keyserver." -- cgit v1.2.3