aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-01-02 14:28:03 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-01-02 14:28:03 +0100
commit5057ea1744eac05fc999db1756cf0d739ae41a72 (patch)
tree54c74cc7ccd91eff2d9a60803fbfb6e404a1fd34 /OpenKeychain/src/main/res/values/strings.xml
parent9cf800bcd8870961acc1719fc56f5e8dab21d0a3 (diff)
downloadopen-keychain-5057ea1744eac05fc999db1756cf0d739ae41a72.tar.gz
open-keychain-5057ea1744eac05fc999db1756cf0d739ae41a72.tar.bz2
open-keychain-5057ea1744eac05fc999db1756cf0d739ae41a72.zip
deal with non-existent user ids during import (#994)
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8788038aa..55497361b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1024,6 +1024,12 @@
<string name="passp_cache_notif_clear">"Clear Cache"</string>
<string name="passp_cache_notif_pwd">"Passphrase"</string>
+ <!-- First Time -->
+ <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
+ <string name="first_time_create_key">"Create my key"</string>
+ <string name="first_time_import_key">"Import from file"</string>
+ <string name="first_time_skip">"Skip Setup"</string>
+
<!-- unsorted -->
<string name="section_certifier_id">"Certifier"</string>
<string name="section_cert">"Certificate Details"</string>
@@ -1054,11 +1060,6 @@
<string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string>
<string name="key_colon">"Key:"</string>
<string name="exchange_description">"To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct."</string>
-
- <!-- First Time -->
- <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
- <string name="first_time_create_key">"Create my key"</string>
- <string name="first_time_import_key">"Import from file"</string>
- <string name="first_time_skip">"Skip Setup"</string>
+ <string name="user_id_none"><![CDATA[<none>]]></string>
</resources>