From cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 27 Aug 2014 15:42:09 +0200
Subject: small language fixes for previous commit

---
 OpenKeychain/src/main/res/values-es/strings.xml | 4 ++--
 OpenKeychain/src/main/res/values-fr/strings.xml | 4 ++--
 OpenKeychain/src/main/res/values-it/strings.xml | 4 ++--
 OpenKeychain/src/main/res/values-ja/strings.xml | 4 ++--
 OpenKeychain/src/main/res/values-uk/strings.xml | 4 ++--
 OpenKeychain/src/main/res/values/strings.xml    | 8 +++++---
 6 files changed, 15 insertions(+), 13 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 9266950d2..8883d1b70 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -572,8 +572,8 @@
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Incorporándolas en el juego de claves públicas %s</string>
   <string name="msg_mg_secret">Incorporándolas en el juego de claves secretas (privadas) %s</string>
-  <string name="msg_mg_fatal_encode">Error fatal codificando la firma</string>
-  <string name="msg_mg_heterogeneous">¡Se intentaron fusionar juegos de claves con diferentes huellas de validación de claves!</string>
+  <string name="msg_mg_error_encode">Error fatal codificando la firma</string>
+  <string name="msg_mg_error_heterogeneous">¡Se intentaron fusionar juegos de claves con diferentes huellas de validación de claves!</string>
   <string name="msg_mg_new_subkey">Añadiendo nueva subclave %s</string>
   <string name="msg_mg_found_new">Se encontraron %s nuevos certificados en el juego de claves</string>
   <string name="msg_mg_unchanged">No hay nuevos certificados</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 4ac578ba8..db7c51867 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -572,8 +572,8 @@
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Fusion vers le trousseau public %s</string>
   <string name="msg_mg_secret">Fusion vers le trousseau secret %s</string>
-  <string name="msg_mg_fatal_encode">Erreur fatale lors de l\'encodage de la signature</string>
-  <string name="msg_mg_heterogeneous">Il a été tenté de fusionner des trousseaux avec des empreintes différentes !</string>
+  <string name="msg_mg_error_encode">Erreur fatale lors de l\'encodage de la signature</string>
+  <string name="msg_mg_error_heterogeneous">Il a été tenté de fusionner des trousseaux avec des empreintes différentes !</string>
   <string name="msg_mg_new_subkey">Ajout de la nouvelle sous-clef %s</string>
   <string name="msg_mg_found_new">%s nouveaux certificats trouvés dans le trousseau</string>
   <string name="msg_mg_unchanged">Aucun nouveau certificat</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 9a21a642b..9e956111f 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -572,8 +572,8 @@
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Fusione nel portachiavi pubblico %s</string>
   <string name="msg_mg_secret">Fusione nel portachiavi privato %s</string>
-  <string name="msg_mg_fatal_encode">Errore fatale nella codifica della firma</string>
-  <string name="msg_mg_heterogeneous">Tentativo di unire portachiavi con impronte digitali diverse!</string>
+  <string name="msg_mg_error_encode">Errore fatale nella codifica della firma</string>
+  <string name="msg_mg_error_heterogeneous">Tentativo di unire portachiavi con impronte digitali diverse!</string>
   <string name="msg_mg_new_subkey">Aggiunta nuova sottochiave %s</string>
   <string name="msg_mg_found_new">Trovati %s nuovi certificati nel portachiavi</string>
   <string name="msg_mg_unchanged">Nessun nuovo certificato</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 724abeab4..e2cc70f9a 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -555,8 +555,8 @@
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">公開鍵の鍵輪 %s にマージ中</string>
   <string name="msg_mg_secret">秘密鍵の鍵輪 %s にマージ中</string>
-  <string name="msg_mg_fatal_encode">署名のエンコードでの致命的なエラー</string>
-  <string name="msg_mg_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
+  <string name="msg_mg_error_encode">署名のエンコードでの致命的なエラー</string>
+  <string name="msg_mg_error_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
   <string name="msg_mg_new_subkey">新しい副鍵 %s を追加中</string>
   <string name="msg_mg_found_new">鍵輪に新しい検証を %s 発見</string>
   <string name="msg_mg_unchanged">新しい証明がない</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 77458e93f..f1533f4f2 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -552,8 +552,8 @@
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Злиття у публічну в\'язку %s</string>
   <string name="msg_mg_secret">Злиття у секретну в\'язку %s</string>
-  <string name="msg_mg_fatal_encode">Фатальна помилка шифрування підпису</string>
-  <string name="msg_mg_heterogeneous">Спробували злити в\'язки із різними відбитками!</string>
+  <string name="msg_mg_error_encode">Фатальна помилка шифрування підпису</string>
+  <string name="msg_mg_error_heterogeneous">Спробували злити в\'язки із різними відбитками!</string>
   <string name="msg_mg_new_subkey">Додається новий підключ %s</string>
   <string name="msg_mg_found_new">Знайдено %s нових сертифікатів у в\'язці</string>
   <string name="msg_mg_unchanged">Немає нових сертифікатів</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d8c73bd9e..6e487adfa 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -500,6 +500,8 @@
     <string name="cert_verify_error">error!</string>
     <string name="cert_verify_unavailable">key unavailable</string>
 
+    <!-- LogType log messages. Errors should have _ERROR_ in their name and end with a ! -->
+
     <!-- Import Public log entries -->
     <string name="msg_ip_apply_batch">Applying insert batch operation.</string>
     <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string>
@@ -619,14 +621,14 @@
     <string name="msg_kc_uid_remove">Removing invalid user id %s</string>
 
     <!-- Keyring merging log entries -->
+    <string name="msg_mg_error_secret_dummy">New public subkey found, but secret subkey dummy generation is not supported!</string>
+    <string name="msg_mg_error_heterogeneous">Tried to merge keyrings with differing fingerprints!</string>
+    <string name="msg_mg_error_encode">Fatal error encoding signature!</string>
     <string name="msg_mg_public">Merging into public keyring %s</string>
     <string name="msg_mg_secret">Merging into secret keyring %s</string>
-    <string name="msg_mg_fatal_encode">Fatal error encoding signature</string>
-    <string name="msg_mg_heterogeneous">Tried to merge keyrings with differing fingerprints!</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>
-    <string name="msg_mg_no_secret_keyring">No secret keyring to add subkey to</string>
 
     <!-- createSecretKeyRing -->
     <string name="msg_cr">Generating new master key</string>
-- 
cgit v1.2.3