From 2eb776594f378ac7a14ea716f0a7470d34230ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 8 Oct 2014 17:39:53 +0200
Subject: Handle revoked and expired keys in decrypt activity

---
 OpenKeychain/src/main/res/values-cs/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-de/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-es/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-fr/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-it/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-ja/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-nl/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-pl/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-ru/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-sl/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-sr/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-tr/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-uk/strings.xml | 2 +-
 OpenKeychain/src/main/res/values/strings.xml    | 4 +++-
 14 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 55d25958f..3276eefed 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -229,7 +229,7 @@
   <string name="error_generic_report_bug">Nastala obecná chyba, prosím vytvořte nový bug report pro OpenKeychain.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Špatný podpis!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Neznámý veřejný klíč</string>
+  <string name="decrypt_result_signature_missing_key">Neznámý veřejný klíč</string>
   <string name="decrypt_result_signature_uncertified">Validní podpis (neověřen)</string>
   <string name="decrypt_result_signature_certified">Validní podpis (ověřen)</string>
   <string name="decrypt_result_decrypted">Úspěšně rozšifrováno</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 13533f9bb..3753068bc 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -246,7 +246,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Ungültige Signatur!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Unbekannter öffentlicher Schlüssel</string>
+  <string name="decrypt_result_signature_missing_key">Unbekannter öffentlicher Schlüssel</string>
   <string name="decrypt_result_signature_uncertified">Gültige Signatur (nicht beglaubigt)</string>
   <string name="decrypt_result_signature_certified">Gültige Signatur (beglaubigt)</string>
   <string name="decrypt_result_decrypted">Erfolgreich entschlüsselt</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index b0a3fa099..6bc2abb6a 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -238,7 +238,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">¡Firma no válida!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Clave pública desconocida</string>
+  <string name="decrypt_result_signature_missing_key">Clave pública desconocida</string>
   <string name="decrypt_result_signature_uncertified">Firma válida (no certificada)</string>
   <string name="decrypt_result_signature_certified">Firma válida (certificada)</string>
   <string name="decrypt_result_decrypted">Descifrado con éxito</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 2fd8b2a88..e1cb9ec24 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -238,7 +238,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Signature invalide !</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Clef publique inconnue</string>
+  <string name="decrypt_result_signature_missing_key">Clef publique inconnue</string>
   <string name="decrypt_result_signature_uncertified">Signature valide (non certifiée)</string>
   <string name="decrypt_result_signature_certified">Signature valide (certifiée)</string>
   <string name="decrypt_result_decrypted">Déchiffré avec succès</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 8487514e8..5b79461d5 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -245,7 +245,7 @@ Non potrai annullare!</string>
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Firma non valida!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Chiave pubblica sconosciuta</string>
+  <string name="decrypt_result_signature_missing_key">Chiave pubblica sconosciuta</string>
   <string name="decrypt_result_signature_uncertified">Firma valida (non certificata)</string>
   <string name="decrypt_result_signature_certified">Firma valida (certificata)</string>
   <string name="decrypt_result_decrypted">Decodificato correttamente</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 285a3e050..86927d621 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -254,7 +254,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">不正な署名です!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">不明な公開鍵</string>
+  <string name="decrypt_result_signature_missing_key">不明な公開鍵</string>
   <string name="decrypt_result_signature_uncertified">正しい署名 (未証明)</string>
   <string name="decrypt_result_signature_certified">正しい署名 (証明ずみ)</string>
   <string name="decrypt_result_decrypted">復号化に成功した</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index c076bbde4..e45b3b62f 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -174,7 +174,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Ongeldige handtekening!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Onbekende publieke sleutel</string>
+  <string name="decrypt_result_signature_missing_key">Onbekende publieke sleutel</string>
   <string name="decrypt_result_signature_uncertified">Geldige handtekening (ongecertificeerd)</string>
   <string name="decrypt_result_signature_certified">Geldige handtekening (gecertificeerd)</string>
   <string name="decrypt_result_decrypted">Succesvol gedecodeerd</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 8effd7f98..e4653d403 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -161,7 +161,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Nieprawidłowy podpis!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Nieznany klucz publiczny</string>
+  <string name="decrypt_result_signature_missing_key">Nieznany klucz publiczny</string>
   <string name="decrypt_result_signature_uncertified">Podpis prawidłowy (bez certyfikatu)</string>
   <string name="decrypt_result_signature_certified">Podpis prawidłowy (z certyfikatem)</string>
   <string name="decrypt_result_decrypted">Odszyfrowano pomyślnie</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index a0599b861..303efdf0a 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -209,7 +209,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Неверная подпись!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Неизвестный ключ</string>
+  <string name="decrypt_result_signature_missing_key">Неизвестный ключ</string>
   <string name="decrypt_result_signature_uncertified">Верная подпись (не сертифицирована)</string>
   <string name="decrypt_result_signature_certified">Верная подпись (сертифицирована)</string>
   <string name="decrypt_result_decrypted">Успешно расшифровано</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 4b5e32a49..9b92ab14f 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -226,7 +226,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Neveljaven podpis!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Neznan javni ključ</string>
+  <string name="decrypt_result_signature_missing_key">Neznan javni ključ</string>
   <string name="decrypt_result_signature_uncertified">Veljaven podpis (neoverjen)</string>
   <string name="decrypt_result_signature_certified">Veljaven podpis (overjen)</string>
   <string name="decrypt_result_decrypted">Uspešno dešifrirano</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index 08354310c..d77809010 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -231,7 +231,7 @@
   <string name="error_generic_report_bug">Дошло је до опште грешке, направите нови извештај о грешци за Отворени кључарник.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Неисправан потпис!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Непознат јавни кључ</string>
+  <string name="decrypt_result_signature_missing_key">Непознат јавни кључ</string>
   <string name="decrypt_result_signature_uncertified">Исправан потпис (неоверен)</string>
   <string name="decrypt_result_signature_certified">Исправан потпис (оверен)</string>
   <string name="decrypt_result_decrypted">Успешно дешифровано</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index d4937be4d..6a96e4f5e 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -214,7 +214,7 @@
   <string name="error_generic_report_bug">Genel bir hata oluştu. Lütfen OpenKeychain için bir hata raporu oluşturun.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Geçersiz imza!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Bilinmeyen açık anahtar</string>
+  <string name="decrypt_result_signature_missing_key">Bilinmeyen açık anahtar</string>
   <string name="decrypt_result_signature_uncertified">Geçerli imza (sertifikasız)</string>
   <string name="decrypt_result_signature_certified">Geçerli imza (sertifalı)</string>
   <string name="decrypt_result_decrypted">Başarıyla çözümlendi</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index fdae88c7b..46d5f59c8 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -208,7 +208,7 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Невірний підпис!</string>
-  <string name="decrypt_result_signature_unknown_pub_key">Невідомий відкритий ключ</string>
+  <string name="decrypt_result_signature_missing_key">Невідомий відкритий ключ</string>
   <string name="decrypt_result_signature_uncertified">Дійсний підпис (несертифікований)</string>
   <string name="decrypt_result_signature_certified">Дійсний підпис (сертифікований)</string>
   <string name="decrypt_result_decrypted">Успішно розшифровано.</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3850f3a68..19a259cbb 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -268,9 +268,11 @@
     <!-- results shown after decryption/verification -->
     <string name="decrypt_result_no_signature">"Not Signed"</string>
     <string name="decrypt_result_invalid_signature">"Invalid signature!"</string>
-    <string name="decrypt_result_signature_unknown_pub_key">"Unknown public key"</string>
     <string name="decrypt_result_signature_uncertified">"Signed by (not certified!)"</string>
     <string name="decrypt_result_signature_certified">"Signed by"</string>
+    <string name="decrypt_result_signature_expired_key">"Key is expired!"</string>
+    <string name="decrypt_result_signature_revoked_key">"Key has been revoked!"</string>
+    <string name="decrypt_result_signature_missing_key">"Unknown public key"</string>
     <string name="decrypt_result_encrypted">"Encrypted"</string>
     <string name="decrypt_result_not_encrypted">"Not Encrypted"</string>
     <string name="decrypt_result_action_show">"Show"</string>
-- 
cgit v1.2.3