Dear maintainer of argus, On Sunday, December 13, 2009 I sent you a notice announcing my intent to upload a NMU of your package to fix its pending l10n issues, after an initial notice sent on Tuesday, December 08, 2009.
I unfortunately can't build the NMU because of #558409.
I therefore send the full patch so that anyone doing the NMU to fix
the FTBFS may also fix the trivial l10n issues.
Please notice that my planned l10n NMu was also fixing a few lintian
warnings (and, yes, I generally bump debhelper compatibility in NMUs).
Please also notice that:
- one translation had an issue with commas separating choices
- I splitted "_Choices" to "__Choices" by using the method documented
in po-debconf(7)
Source: argus
Version: 1:2.0.6.fixes.1-16.1
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <bubu...@debian.org>
Date: Sun, 20 Dec 2009 08:12:31 +0100
Closes: 502603 548145 561263
Changes:
argus (1:2.0.6.fixes.1-16.1) unstable; urgency=low
.
* Non-maintainer upload.
* Do not ignore errors in config script
* Split "_Choices" in "__Choices" in templates
* Bump debhelper compatibility to 7
* Fix pending l10n issues. Debconf translations:
- Italian (Vincenzo Campanella). Closes: #502603
- Spanish (Francisco Javier Cuadrado). Closes: #548145
- Simplified Chinese (Ji ZhengYu) - commas fixed in Choices field
translation. Closes: #561263
--
diff -Nru argus-2.0.6.fixes.1.old/debian/argus-server.config argus-2.0.6.fixes.1/debian/argus-server.config --- argus-2.0.6.fixes.1.old/debian/argus-server.config 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/argus-server.config 2009-12-20 18:11:16.000000000 +0100 @@ -1,4 +1,6 @@ #!/bin/sh + +set -e . /usr/share/debconf/confmodule DEFAULTS=/etc/default/argus-server db_input medium argus/overwrite_conffile || true diff -Nru argus-2.0.6.fixes.1.old/debian/changelog argus-2.0.6.fixes.1/debian/changelog --- argus-2.0.6.fixes.1.old/debian/changelog 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/changelog 2009-12-20 18:15:30.000000000 +0100 @@ -1,3 +1,17 @@ +argus (1:2.0.6.fixes.1-16.1) unstable; urgency=low + + * Non-maintainer upload. + * Do not ignore errors in config script + * Split "_Choices" in "__Choices" in templates + * Bump debhelper compatibility to 7 + * Fix pending l10n issues. Debconf translations: + - Italian (Vincenzo Campanella). Closes: #502603 + - Spanish (Francisco Javier Cuadrado). Closes: #548145 + - Simplified Chinese (Ji ZhengYu) - commas fixed in Choices field + translation. Closes: #561263 + + -- Christian Perrier <bubu...@debian.org> Sun, 20 Dec 2009 08:12:31 +0100 + argus (1:2.0.6.fixes.1-16) unstable; urgency=low * Updated Swedish debconf template translation (closes: #491934) diff -Nru argus-2.0.6.fixes.1.old/debian/compat argus-2.0.6.fixes.1/debian/compat --- argus-2.0.6.fixes.1.old/debian/compat 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/compat 2009-12-20 18:14:58.000000000 +0100 @@ -1 +1 @@ -4 +7 diff -Nru argus-2.0.6.fixes.1.old/debian/control argus-2.0.6.fixes.1/debian/control --- argus-2.0.6.fixes.1.old/debian/control 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/control 2009-12-20 18:15:20.000000000 +0100 @@ -3,8 +3,7 @@ Priority: optional Maintainer: Andrew Pollock <apoll...@debian.org> Standards-Version: 3.8.0 -Build-Depends: libpcap-dev, libwrap0-dev, bison, flex, debhelper (>= 4.1.68), devscripts, autotools-dev, po-debconf -Build-Conflicts: debhelper (= 5.0.14) +Build-Depends: debhelper (> 7), libpcap-dev, libwrap0-dev, bison, flex, debhelper (>= 4.1.68), devscripts, autotools-dev, po-debconf Package: argus-server Architecture: any diff -Nru argus-2.0.6.fixes.1.old/debian/po/cs.po argus-2.0.6.fixes.1/debian/po/cs.po --- argus-2.0.6.fixes.1.old/debian/po/cs.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/cs.po 2009-12-20 18:14:13.000000000 +0100 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: argus\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2007-03-04 17:51+0100\n" "Last-Translator: Miroslav Kure <ku...@debian.cz>\n" "Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n" @@ -26,8 +26,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "při zavádění, při vytáčení, oběma způsoby, nikdy" +msgid "boot" +msgstr "při zavádění" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "při vytáčení" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "oběma způsoby" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "nikdy" #. Type: select #. Description @@ -61,3 +79,6 @@ msgstr "" "Vyberete-li tuto možnost, instalační skript vždy přepíše /etc/default/argus-" "server. V opačném případě budete soubor spravovat sami." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "při zavádění, při vytáčení, oběma způsoby, nikdy" diff -Nru argus-2.0.6.fixes.1.old/debian/po/de.po argus-2.0.6.fixes.1/debian/po/de.po --- argus-2.0.6.fixes.1.old/debian/po/de.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/de.po 2009-12-20 18:14:13.000000000 +0100 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: argus_1:2.0.6.fixes.1-12_de\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2007-02-16 22:47+0100\n" "Last-Translator: Erik Schanze <er...@debian.org>\n" "Language-Team: German <debian-l10n-ger...@lists.debian.org>\n" @@ -28,8 +28,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "Hochfahren, Einwahl, beides, nie" +msgid "boot" +msgstr "Hochfahren" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "Einwahl" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "beides" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "nie" #. Type: select #. Description @@ -65,3 +83,6 @@ "Wenn Sie zustimmen, wird während der Installation die Datei /etc/default/" "argus-server prinzipiell überschrieben. Andernfalls müssen Sie die Datei " "selbst verwalten." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "Hochfahren, Einwahl, beides, nie" diff -Nru argus-2.0.6.fixes.1.old/debian/po/es.po argus-2.0.6.fixes.1/debian/po/es.po --- argus-2.0.6.fixes.1.old/debian/po/es.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/es.po 2009-12-20 18:14:13.000000000 +0100 @@ -1,54 +1,73 @@ # argus po-debconf translation to Spanish -# Copyright (C) 2005 Software in the Public Interest +# Copyright (C) 2005, 2009 Software in the Public Interest # This file is distributed under the same license as the argus package. # # Changes: -# - Initial translation -# César Gómez Martín <cesar.go...@gmail.com> +# - Initial translation +# César Gómez Martín <cesar.go...@gmail.com>, 2005 +# +# - Updates +# Francisco Javier Cuadrado <fcocuadr...@gmail.com>, 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' # -# Traductores, si no conoce el formato PO, merece la pena leer la -# documentación de gettext, especialmente las secciones dedicadas a este -# formato, por ejemplo ejecutando: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' # Equipo de traducción al español, por favor, lean antes de traducir # los siguientes documentos: # -# - El proyecto de traducción de Debian al español -# http://www.debian.org/intl/spanish/ -# especialmente las notas de traducción en -# http://www.debian.org/intl/spanish/notas -# -# - La guía de traducción de po's de debconf: -# /usr/share/doc/po-debconf/README-trans -# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans # msgid "" msgstr "" -"Project-Id-Version: argus\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" -"PO-Revision-Date: 2005-10-04 18:11+0100\n" -"Last-Translator: César Gómez Martín <cesar.go...@gmail.com>\n" -"Language-Team: Debian l10n spanish <debian-l10n-span...@lists.debian.org>\n" +"Project-Id-Version: argus 1:2.0.6.fixes.1-16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" +"PO-Revision-Date: 2009-09-13 15:01+0100\n" +"Last-Translator: Francisco Javier Cuadrado <fcocuadr...@gmail.com>\n" +"Language-Team: Debian l10n Spanish <debian-l10n-span...@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Spanish\n" -"X-Poedit-Country: SPAIN\n" -"X-Poedit-SourceCharset: utf-8\n" #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "al arrancar, al conectarse, ambas, nunca" +msgid "boot" +msgstr "al arrancar" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "al conectarse" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "ambas" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "nunca" #. Type: select #. Description #: ../templates:1002 msgid "Startup behaviour:" -msgstr "" +msgstr "Opciones para el arranque:" #. Type: select #. Description @@ -59,14 +78,14 @@ "start argus." msgstr "" "Argus se puede iniciar en el arranque del sistema, al inicializar una " -"conexión PPP, en ambas ocasiones, o nunca. Si elige esta ultima opción " -"entonces el usuario deberá arrancar argus manualmente." +"conexión PPP, en ambas ocasiones o nunca, teniendo que intervenir el usuario " +"para iniciar argus en esta última opción." #. Type: boolean #. Description #: ../templates:2001 msgid "Should /etc/default/argus-server be overwritten?" -msgstr "¿Debería sobre-escribirse /etc/default/argus-server?" +msgstr "¿Se debería sobrescribir el archivo «/etc/default/argus-server»?" #. Type: boolean #. Description @@ -75,9 +94,12 @@ "If you select this option, the installation script will always overwrite /" "etc/default/argus-server. Otherwise, you will manage that file yourself." msgstr "" -"El guión de instalación siempre sobreescribirá /etc/default/argus-server si " -"selecciona esta opción. Si no la selecciona, entonces usted mismo gestionará " -"ese fichero." +"El script de instalación siempre sobrescribirá el archivo «/etc/default/argus-" +"server» si selecciona esta opción. Si no la selecciona, entonces usted mismo " +"gestionará ese archivo." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "al arrancar, al conectarse, ambas, nunca" #~ msgid "How should argus be started?" #~ msgstr "¿Cuando debe iniciarse argus?" diff -Nru argus-2.0.6.fixes.1.old/debian/po/eu.po argus-2.0.6.fixes.1/debian/po/eu.po --- argus-2.0.6.fixes.1.old/debian/po/eu.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/eu.po 2009-12-20 18:14:13.000000000 +0100 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: argus-eu\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-06-14 00:40+0200\n" "Last-Translator: Xabier Bilbao <xab...@gmail.com>\n" "Language-Team: Basque <debian-l10n-bas...@lists.debian.org>\n" @@ -19,8 +19,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "sistema abiatzean, konexioan, bietan, batean ere ez" +msgid "boot" +msgstr "sistema abiatzean" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "konexioan" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "bietan" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "batean ere ez" #. Type: select #. Description @@ -55,3 +73,6 @@ msgstr "" "Aukera hau hautatzen baduzu, instalazio script-ak beti gainidatziko du /etc/" "default/argus-server. Bestela zuk kudeatu beharko duzu fitxategi hori." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "sistema abiatzean, konexioan, bietan, batean ere ez" diff -Nru argus-2.0.6.fixes.1.old/debian/po/fr.po argus-2.0.6.fixes.1/debian/po/fr.po --- argus-2.0.6.fixes.1.old/debian/po/fr.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/fr.po 2009-12-20 18:14:13.000000000 +0100 @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2006-11-10 05:54+0100\n" "Last-Translator: Christian Perrier <bubu...@debian.org>\n" "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n" @@ -29,10 +29,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "" -"Au dmarrage, la connexion PPP, Au dmarrage et la connexion PPP, Pas de " -"lancement" +msgid "boot" +msgstr "Au dmarrage" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr " la connexion PPP" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "Au dmarrage et la connexion PPP" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "Pas de lancement" #. Type: select #. Description @@ -68,3 +84,8 @@ "Si vous choisissez cette option, le script d'installation rcrira " "systmatiquement ce fichier. Dans le cas contraire, vous devrez le grer " "vous-mme." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "" +#~ "Au dmarrage, la connexion PPP, Au dmarrage et la connexion PPP, Pas " +#~ "de lancement" diff -Nru argus-2.0.6.fixes.1.old/debian/po/gl.po argus-2.0.6.fixes.1/debian/po/gl.po --- argus-2.0.6.fixes.1.old/debian/po/gl.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/gl.po 2009-12-20 18:14:13.000000000 +0100 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: argus\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-06-12 22:16+0100\n" "Last-Translator: Jacobo Tarrio <jtar...@debian.org>\n" "Language-Team: Galician <proxe...@trasno.net>\n" @@ -17,8 +17,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "arrincar, conexión, ambos, ningún" +msgid "boot" +msgstr "arrincar" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "conexión" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "ambos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "ningún" #. Type: select #. Description @@ -53,3 +71,6 @@ msgstr "" "Se escolle esta opción, o script de instalación sempre ha sobrescribir /etc/" "default/argus-server. Se non, pode xestionar vostede mesmo o ficheiro." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "arrincar, conexión, ambos, ningún" diff -Nru argus-2.0.6.fixes.1.old/debian/po/it.po argus-2.0.6.fixes.1/debian/po/it.po --- argus-2.0.6.fixes.1.old/debian/po/it.po 1970-01-01 01:00:00.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/it.po 2009-12-20 18:14:14.000000000 +0100 @@ -0,0 +1,79 @@ +# ITALIAN TRANSLATION OF ARGUS'.PO-DEBCONF FILE +# Copyright (C) 2006 THE ARGUS' COPYRIGHT HOLDER +# This file is distributed under the same license as the argus package. +# Vincenzo Campanella <vin...@gmail.com>, 2008. +# +# +msgid "" +msgstr "" +"Project-Id-Version: ARGUS\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" +"PO-Revision-Date: 2008-10-18 11:05+0200\n" +"Last-Translator: Vincenzo Campanella <vin...@gmail.com>\n" +"Language-Team: Italian <t...@lists.linux.it>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "boot" +msgstr "avvio di sistema" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "connessione" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "entrambi i casi" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "nessuno" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Startup behaviour:" +msgstr "Comportamento all'avvio:" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "" +"It is possible to start argus at boot time, upon initiating a PPP " +"connection, both, or never, which requires user intervention in order to " +"start argus." +msgstr "" +"Si può avviare argus all'avvio del sistema, al momento di iniziare una " +"connessione PPP, in entrambi i casi, o mai, ciò che richiede l'intervento " +"dell'utente per avviare argus." + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Should /etc/default/argus-server be overwritten?" +msgstr "Sovrascrivere \"/etc/default/argus-server\"?" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"If you select this option, the installation script will always overwrite /" +"etc/default/argus-server. Otherwise, you will manage that file yourself." +msgstr "" +"Se si seleziona questa opzione, lo script di installazione sovrascriverà " +"sempre \"/etc/default/argus-server\". In caso contrario, si dovrà gestire " +"questo file da sé." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "avvio di sistema, connessione, entrambi i casi, nessuno" diff -Nru argus-2.0.6.fixes.1.old/debian/po/ja.po argus-2.0.6.fixes.1/debian/po/ja.po --- argus-2.0.6.fixes.1.old/debian/po/ja.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/ja.po 2009-12-20 18:14:14.000000000 +0100 @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: argus 1:2.0.6.fixes.1-14\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-01-30 21:26+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) <henr...@debian.or.jp>\n" "Language-Team: Japanese <debian-japan...@lists.debian.org>\n" @@ -27,8 +27,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "システム起動の際, PPP接続の際, 両方, 起動させない" +msgid "boot" +msgstr "システム起動の際" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "PPP接続の際" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "両方" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "起動させない" #. Type: select #. Description @@ -65,3 +83,6 @@ msgstr "" "このオプションを選んだ場合、インストールスクリプトは /etc/default/argus-" "server を常に上書きします。それ以外の場合はファイルを手動で変更します。" + +#~ msgid "boot, dialup, both, none" +#~ msgstr "システム起動の際, PPP接続の際, 両方, 起動させない" diff -Nru argus-2.0.6.fixes.1.old/debian/po/nl.po argus-2.0.6.fixes.1/debian/po/nl.po --- argus-2.0.6.fixes.1.old/debian/po/nl.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/nl.po 2009-12-20 18:14:14.000000000 +0100 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: argus 2.0.6.rc2-1\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2004-04-01 14:57+0100\n" "Last-Translator: Luk Claes <luk.cl...@ugent.be>\n" "Language-Team: Debian l10n Dutch <debian-l10n-du...@lists.debian.org>\n" @@ -26,8 +26,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "opstarten, inbellen, beide, niet" +msgid "boot" +msgstr "opstarten" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "inbellen" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "beide" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "niet" #. Type: select #. Description @@ -63,5 +81,8 @@ "Als u deze optie selecteert, dan zal het installatiescript altijd /etc/" "default/argus-server overschrijven. Anders zult u dit bestand zelf beheren." +#~ msgid "boot, dialup, both, none" +#~ msgstr "opstarten, inbellen, beide, niet" + #~ msgid "How should argus be started?" #~ msgstr "Hoe moet argus gestart worden?" diff -Nru argus-2.0.6.fixes.1.old/debian/po/pt.po argus-2.0.6.fixes.1/debian/po/pt.po --- argus-2.0.6.fixes.1.old/debian/po/pt.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/pt.po 2009-12-20 18:14:14.000000000 +0100 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: argus 1:2.0.6.fixes.1-14\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2007-09-23 08:31+0100\n" "Last-Translator: Américo Monteiro <a_monte...@netcabo.pt>\n" "Language-Team: Portuguese <tra...@debianpt.org>\n" @@ -21,8 +21,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "arranque, dialup, ambos, nenhum" +msgid "boot" +msgstr "arranque" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "dialup" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "ambos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "nenhum" #. Type: select #. Description @@ -57,3 +75,6 @@ msgstr "" "Se seleccionar esta opção o script de instalação vai sempre reescrever o /" "etc/default/argus-server. Caso contrário esse ficheiro será gerido por si." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "arranque, dialup, ambos, nenhum" diff -Nru argus-2.0.6.fixes.1.old/debian/po/pt_BR.po argus-2.0.6.fixes.1/debian/po/pt_BR.po --- argus-2.0.6.fixes.1.old/debian/po/pt_BR.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/pt_BR.po 2009-12-20 18:14:14.000000000 +0100 @@ -8,11 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: argus_2.0.6.beta.13-2\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-10-03 02:06-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <f...@debian.org>\n" -"Language-Team: Brazilian Portuguese <debian-l10n-portugu...@lists.debian.org>\n" +"Language-Team: Brazilian Portuguese <debian-l10n-portugu...@lists.debian." +"org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,8 +21,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "inicialização, discagem, ambos, nenhuma" +msgid "boot" +msgstr "inicialização" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "discagem" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "ambos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "nenhuma" #. Type: select #. Description @@ -54,6 +73,9 @@ "If you select this option, the installation script will always overwrite /" "etc/default/argus-server. Otherwise, you will manage that file yourself." msgstr "" -"Se você selecionar esta opção, o script de instalação sempre sobrescreverá " -"o arquivo /etc/default/argus-server. Caso contrário, você mesmo gerenciará " +"Se você selecionar esta opção, o script de instalação sempre sobrescreverá o " +"arquivo /etc/default/argus-server. Caso contrário, você mesmo gerenciará " "esse arquivo." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "inicialização, discagem, ambos, nenhuma" diff -Nru argus-2.0.6.fixes.1.old/debian/po/ru.po argus-2.0.6.fixes.1/debian/po/ru.po --- argus-2.0.6.fixes.1.old/debian/po/ru.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/ru.po 2009-12-20 18:14:14.000000000 +0100 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: argus 1:2.0.6.fixes.1-14\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-06-07 21:21+0400\n" "Last-Translator: Yuri Kozlov <kozlo...@gmail.com>\n" "Language-Team: Russian <debian-l10n-russ...@lists.debian.org>\n" @@ -21,8 +21,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "при включении, по звонку, в обоих случаях, вручную" +msgid "boot" +msgstr "при включении" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "по звонку" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "в обоих случаях" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "вручную" #. Type: select #. Description @@ -58,3 +76,6 @@ "Если вы ответите утвердительно, то сценарий установки будет всегда " "перезаписывать /etc/default/argus-server. Иначе, вам придётся управлять этим " "файлом самостоятельно." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "при включении, по звонку, в обоих случаях, вручную" diff -Nru argus-2.0.6.fixes.1.old/debian/po/sv.po argus-2.0.6.fixes.1/debian/po/sv.po --- argus-2.0.6.fixes.1.old/debian/po/sv.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/sv.po 2009-12-20 18:14:14.000000000 +0100 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: argus 1:2.0.6.fixes.1-8\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-07-22 13:49+0100\n" "Last-Translator: Martin Bagge <brot...@bsnet.se>\n" "Language-Team: Swedish <s...@li.org>\n" @@ -25,8 +25,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "uppstart, fjrranslutning, bda, ingen" +msgid "boot" +msgstr "uppstart" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "fjrranslutning" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "bda" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "ingen" #. Type: select #. Description @@ -37,8 +55,14 @@ #. Type: select #. Description #: ../templates:1002 -msgid "It is possible to start argus at boot time, upon initiating a PPP connection, both, or never, which requires user intervention in order to start argus." -msgstr "Det r mjligt att starta argus vid uppstart, nr en PPP-frbindelse kopplas upp, bda fregende eller inte alls. Vljer du 'ingen' mste du manuellt starta argus fr att anvnda den." +msgid "" +"It is possible to start argus at boot time, upon initiating a PPP " +"connection, both, or never, which requires user intervention in order to " +"start argus." +msgstr "" +"Det r mjligt att starta argus vid uppstart, nr en PPP-frbindelse kopplas " +"upp, bda fregende eller inte alls. Vljer du 'ingen' mste du manuellt " +"starta argus fr att anvnda den." #. Type: boolean #. Description @@ -49,9 +73,16 @@ #. Type: boolean #. Description #: ../templates:2001 -msgid "If you select this option, the installation script will always overwrite /etc/default/argus-server. Otherwise, you will manage that file yourself." -msgstr "Om du vljer denna instllning kommer installationsskriptet alltid att skriva ver /etc/default/argus-server. Om inte fr du hantera den filen p egen hand." +msgid "" +"If you select this option, the installation script will always overwrite /" +"etc/default/argus-server. Otherwise, you will manage that file yourself." +msgstr "" +"Om du vljer denna instllning kommer installationsskriptet alltid att " +"skriva ver /etc/default/argus-server. Om inte fr du hantera den filen p " +"egen hand." + +#~ msgid "boot, dialup, both, none" +#~ msgstr "uppstart, fjrranslutning, bda, ingen" #~ msgid "How should argus be started?" #~ msgstr "Hur ska argus startas?" - diff -Nru argus-2.0.6.fixes.1.old/debian/po/templates.pot argus-2.0.6.fixes.1/debian/po/templates.pot --- argus-2.0.6.fixes.1.old/debian/po/templates.pot 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/templates.pot 2009-12-20 18:14:15.000000000 +0100 @@ -1,14 +1,22 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <em...@address>, YEAR. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -19,7 +27,25 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" +msgid "boot" +msgstr "" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" msgstr "" #. Type: select diff -Nru argus-2.0.6.fixes.1.old/debian/po/vi.po argus-2.0.6.fixes.1/debian/po/vi.po --- argus-2.0.6.fixes.1.old/debian/po/vi.po 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/vi.po 2009-12-20 18:14:15.000000000 +0100 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: argus 1:2.0.6.fixes.1-14.1\n" -"Report-Msgid-Bugs-To: apoll...@debian.org\n" -"POT-Creation-Date: 2006-11-07 20:48-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" "PO-Revision-Date: 2008-06-12 21:47+0930\n" "Last-Translator: Clytie Siddall <cly...@riverland.net.au>\n" "Language-Team: Vietnamese <vi...@googlegroups.com>\n" @@ -19,8 +19,26 @@ #. Type: select #. Choices #: ../templates:1001 -msgid "boot, dialup, both, none" -msgstr "khởi động, quay số, cả hai, không có" +msgid "boot" +msgstr "khởi động" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "quay số" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "cả hai" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "không có" #. Type: select #. Description @@ -56,5 +74,8 @@ "Bật tùy chọn này thì văn lệnh cài đặt sẽ lúc nào cũng ghi đè lên tập tin « /" "etc/default/argus-server ». Không thì bạn tự quản lý tập tin đó." +#~ msgid "boot, dialup, both, none" +#~ msgstr "khởi động, quay số, cả hai, không có" + #~ msgid "How should argus be started?" #~ msgstr "Bạn có muốn khởi chạy trình argus như thế nào?" diff -Nru argus-2.0.6.fixes.1.old/debian/po/zh_CN.po argus-2.0.6.fixes.1/debian/po/zh_CN.po --- argus-2.0.6.fixes.1.old/debian/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/po/zh_CN.po 2009-12-20 18:14:15.000000000 +0100 @@ -0,0 +1,77 @@ +# Chinese translations for PACKAGE package +# PACKAGE 软件包的简体中文翻译. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Ji ZhengYu <zhengy...@gmail.com>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: argus 2.0.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 18:14+0100\n" +"PO-Revision-Date: 2009-12-16 00:12+0800\n" +"Last-Translator: Ji ZhengYu <zhengy...@gmail.com>\n" +"Language-Team: Chinese (simplified) <i18n...@googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "boot" +msgstr "开机启动" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "dialup" +msgstr "拨号" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "both" +msgstr "启动并拨号" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "none" +msgstr "什么都不做" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Startup behaviour:" +msgstr "启动方式：" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "" +"It is possible to start argus at boot time, upon initiating a PPP " +"connection, both, or never, which requires user intervention in order to " +"start argus." +msgstr "" +"可以在开机时启动 argus，紧接着启用 PPP 连接。取决于用户的选择，您可以选择开机" +"启动并拨号或是两者都不选。" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Should /etc/default/argus-server be overwritten?" +msgstr "是否覆盖/etc/default/argus-server？" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"If you select this option, the installation script will always overwrite /" +"etc/default/argus-server. Otherwise, you will manage that file yourself." +msgstr "" +"如果您选择此选项，安装脚本会覆盖/etc/default/argus-server。否则，您需要自己操" +"作此文件。" + +#~ msgid "boot, dialup, both, none" +#~ msgstr "开机启动, 拨号, 启动并拨号, 什么都不做" diff -Nru argus-2.0.6.fixes.1.old/debian/templates argus-2.0.6.fixes.1/debian/templates --- argus-2.0.6.fixes.1.old/debian/templates 2009-11-29 19:30:16.000000000 +0100 +++ argus-2.0.6.fixes.1/debian/templates 2009-12-20 18:14:09.000000000 +0100 @@ -1,6 +1,6 @@ Template: argus/startup Type: select -_Choices: boot, dialup, both, none +__Choices: boot, dialup, both, none Default: boot _Description: Startup behaviour: It is possible to start argus at boot time, upon initiating a PPP
signature.asc
Description: Digital signature
