From 5adcb7885cf9629b1ef60b26e76a4c9a8b1f7845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 8 Jul 2014 03:34:27 +0200
Subject: Work on subkeys adapter

---
 OpenKeychain/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 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 29780f235..274309fd0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -480,6 +480,11 @@
         <item>Change to Primary Identity</item>
         <item>Revoke Identity</item>
     </string-array>
+    <string name="edit_key_edit_subkey_title">Select an action!</string>
+    <string-array name="edit_key_edit_subkey">
+        <item>Change Expiry</item>
+        <item>Revoke Subkey</item>
+    </string-array>
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
-- 
cgit v1.2.3


From dce2df41132cc11facde85bcac00c55563aead5f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 11 Jul 2014 02:48:54 +0200
Subject: add come createKey strings

---
 OpenKeychain/src/main/res/values/strings.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 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 29780f235..601df994a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -550,7 +550,7 @@
     <string name="msg_ip_reinsert_secret">Re-inserting secret key</string>
     <string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
     <string name="msg_ip_uid_cert_error">Error processing certificate!</string>
-    <string name="msg_ip_uid_cert_good">User id is certified by %1$s (%2$s)</string>
+    <string name="msg_ip_uid_cert_good">User id is certified by %1$s</string>
     <plurals name="msg_ip_uid_certs_unknown">
         <item quantity="one">Ignoring one certificate issued by an unknown public key</item>
         <item quantity="other">Ignoring %s certificates issued by unknown public keys</item>
@@ -632,6 +632,11 @@
     <string name="msg_mg_new_subkey">Adding new subkey %s</string>
     <string name="msg_mg_found_new">Found %s new certificates in keyring</string>
 
+    <!-- createSecretKeyRing -->
+    <string name="msg_cr">Generating new master key</string>
+    <string name="msg_cr_error_no_master">No master key options specified!</string>
+    <string name="msg_cr_error_no_certify">Master key must have certify flag!</string>
+
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">Modifying keyring %s</string>
     <string name="msg_mf_error_encode">Encoding exception!</string>
@@ -642,6 +647,8 @@
     <string name="msg_mf_error_pgp">PGP internal exception!</string>
     <string name="msg_mf_error_sig">Signature exception!</string>
     <string name="msg_mf_passphrase">Changing passphrase</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_subkey_change">Modifying subkey %s</string>
     <string name="msg_mf_subkey_missing">Tried to operate on missing subkey %s!</string>
     <string name="msg_mf_subkey_new">Generating new %1$s bit %2$s subkey</string>
-- 
cgit v1.2.3


From 4da273ac16fc93524bc6212e2b0477904155a4f5 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 11 Jul 2014 13:35:48 +0200
Subject: modifyKey: error out on nonexisting new primary user id

---
 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 601df994a..d6eb6a2fb 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -643,6 +643,7 @@
     <string name="msg_mf_error_fingerprint">Actual key fingerprint does not match the expected one!</string>
     <string name="msg_mf_error_keyid">No key ID. This is an internal error, please file a bug report!</string>
     <string name="msg_mf_error_integrity">Internal error, integrity check failed!</string>
+    <string name="msg_mf_error_noexist_primary">Bad primary user id specified!</string>
     <string name="msg_mf_error_revoked_primary">Revoked user ids cannot be primary!</string>
     <string name="msg_mf_error_pgp">PGP internal exception!</string>
     <string name="msg_mf_error_sig">Signature exception!</string>
-- 
cgit v1.2.3


From 26f6d58284d7665aa810e0d6a219e1191166e349 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 11 Jul 2014 13:37:31 +0200
Subject: get rid of some inspection warnings

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 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 d6eb6a2fb..03e72d6d9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -505,7 +505,7 @@
     <string name="cert_casual">casual</string>
     <string name="cert_positive">positive</string>
     <string name="cert_revoke">revoked</string>
-    <string name="cert_verify_ok">ok</string>
+    <string name="cert_verify_ok">OK</string>
     <string name="cert_verify_failed">failed!</string>
     <string name="cert_verify_error">error!</string>
     <string name="cert_verify_unavailable">key unavailable</string>
-- 
cgit v1.2.3


From 0e3327c65c670a0d910abd6760ed0ece298dcfbb Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 12 Jul 2014 01:29:06 +0200
Subject: createKey: better logging, handle empty user id case

---
 OpenKeychain/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 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 d8e102b04..5efe51aa9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -640,7 +640,12 @@
     <!-- createSecretKeyRing -->
     <string name="msg_cr">Generating new master key</string>
     <string name="msg_cr_error_no_master">No master key options specified!</string>
+    <string name="msg_cr_error_no_user_id">Keyrings must be created with at least one user id!</string>
     <string name="msg_cr_error_no_certify">Master key must have certify flag!</string>
+    <string name="msg_cr_error_keysize_512">Key size must be greater or equal 512!</string>
+    <string name="msg_cr_error_internal_pgp">Internal PGP error!</string>
+    <string name="msg_cr_error_unknown_algo">Bad algorithm choice!</string>
+    <string name="msg_cr_error_master_elgamal">Master key must not be of type ElGamal!</string>
 
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">Modifying keyring %s</string>
-- 
cgit v1.2.3


From 7a3fe61a1f497ba431ed5fe3c68b11ed9578eaba Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 12 Jul 2014 12:52:44 +0200
Subject: Put text into strings.xml, for internationalization

---
 OpenKeychain/src/main/res/values/strings.xml | 6 ++++++
 1 file changed, 6 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 274309fd0..456a22086 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -660,6 +660,12 @@
     <string name="msg_mf_unlock_error">Error unlocking keyring!</string>
     <string name="msg_mf_unlock">Unlocking keyring</string>
 
+    <!-- PassphraseCache -->
+    <string name="passp_cache_notif_click_to_purge">Click to purge cached passphrases</string>
+    <string name="passp_cache_notif_n_keys">OpenKeychain has cached %i keys</string>
+    <string name="passp_cache_notif_keys">Cached Keys:</string>
+    <string name="passp_cache_notif_purge">Purge Cache</string>
+
     <!-- unsorted -->
     <string name="section_certifier_id">Certifier</string>
     <string name="section_cert">Certificate Details</string>
-- 
cgit v1.2.3


From 079194abe5b48c2b6a5cf943b45a67b956937435 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 12 Jul 2014 18:12:03 +0200
Subject: Fixed issues discussed in #713

---
 OpenKeychain/src/main/res/values/strings.xml | 5 +++--
 1 file changed, 3 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 456a22086..1adecad01 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -661,10 +661,11 @@
     <string name="msg_mf_unlock">Unlocking keyring</string>
 
     <!-- PassphraseCache -->
-    <string name="passp_cache_notif_click_to_purge">Click to purge cached passphrases</string>
+    <string name="passp_cache_notif_click_to_clear">Click to clear cached passphrases</string>
     <string name="passp_cache_notif_n_keys">OpenKeychain has cached %i keys</string>
     <string name="passp_cache_notif_keys">Cached Keys:</string>
-    <string name="passp_cache_notif_purge">Purge Cache</string>
+    <string name="passp_cache_notif_clear">Clear Cache</string>
+    <string name="passp_cache_notif_pwd">Password</string>
 
     <!-- unsorted -->
     <string name="section_certifier_id">Certifier</string>
-- 
cgit v1.2.3


From 066591dab1efa9d0bd75056fe06ecd6d8278fefa Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 12 Jul 2014 18:53:52 +0200
Subject: Wello there, That's Java, not C^^

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 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 1adecad01..5f04aa6e6 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -662,7 +662,7 @@
 
     <!-- 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 %i keys</string>
+    <string name="passp_cache_notif_n_keys">OpenKeychain has cached %d keys</string>
     <string name="passp_cache_notif_keys">Cached Keys:</string>
     <string name="passp_cache_notif_clear">Clear Cache</string>
     <string name="passp_cache_notif_pwd">Password</string>
-- 
cgit v1.2.3


From 92c66743e07b77da21af6236689a276eb23a9b1c Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 12 Jul 2014 15:12:35 +0200
Subject: Added Preference for concealing the PgpApplication

---
 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 5f04aa6e6..502a0926a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -110,6 +110,7 @@
     <string name="label_passphrase_again">Again</string>
     <string name="label_algorithm">Algorithm</string>
     <string name="label_ascii_armor">ASCII Armor</string>
+    <string name="label_conceal_pgp_application">Conceal PGP Application (OpenKeychain)</string>
     <string name="label_select_public_keys">Recipients</string>
     <string name="label_delete_after_encryption">Delete After Encryption</string>
     <string name="label_delete_after_decryption">Delete After Decryption</string>
-- 
cgit v1.2.3


From 0ce9c131327ce754eb8c0c934ea59eecf005a26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 12 Jul 2014 21:07:29 +0200
Subject: Fix strings from 'keys' to 'passphrases'

---
 OpenKeychain/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 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 5f04aa6e6..aec4ecd2c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -662,8 +662,8 @@
 
     <!-- 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 keys</string>
-    <string name="passp_cache_notif_keys">Cached Keys:</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_clear">Clear Cache</string>
     <string name="passp_cache_notif_pwd">Password</string>
 
-- 
cgit v1.2.3


From 29145e49c96998f220485a8e46cd2b62665b00de Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 15 Jul 2014 19:17:08 +0200
Subject: merge: different msg if nothing was merged

---
 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 c444d64a1..80b8bb507 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -636,6 +636,7 @@
     <string name="msg_mg_heterogeneous">Tried to consolidate heterogeneous keyrings</string>
     <string name="msg_mg_new_subkey">Adding new subkey %s</string>
     <string name="msg_mg_found_new">Found %s new certificates in keyring</string>
+    <string name="msg_mg_unchanged">No new certificates</string>
 
     <!-- createSecretKeyRing -->
     <string name="msg_cr">Generating new master key</string>
-- 
cgit v1.2.3


From c1c831e52b11fc976b06b0d850f62e7934f581f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 16 Jul 2014 09:49:37 +0200
Subject: New first time screen

---
 OpenKeychain/src/main/res/values/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 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 80b8bb507..32e35b0ba 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <string name="title_authentication">Passphrase</string>
     <string name="title_create_key">Create Key</string>
     <string name="title_edit_key">Edit Key</string>
-    <string name="title_wizard">Welcome to OpenKeychain</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Apps</string>
     <string name="title_key_server_preference">Keyserver Preference</string>
@@ -704,4 +703,10 @@
     <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
     <string name="contact_show_key">Show key (%s)</string>
 
+    <!-- First Time -->
+    <string name="first_time_text1">Take back your privacy with OpenKeychain!</string>
+    <string name="first_time_create_key">Create Key</string>
+    <string name="first_time_import_key">Import Key</string>
+    <string name="first_time_skip">Skip Setup</string>
+
 </resources>
-- 
cgit v1.2.3


From 01046fc0e71809aef89cd05244b4be325279d7ca Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Thu, 17 Jul 2014 20:01:53 +0200
Subject: Added description to Setting, Changed title to suggested one

---
 OpenKeychain/src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 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 50f73e73b..5e9c97ad9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -109,7 +109,8 @@
     <string name="label_passphrase_again">Again</string>
     <string name="label_algorithm">Algorithm</string>
     <string name="label_ascii_armor">ASCII Armor</string>
-    <string name="label_conceal_pgp_application">Conceal PGP Application (OpenKeychain)</string>
+    <string name="label_conceal_pgp_application">Let others know that you're using OpenKeychain</string>
+    <string name="label_conceal_pgp_application_summary">Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys</string>
     <string name="label_select_public_keys">Recipients</string>
     <string name="label_delete_after_encryption">Delete After Encryption</string>
     <string name="label_delete_after_decryption">Delete After Decryption</string>
-- 
cgit v1.2.3


From 8a8d8c5a6865cef0637d52bec82217edca7638f8 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Thu, 17 Jul 2014 20:53:10 +0200
Subject: Fixed unescaped apostrophe

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 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 5e9c97ad9..e7293f21b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -110,7 +110,7 @@
     <string name="label_algorithm">Algorithm</string>
     <string name="label_ascii_armor">ASCII Armor</string>
     <string name="label_conceal_pgp_application">Let others know that you're using OpenKeychain</string>
-    <string name="label_conceal_pgp_application_summary">Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys</string>
+    <string name="label_conceal_pgp_application_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string>
     <string name="label_select_public_keys">Recipients</string>
     <string name="label_delete_after_encryption">Delete After Encryption</string>
     <string name="label_delete_after_decryption">Delete After Decryption</string>
-- 
cgit v1.2.3


From db002bde7c7370ff0107c36aa93bc789248b6eb8 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Thu, 17 Jul 2014 21:17:39 +0200
Subject: Fixed another unescaped apostrophe.

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 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 e7293f21b..c1c18effe 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -109,7 +109,7 @@
     <string name="label_passphrase_again">Again</string>
     <string name="label_algorithm">Algorithm</string>
     <string name="label_ascii_armor">ASCII Armor</string>
-    <string name="label_conceal_pgp_application">Let others know that you're using OpenKeychain</string>
+    <string name="label_conceal_pgp_application">Let others know that you\'re using OpenKeychain</string>
     <string name="label_conceal_pgp_application_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string>
     <string name="label_select_public_keys">Recipients</string>
     <string name="label_delete_after_encryption">Delete After Encryption</string>
-- 
cgit v1.2.3


From cd1511a4e6d346d177be7d828faa82f99e46685c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 19 Jul 2014 02:19:15 +0200
Subject: canonicalize: fix for tests

---
 OpenKeychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 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 c1c18effe..55ecf3ae0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -592,6 +592,7 @@
     <string name="msg_kc_revoke_bad_local">Removing keyring revocation certificate with "local" flag</string>
     <string name="msg_kc_revoke_bad_time">Removing keyring revocation certificate with future timestamp</string>
     <string name="msg_kc_revoke_bad_type">Removing master key certificate of unknown type (%s)</string>
+    <string name="msg_kc_revoke_bad_type_uid">Removing user id certification in bad position</string>
     <string name="msg_kc_revoke_bad">Removing bad keyring revocation certificate</string>
     <string name="msg_kc_revoke_dup">Removing redundant keyring revocation certificate</string>
     <string name="msg_kc_sub">Processing subkey %s</string>
@@ -629,6 +630,7 @@
     <string name="msg_kc_uid_revoke_dup">Removing redundant revocation certificate for user id "%s"</string>
     <string name="msg_kc_uid_revoke_old">Removing outdated revocation certificate for user id "%s"</string>
     <string name="msg_kc_uid_no_cert">No valid self-certificate found for user id %s, removing from ring</string>
+    <string name="msg_kc_uid_remove">Removing invalid user id %s</string>
 
     <!-- Keyring merging log entries -->
     <string name="msg_mg_public">Merging into public keyring %s</string>
-- 
cgit v1.2.3


From ab2b90342e805a0a625e059dcfe2db11157a5680 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 26 Jul 2014 03:47:29 +0200
Subject: test and fix: adding an empty user id should fail

---
 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 55ecf3ae0..d1a20813b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -674,6 +674,7 @@
     <string name="msg_mf_uid_add">Adding user id %s</string>
     <string name="msg_mf_uid_primary">Changing primary uid to %s</string>
     <string name="msg_mf_uid_revoke">Revoking user id %s</string>
+    <string name="msg_mf_uid_error_empty">User ID must not be empty!</string>
     <string name="msg_mf_unlock_error">Error unlocking keyring!</string>
     <string name="msg_mf_unlock">Unlocking keyring</string>
 
-- 
cgit v1.2.3