[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.20-20-gc3a57d7
by Werner Koch
cvs at cvs.gnupg.org
Wed Jul 3 16:04:00 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, STABLE-BRANCH-2-0 has been updated
via c3a57d767719a58ec791a0791842bcc80c859081 (commit)
via ebbce67489b8d0eded74be66cbd6bf42f5147725 (commit)
via 90b419f3e9d05e509348d047e05fcc79e87be6cf (commit)
from 8b0cf1f59e660b1562ca3421b784172df84b1c5d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c3a57d767719a58ec791a0791842bcc80c859081
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 3 15:22:00 2013 +0200
po: Auto updates.
--
diff --git a/po/be.po b/po/be.po
index da9d281..3b64370 100644
--- a/po/be.po
+++ b/po/be.po
@@ -283,10 +283,10 @@ msgstr ""
"Выбары:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -338,7 +338,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/ca.po b/po/ca.po
index b4957ad..ef417f7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -308,10 +308,10 @@ msgstr ""
"Opcions:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
@@ -368,7 +368,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/cs.po b/po/cs.po
index 688bcfd..7b21586 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -313,12 +313,12 @@ msgstr ""
"@Volby:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "běžet v režimu serveru (na popÅ™edÃ)"
-
msgid "run in daemon mode (background)"
msgstr "běžen v režimu démona (na pozadÃ)"
+msgid "run in server mode (foreground)"
+msgstr "běžet v režimu serveru (na popÅ™edÃ)"
+
msgid "verbose"
msgstr "s dodateÄnými informacemi"
@@ -367,7 +367,9 @@ msgstr "|N|zahodit zapamatované PINy po N sekundách"
msgid "do not use the PIN cache when signing"
msgstr "nepoužÃvat paměť PINů na podepisovánÃ"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "dovolit klientům oznaÄit klÃÄe za „důvÄ›ryhodné“"
msgid "allow presetting passphrase"
diff --git a/po/da.po b/po/da.po
index 365f6bd..f64b87c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -298,12 +298,12 @@ msgstr ""
"@Indstillinger:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "kør i servertilstand (forgrunden)"
-
msgid "run in daemon mode (background)"
msgstr "kør i dæmontilstand (baggrunden)"
+msgid "run in server mode (foreground)"
+msgstr "kør i servertilstand (forgrunden)"
+
msgid "verbose"
msgstr "uddybende"
@@ -352,7 +352,9 @@ msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
msgid "do not use the PIN cache when signing"
msgstr "brug ikke PIN-mellemlageret når der underskrives"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
msgid "allow presetting passphrase"
diff --git a/po/de.po b/po/de.po
index de55432..8c37ac6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -299,12 +299,12 @@ msgstr ""
"@Optionen:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "Im Server Modus ausführen"
-
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
+msgid "run in server mode (foreground)"
+msgstr "Im Server Modus ausführen"
+
msgid "verbose"
msgstr "Detaillierte Informationen"
diff --git a/po/el.po b/po/el.po
index afc6a69..321ff3b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -286,10 +286,10 @@ msgstr ""
"ÅðéëïãÝò:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -345,7 +345,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/eo.po b/po/eo.po
index c3f568d..17f035c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -287,10 +287,10 @@ msgstr ""
"Opcioj:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -345,7 +345,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/es.po b/po/es.po
index b3e9654..ba9aa7b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -312,12 +312,12 @@ msgstr ""
"@Opciones:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "ejecutar en modo servidor (primer plano)"
-
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
+msgid "run in server mode (foreground)"
+msgstr "ejecutar en modo servidor (primer plano)"
+
msgid "verbose"
msgstr "prolijo"
@@ -366,7 +366,9 @@ msgstr "|N|los PINs en la cach
msgid "do not use the PIN cache when signing"
msgstr "no usar el caché de PINs al firmar"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "permitir que los clientes marquen claves como \"fiables\""
msgid "allow presetting passphrase"
diff --git a/po/et.po b/po/et.po
index 6a047e9..dcdd036 100644
--- a/po/et.po
+++ b/po/et.po
@@ -284,10 +284,10 @@ msgstr ""
"Võtmed:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -342,7 +342,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/fi.po b/po/fi.po
index 15d22f4..b530eea 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -300,10 +300,10 @@ msgstr ""
"Valitsimet:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -358,7 +358,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/fr.po b/po/fr.po
index 61faa9b..17afec7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -296,12 +296,12 @@ msgstr ""
"@Options :\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "exécuter en mode serveur (premier plan)"
-
msgid "run in daemon mode (background)"
msgstr "exécuter en mode démon (arrière-plan)"
+msgid "run in server mode (foreground)"
+msgstr "exécuter en mode serveur (premier plan)"
+
msgid "verbose"
msgstr "bavard"
@@ -350,7 +350,9 @@ msgstr "|N|oublier les codes personnels après N secondes"
msgid "do not use the PIN cache when signing"
msgstr "ne pas utiliser le cache de code pour signer"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "permettre de marquer la confiance des clefs"
msgid "allow presetting passphrase"
diff --git a/po/gl.po b/po/gl.po
index fb7a180..fb5f358 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -285,10 +285,10 @@ msgstr ""
"Opcións:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -345,7 +345,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/hu.po b/po/hu.po
index 2aa53f6..086fff2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -284,10 +284,10 @@ msgstr ""
"Opciók:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -342,7 +342,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/id.po b/po/id.po
index 8cf6765..86b5ee0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -289,10 +289,10 @@ msgstr ""
"Pilihan:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -347,7 +347,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/it.po b/po/it.po
index eed6c30..0f7159f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -284,10 +284,10 @@ msgstr ""
"Opzioni:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -342,7 +342,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/ja.po b/po/ja.po
index 6944f33..c7f585e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -282,12 +282,12 @@ msgstr ""
"@オプション:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "サーãƒãƒ»ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œ (フォアグラウンド)"
-
msgid "run in daemon mode (background)"
msgstr "デーモン・モードã§å®Ÿè¡Œ (ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰)"
+msgid "run in server mode (foreground)"
+msgstr "サーãƒãƒ»ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œ (フォアグラウンド)"
+
msgid "verbose"
msgstr "冗長"
@@ -336,7 +336,9 @@ msgstr "|N|N秒後ã«ä¿æŒã—ãŸPINを無効ã¨ã™ã‚‹"
msgid "do not use the PIN cache when signing"
msgstr "ç½²åã«å¯¾ã—ã¦PINã®ä¿æŒã‚’使ã‚ãªã„"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "クライアントãŒéµã«\"trusted\"マークをã¤ã‘ã‚‹ã“ã¨ã‚’èªã‚ã‚‹"
msgid "allow presetting passphrase"
diff --git a/po/nb.po b/po/nb.po
index 809016d..6849dc7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -296,10 +296,10 @@ msgstr ""
"Valg:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -354,7 +354,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/pl.po b/po/pl.po
index 62abfa5..d1ee871 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -292,12 +292,12 @@ msgstr ""
"@Opcje:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
-
msgid "run in daemon mode (background)"
msgstr "uruchomienie w trybie demona (w tle)"
+msgid "run in server mode (foreground)"
+msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
+
msgid "verbose"
msgstr "z dodatkowymi informacjami"
@@ -346,7 +346,9 @@ msgstr "|N|przedawnienie pami
msgid "do not use the PIN cache when signing"
msgstr "nie u¿ywanie pamiêci PIN-ów przy podpisywaniu"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
msgid "allow presetting passphrase"
diff --git a/po/pt.po b/po/pt.po
index 302399f..6f1eb46 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -287,10 +287,10 @@ msgstr ""
"Opções:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -346,7 +346,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0a1aff5..067566b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -292,10 +292,10 @@ msgstr ""
"Opções:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -350,7 +350,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/ro.po b/po/ro.po
index 6583ef9..0227d3e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -298,10 +298,10 @@ msgstr ""
"Opþiuni:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -356,7 +356,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/ru.po b/po/ru.po
index 0d6e3b2..a264d78 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -295,12 +295,12 @@ msgstr ""
"@Параметры:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "запуÑк в режиме Ñервера (foreground)"
-
msgid "run in daemon mode (background)"
msgstr "запуÑк в режиме демона (background)"
+msgid "run in server mode (foreground)"
+msgstr "запуÑк в режиме Ñервера (foreground)"
+
msgid "verbose"
msgstr "подробно"
@@ -349,7 +349,9 @@ msgstr "|N|кеш PIN проÑрочен поÑле N Ñекунд"
msgid "do not use the PIN cache when signing"
msgstr "не иÑпользовать кеш PIN при подпиÑывании"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "позволить клиентам помечать ключи как \"доверÑемые\""
msgid "allow presetting passphrase"
diff --git a/po/sk.po b/po/sk.po
index 12be517..3a57da1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -287,10 +287,10 @@ msgstr ""
"Mo¾nosti:\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -345,7 +345,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/sv.po b/po/sv.po
index 9a62da2..383e329 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -311,12 +311,12 @@ msgstr ""
"@Flaggor:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "kör i serverläge (förgrund)"
-
msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
+msgid "run in server mode (foreground)"
+msgstr "kör i serverläge (förgrund)"
+
msgid "verbose"
msgstr "utförlig"
@@ -366,7 +366,9 @@ msgid "do not use the PIN cache when signing"
msgstr "använd inte mellanlagring av PIN-kod vid signering"
# Antar att värdet inte ska översättas.
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "tillåt klienter att markera nycklar som \"trusted\""
msgid "allow presetting passphrase"
diff --git a/po/tr.po b/po/tr.po
index 1c73672..4d99c82 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -287,12 +287,12 @@ msgstr ""
"@Seçenekler:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "sunucu olarak (önalanda) çalışır"
-
msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
+msgid "run in server mode (foreground)"
+msgstr "sunucu olarak (önalanda) çalışır"
+
msgid "verbose"
msgstr "ayrıntılı"
@@ -341,7 +341,9 @@ msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
msgid "do not use the PIN cache when signing"
msgstr "imzalarken PIN arabelleği kullanılmaz"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
msgid "allow presetting passphrase"
diff --git a/po/uk.po b/po/uk.po
index 571c754..903d2c5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -297,12 +297,12 @@ msgstr ""
"@Параметри:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "запуÑтити у режимі Ñервера (оÑновному)"
-
msgid "run in daemon mode (background)"
msgstr "запуÑтити у режимі фонової Ñлужби (фоновий)"
+msgid "run in server mode (foreground)"
+msgstr "запуÑтити у режимі Ñервера (оÑновному)"
+
msgid "verbose"
msgstr "докладний режим"
@@ -351,7 +351,9 @@ msgstr "вважати кешовані пінкоди за вказану кі
msgid "do not use the PIN cache when signing"
msgstr "не викориÑтовувати кеш пін-кодів Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑуваннÑ"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "дозволити клієнтам позначати ключі Ñк надійні"
msgid "allow presetting passphrase"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7f1a90f..fe86621 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -296,10 +296,10 @@ msgstr ""
"选项：\n"
" "
-msgid "run in server mode (foreground)"
+msgid "run in daemon mode (background)"
msgstr ""
-msgid "run in daemon mode (background)"
+msgid "run in server mode (foreground)"
msgstr ""
msgid "verbose"
@@ -354,7 +354,7 @@ msgstr ""
msgid "do not use the PIN cache when signing"
msgstr ""
-msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
#, fuzzy
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7c6df10..4ac3df2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -276,12 +276,12 @@ msgstr ""
"@é¸é …:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "以伺æœå™¨æ¨¡å¼åŸ·è¡Œ (å‰æ™¯)"
-
msgid "run in daemon mode (background)"
msgstr "以æœå‹™æ¨¡å¼åŸ·è¡Œ (背景)"
+msgid "run in server mode (foreground)"
+msgstr "以伺æœå™¨æ¨¡å¼åŸ·è¡Œ (å‰æ™¯)"
+
msgid "verbose"
msgstr "囉唆模å¼"
@@ -330,7 +330,9 @@ msgstr "|N|讓快å–ä½çš„個人è˜åˆ¥ç¢¼ (PIN) 在 N 秒後到期"
msgid "do not use the PIN cache when signing"
msgstr "簽署時ä¸è¦ä½¿ç”¨å€‹äººè˜åˆ¥ç¢¼ (PIN) å¿«å–"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "å…許用戶端將金鑰標記為 \"已信任\""
msgid "allow presetting passphrase"
commit ebbce67489b8d0eded74be66cbd6bf42f5147725
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 3 15:21:33 2013 +0200
Update the German translation.
diff --git a/po/de.po b/po/de.po
index 14ff5f1..de55432 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.18\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2013-07-03 13:32+0200\n"
+"PO-Revision-Date: 2013-07-03 15:03+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -353,8 +353,8 @@ msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
msgid "do not use the PIN cache when signing"
msgstr "benutze PINs im Cache nicht beim Signieren"
-msgid "allow clients to mark keys as \"trusted\""
-msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "verbite Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
msgid "allow presetting passphrase"
msgstr "erlaube ein \"preset\" von Passphrases"
commit 90b419f3e9d05e509348d047e05fcc79e87be6cf
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 3 15:20:25 2013 +0200
agent: Make --allow-mark-trusted the default.
* agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
Put this option into the gpgconf-list.
(main): Enable opt.allow_mark_trusted by default.
* tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
allow-mark-trusted by no-allow-mark-trusted.
* agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
--
These changes have been in effect for the Gpg4win Windows version
since 2011-01-24 and thus first released with Gpg4win 2.1.0. Given
the current state of PKIX it does not make any sense to lure the Unix
user into false security by making it harder to trust self-signed or
CAcert certificates.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/NEWS b/NEWS
index adaa257..782a54b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,15 @@
Noteworthy changes in version 2.0.21 (unreleased)
-------------------------------------------------
+ * gpg-agent: By default the users are now asked via the Pinentry
+ whether they trust an X.509 root key. To prohibit interactive
+ marking of such keys, the new option --no-allow-mark-trusted may
+ be used.
+
* The included ssh agent does now support ECDSA keys.
- * New option --enable-putty-support to allow gpg-agent to act as a
- Pageant replacement including full smartcard support.
+ * The new option --enable-putty-support allows gpg-agent on Windows
+ to act as a Pageant replacement with full smartcard support.
Noteworthy changes in version 2.0.20 (2013-05-10)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 9d53de9..1f53a37 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -112,6 +112,7 @@ enum cmd_and_opt_values
oIgnoreCacheForSigning,
oAllowMarkTrusted,
+ oNoAllowMarkTrusted,
oAllowPresetPassphrase,
oKeepTTY,
oKeepDISPLAY,
@@ -131,8 +132,8 @@ static ARGPARSE_OPTS opts[] = {
{ 301, NULL, 0, N_("@Options:\n ") },
- { oServer, "server", 0, N_("run in server mode (foreground)") },
{ oDaemon, "daemon", 0, N_("run in daemon mode (background)") },
+ { oServer, "server", 0, N_("run in server mode (foreground)") },
{ oVerbose, "verbose", 0, N_("verbose") },
{ oQuiet, "quiet", 0, N_("be somewhat more quiet") },
{ oSh, "sh", 0, N_("sh-style command output") },
@@ -184,8 +185,9 @@ static ARGPARSE_OPTS opts[] = {
{ oIgnoreCacheForSigning, "ignore-cache-for-signing", 0,
N_("do not use the PIN cache when signing")},
- { oAllowMarkTrusted, "allow-mark-trusted", 0,
- N_("allow clients to mark keys as \"trusted\"")},
+ { oNoAllowMarkTrusted, "no-allow-mark-trusted", 0,
+ N_("disallow clients to mark keys as \"trusted\"")},
+ { oAllowMarkTrusted, "allow-mark-trusted", 0, "@"},
{ oAllowPresetPassphrase, "allow-preset-passphrase", 0,
N_("allow presetting passphrase")},
{ oSSHSupport, "enable-ssh-support", 0, N_("enable ssh support") },
@@ -503,7 +505,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
opt.enable_passhrase_history = 0;
opt.ignore_cache_for_signing = 0;
- opt.allow_mark_trusted = 0;
+ opt.allow_mark_trusted = 1;
opt.disable_scdaemon = 0;
return 1;
}
@@ -563,6 +565,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;
case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break;
+ case oNoAllowMarkTrusted: opt.allow_mark_trusted = 0; break;
case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break;
@@ -960,7 +963,7 @@ main (int argc, char **argv )
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
printf ("ignore-cache-for-signing:%lu:\n",
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
- printf ("allow-mark-trusted:%lu:\n",
+ printf ("no-allow-mark-trusted:%lu:\n",
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
printf ("disable-scdaemon:%lu:\n",
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
diff --git a/agent/trustlist.c b/agent/trustlist.c
index be5406b..ef9c661 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -731,7 +731,8 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
}
else
es_fputs (nameformatted, fp);
- es_fprintf (fp, "\n%s%s %c\n", yes_i_trust?"":"!", fprformatted, flag);
+ es_fprintf (fp, "\n%s%s %c%s\n", yes_i_trust?"":"!", fprformatted, flag,
+ flag == 'S'? " relax":"");
if (es_ferror (fp))
err = gpg_error_from_syserror ();
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 72e7134..078dcea 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -532,8 +532,8 @@ static gc_option_t gc_options_gpg_agent[] =
{ "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME,
GC_LEVEL_BASIC, "gnupg", "do not use the PIN cache when signing",
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
- { "allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
- GC_LEVEL_ADVANCED, "gnupg", "allow clients to mark keys as \"trusted\"",
+ { "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
+ GC_LEVEL_ADVANCED, "gnupg", "disallow clients to mark keys as \"trusted\"",
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
{ "no-grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
"gnupg", "do not grab keyboard and mouse",
-----------------------------------------------------------------------
Summary of changes:
NEWS | 9 +++++++--
agent/gpg-agent.c | 13 ++++++++-----
agent/trustlist.c | 3 ++-
po/be.po | 6 +++---
po/ca.po | 6 +++---
po/cs.po | 10 ++++++----
po/da.po | 10 ++++++----
po/de.po | 12 ++++++------
po/el.po | 6 +++---
po/eo.po | 6 +++---
po/es.po | 10 ++++++----
po/et.po | 6 +++---
po/fi.po | 6 +++---
po/fr.po | 10 ++++++----
po/gl.po | 6 +++---
po/hu.po | 6 +++---
po/id.po | 6 +++---
po/it.po | 6 +++---
po/ja.po | 10 ++++++----
po/nb.po | 6 +++---
po/pl.po | 10 ++++++----
po/pt.po | 6 +++---
po/pt_BR.po | 6 +++---
po/ro.po | 6 +++---
po/ru.po | 10 ++++++----
po/sk.po | 6 +++---
po/sv.po | 10 ++++++----
po/tr.po | 10 ++++++----
po/uk.po | 10 ++++++----
po/zh_CN.po | 6 +++---
po/zh_TW.po | 10 ++++++----
tools/gpgconf-comp.c | 4 ++--
32 files changed, 139 insertions(+), 108 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list