From aa14bfb33a08a7b19f999167f3ef05cd0d5f4435 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 24 Jun 2013 06:38:44 +0200
Subject: Auto merge po files.

--
---
 po/cs.po    | 28 ++++++++++++++++++++++++++++
 po/da.po    | 28 ++++++++++++++++++++++++++++
 po/eo.po    | 28 ++++++++++++++++++++++++++++
 po/fr.po    | 28 ++++++++++++++++++++++++++++
 po/it.po    | 28 ++++++++++++++++++++++++++++
 po/ja.po    | 26 ++++++++++++++++++++++++++
 po/nl.po    | 28 ++++++++++++++++++++++++++++
 po/pl.po    | 28 ++++++++++++++++++++++++++++
 po/ro.po    | 26 ++++++++++++++++++++++++++
 po/sv.po    | 26 ++++++++++++++++++++++++++
 po/uk.po    | 28 ++++++++++++++++++++++++++++
 po/vi.po    | 26 ++++++++++++++++++++++++++
 po/zh_CN.po | 26 ++++++++++++++++++++++++++
 13 files changed, 354 insertions(+)

diff --git a/po/cs.po b/po/cs.po
index 1845b54..da5db20 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -670,6 +670,34 @@ msgstr "Zdvojená hodnota"
 msgid "Ambiguous result"
 msgstr "Nejednoznačné jméno"
 
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "No crypto context"
+msgstr "Chybí kryptografická jednotka"
+
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "Wrong crypto context"
+msgstr "Chybí kryptografická jednotka"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Neplatná kryptografická jednotka"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Žádný veřejný klíč"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Žádný tajný klíč"
+
 msgid "Operation fully cancelled"
 msgstr "Operace zcela zrušena"
 
diff --git a/po/da.po b/po/da.po
index 18bfb5e..3752ade 100644
--- a/po/da.po
+++ b/po/da.po
@@ -665,6 +665,34 @@ msgstr "Duplikeret værdi"
 msgid "Ambiguous result"
 msgstr "Tvetydigt navn"
 
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "No crypto context"
+msgstr "Ingen cryptomotor"
+
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "Wrong crypto context"
+msgstr "Ingen cryptomotor"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Ugyldig cryptomotor"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Ingen offentlig nøgle"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Ingen hemmelig nøgle"
+
 msgid "Operation fully cancelled"
 msgstr "Handling fuldt afbrudt"
 
diff --git a/po/eo.po b/po/eo.po
index 6e91d4d..8a09b04 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -676,6 +676,34 @@ msgstr "Duobligita valoro"
 msgid "Ambiguous result"
 msgstr "Plursenca nomo"
 
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "No crypto context"
+msgstr "Malvalida ĉifra maŝino"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Wrong crypto context"
+msgstr "Malvalida ĉifra maŝino"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Malvalida ĉifra maŝino"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Neniu publika ŝlosilo"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Neniu sekreta ŝlosilo"
+
 #, fuzzy
 #| msgid "Operation cancelled"
 msgid "Operation fully cancelled"
diff --git a/po/fr.po b/po/fr.po
index 6c41555..0720e96 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -663,6 +663,34 @@ msgstr "Valeur dupliquée"
 msgid "Ambiguous result"
 msgstr "Nom ambiguë"
 
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "No crypto context"
+msgstr "Aucun moteur de chiffrement"
+
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "Wrong crypto context"
+msgstr "Aucun moteur de chiffrement"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Moteur de chiffrement incorrect"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Pas de clef publique"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Pas de clef secrète"
+
 msgid "Operation fully cancelled"
 msgstr "Opération complètement annulée"
 
diff --git a/po/it.po b/po/it.po
index ce8aaae..3a6bf61 100644
--- a/po/it.po
+++ b/po/it.po
@@ -676,6 +676,34 @@ msgstr "Valore duplicato"
 msgid "Ambiguous result"
 msgstr "Nome ambiguo"
 
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "No crypto context"
+msgstr "Motore crittografico non valido"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Wrong crypto context"
+msgstr "Motore crittografico non valido"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Motore crittografico non valido"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Nessuna chiave pubblica"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Nessuna chiave segreta"
+
 #, fuzzy
 #| msgid "Operation cancelled"
 msgid "Operation fully cancelled"
diff --git a/po/ja.po b/po/ja.po
index 4404b80..450d765 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -674,6 +674,32 @@ msgstr "重複した値です"
 msgid "Ambiguous result"
 msgstr "曖昧な名前です"
 
+#, fuzzy
+msgid "No crypto context"
+msgstr "無効な暗号エンジンです"
+
+#, fuzzy
+msgid "Wrong crypto context"
+msgstr "無効な暗号エンジンです"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "無効な暗号エンジンです"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "公開鍵がありません"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "秘密鍵がありません"
+
 #, fuzzy
 msgid "Operation fully cancelled"
 msgstr "操作がキャンセルされました"
diff --git a/po/nl.po b/po/nl.po
index c4939a6..ebf2538 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -662,6 +662,34 @@ msgstr "Gedupliceerde waarde"
 msgid "Ambiguous result"
 msgstr "Dubbelzinnige naam"
 
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "No crypto context"
+msgstr "Geen crypto-engine"
+
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "Wrong crypto context"
+msgstr "Geen crypto-engine"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Ongeldige crypto-engine"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Geen publieke sleutel"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Geen geheime sleutel"
+
 msgid "Operation fully cancelled"
 msgstr "Bewerking volledig geannuleerd"
 
diff --git a/po/pl.po b/po/pl.po
index a0b69d0..f7d7a76 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -664,6 +664,34 @@ msgstr "Powt
 msgid "Ambiguous result"
 msgstr "Niejednoznaczna nazwa"
 
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "No crypto context"
+msgstr "Brak silnika kryptograficznego"
+
+#, fuzzy
+#| msgid "No crypto engine"
+msgid "Wrong crypto context"
+msgstr "Brak silnika kryptograficznego"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Niepoprawny silnik kryptograficzny"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Brak klucza publicznego"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Brak klucza tajnego"
+
 #, fuzzy
 msgid "Operation fully cancelled"
 msgstr "Operacja anulowana"
diff --git a/po/ro.po b/po/ro.po
index f87ba93..e52c53b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -681,6 +681,32 @@ msgstr "Valoare dubl
 msgid "Ambiguous result"
 msgstr "Nume ambiguu"
 
+#, fuzzy
+msgid "No crypto context"
+msgstr "Motor cifrare invalid"
+
+#, fuzzy
+msgid "Wrong crypto context"
+msgstr "Motor cifrare invalid"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Motor cifrare invalid"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Nici o cheie public�"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Nici o cheie secret�"
+
 #, fuzzy
 msgid "Operation fully cancelled"
 msgstr "Opera�iune anulat�"
diff --git a/po/sv.po b/po/sv.po
index d186825..261c438 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -668,6 +668,32 @@ msgstr "Dubblettvärde"
 msgid "Ambiguous result"
 msgstr "Tvetydigt namn"
 
+#, fuzzy
+msgid "No crypto context"
+msgstr "Ogiltig krypteringsmotor"
+
+#, fuzzy
+msgid "Wrong crypto context"
+msgstr "Ogiltig krypteringsmotor"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Ogiltig krypteringsmotor"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Ingen publik nyckel"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Ingen hemlig nyckel"
+
 #, fuzzy
 msgid "Operation fully cancelled"
 msgstr "Åtgärden avbröts"
diff --git a/po/uk.po b/po/uk.po
index 83bd41b..2b4768e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -678,6 +678,34 @@ msgstr "Дублювання значення"
 msgid "Ambiguous result"
 msgstr "Неоднозначна назва"
 
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "No crypto context"
+msgstr "Некоректний рушій шифрування"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Wrong crypto context"
+msgstr "Некоректний рушій шифрування"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Некоректний рушій шифрування"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Немає відкритого ключа"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Немає закритого ключа"
+
 #, fuzzy
 #| msgid "Operation cancelled"
 msgid "Operation fully cancelled"
diff --git a/po/vi.po b/po/vi.po
index 50941e8..54e8c04 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -670,6 +670,32 @@ msgstr "Giá trị trùng"
 msgid "Ambiguous result"
 msgstr "Tên mờ hồ"
 
+#, fuzzy
+msgid "No crypto context"
+msgstr "Cơ chế mật mã không hợp lệ"
+
+#, fuzzy
+msgid "Wrong crypto context"
+msgstr "Cơ chế mật mã không hợp lệ"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "Cơ chế mật mã không hợp lệ"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "Không có khoá công"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "Không có khoá bí mật"
+
 #, fuzzy
 msgid "Operation fully cancelled"
 msgstr "Thao tác bị hủy bỏ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 152cfde..74ce991 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -668,6 +668,32 @@ msgstr "重复值"
 msgid "Ambiguous result"
 msgstr ""
 
+#, fuzzy
+msgid "No crypto context"
+msgstr "无效的加密引擎"
+
+#, fuzzy
+msgid "Wrong crypto context"
+msgstr "无效的加密引擎"
+
+#, fuzzy
+#| msgid "Invalid crypto engine"
+msgid "Bad crypto context"
+msgstr "无效的加密引擎"
+
+msgid "Conflict in the crypto context"
+msgstr ""
+
+#, fuzzy
+#| msgid "No public key"
+msgid "Broken public key"
+msgstr "没有公钥"
+
+#, fuzzy
+#| msgid "No secret key"
+msgid "Broken secret key"
+msgstr "没有秘匙"
+
 #, fuzzy
 msgid "Operation fully cancelled"
 msgstr "操作已取消"
-- 
cgit v1.2.3