Dear maintainer of netams, On Friday, February 10, 2012 I sent you a notice announcing my intent to upload an NMU of your package to fix its pending l10n issues, after an initial notice sent on Sunday, February 05, 2012.
You either agreed for this NMU or did not respond to my notices.
I will now upload this NMU to DELAYED/7-DAY.
The NMU patch is attached to this mail.
The NMU changelog is:
Source: netams
Version: 3.4.5-2.1
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <bubu...@debian.org>
Date: Sun, 19 Feb 2012 07:29:37 +0100
Closes: 598252 634742 652159 659373 659699
Changes:
netams (3.4.5-2.1) unstable; urgency=low
.
* Non-maintainer upload.
* Fix FTBFS by removing hardcoded paths with a call to pkg-config.
Thanks to Peter Green for the patch. Closes: #652159
* No longer hardcode kfreebsd flavous in exclusions. Use "linux-any"
instead. Thanks to Robert Millan for the patch. Closes: #634742
* Fix pending l10n issues. Debconf translations:
- Danish (Joe Hansen). Closes: #598252
- Polish (Michał Kułach). Closes: #659373
- Dutch; (Jeroen Schot). Closes: #659699
--
diff -Nru netams-3.4.5.old/debian/Rules.make netams-3.4.5/debian/Rules.make --- netams-3.4.5.old/debian/Rules.make 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/Rules.make 2012-02-05 16:09:12.955283722 +0100 @@ -30,7 +30,7 @@ #DEFINE += -DUSE_HASH DEFINE += -DUSE_MYSQL -I/usr/include/mysql LIB += -lmysqlclient -L/usr/lib -DEFINE += -DWIPE_OPENSSL -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +DEFINE += -DWIPE_OPENSSL $(shell pkg-config --cflags glib-2.0) LIB += -lglib-2.0 -L/usr/lib DEFINE += -DHAVE_BILLING SRC += billing.c s_billing.c diff -Nru netams-3.4.5.old/debian/changelog netams-3.4.5/debian/changelog --- netams-3.4.5.old/debian/changelog 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/changelog 2012-02-19 07:29:47.918801708 +0100 @@ -1,3 +1,17 @@ +netams (3.4.5-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS by removing hardcoded paths with a call to pkg-config. + Thanks to Peter Green for the patch. Closes: #652159 + * No longer hardcode kfreebsd flavous in exclusions. Use "linux-any" + instead. Thanks to Robert Millan for the patch. Closes: #634742 + * Fix pending l10n issues. Debconf translations: + - Danish (Joe Hansen). Closes: #598252 + - Polish (Michał Kułach). Closes: #659373 + - Dutch; (Jeroen Schot). Closes: #659699 + + -- Christian Perrier <bubu...@debian.org> Sun, 19 Feb 2012 07:29:37 +0100 + netams (3.4.5-2) unstable; urgency=low * debian/Rules.make: Add -lcrypto to fix FTBFS with binutils-gold. diff -Nru netams-3.4.5.old/debian/control netams-3.4.5/debian/control --- netams-3.4.5.old/debian/control 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/control 2012-02-05 16:12:20.459759736 +0100 @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Alexander GQ Gerasiov <g...@debian.org> -Build-Depends: debhelper (>= 7.0.0), libmysqlclient-dev, libnetfilter-queue-dev [!kfreebsd-i386 !kfreebsd-amd64], libnetgraph-dev [kfreebsd-i386 kfreebsd-amd64], libpcap0.8-dev, cdbs, po-debconf, libglib2.0-dev +Build-Depends: debhelper (>= 7.0.0), libmysqlclient-dev, libnetfilter-queue-dev [linux-any], libnetgraph-dev [kfreebsd-any], libpcap0.8-dev, cdbs, po-debconf, libglib2.0-dev Standards-Version: 3.9.0 Homepage: http://www.netams.com Vcs-Git: git://git.gq.net.ru/netams.git diff -Nru netams-3.4.5.old/debian/po/cs.po netams-3.4.5/debian/po/cs.po --- netams-3.4.5.old/debian/po/cs.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/cs.po 2012-02-10 08:53:49.634091547 +0100 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: netams 3.4.3+dfsg1-4\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-17 16:37+0100\n" "Last-Translator: Michal Simunek <michal.simu...@gmail.com>\n" "Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru netams-3.4.5.old/debian/po/da.po netams-3.4.5/debian/po/da.po --- netams-3.4.5.old/debian/po/da.po 1970-01-01 01:00:00.000000000 +0100 +++ netams-3.4.5/debian/po/da.po 2012-02-05 16:08:06.000000000 +0100 @@ -0,0 +1,92 @@ +# Danish translation netams. +# Copyright (C) 2010 netams & nedenstående oversættere. +# This file is distributed under the same license as the netams package. +# Joe Hansen <joedalt...@yahoo.dk>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: netams\n" +"Report-Msgid-Bugs-To: net...@packages.debian.org\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" +"PO-Revision-Date: 2010-09-27 17:30+01:00\n" +"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n" +"Language-Team: Danish <debian-l10n-dan...@lists.debian.org> \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../netams.templates:2001 ../netams-web.templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Internetservere at rekonfigurere automatisk:" + +#. Type: multiselect +#. Description +#: ../netams.templates:2001 +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS statistics." +msgstr "" +"Vælg venligst internetserveren som skal konfigureres automatisk for NeTAMS-" +"statistik." + +#. Type: password +#. Description +#: ../netams.templates:3001 +msgid "NeTAMS administrator password:" +msgstr "Administratoradgangskode til NeTAMS:" + +#. Type: password +#. Description +#: ../netams.templates:3001 +msgid "Please specify a password for the \"admin\" user of NeTAMS." +msgstr "Angiv venligst en adgangskode for brugeren »admin« i NeTAMS." + +#. Type: password +#. Description +#: ../netams.templates:4001 +msgid "NeTAMS administrator password confirmation:" +msgstr "Bekræftelse af administratoradgangskode for NeTAMS:" + +#. Type: error +#. Description +#: ../netams.templates:5001 +msgid "Password mismatch" +msgstr "Forskellige adgangskoder" + +#. Type: error +#. Description +#: ../netams.templates:5001 +msgid "" +"The two passwords you entered were not the same. Please enter a password " +"again." +msgstr "" +"De to adgangskoder du indtastede var ikke ens. Indtast venligst en " +"adgangskode igen." + +#. Type: error +#. Description +#: ../netams.templates:6001 +msgid "Empty password" +msgstr "Tom adgangskode" + +#. Type: error +#. Description +#: ../netams.templates:6001 +msgid "" +"You entered an empty password, which is not allowed. Please choose a non- " +"empty password." +msgstr "" +"Du indtastede en tom adgangskode, hvilket ikke er tilladt. Vælg venligst en " +"adgangskode." + +#. Type: multiselect +#. Description +#: ../netams-web.templates:2001 +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS." +msgstr "" +"Vælg venligst internetserveren som skal konfigureres automatisk for NeTAMS." diff -Nru netams-3.4.5.old/debian/po/de.po netams-3.4.5/debian/po/de.po --- netams-3.4.5.old/debian/po/de.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/de.po 2012-02-10 08:53:49.642091794 +0100 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: netams 3.4.3\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-21 01:26+0100\n" "Last-Translator: Thomas Mueller <thomas.muel...@tmit.eu>\n" "Language-Team: German <debian-l10n-ger...@lists.debian.org>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -91,4 +92,3 @@ msgstr "" "Bitte wählen Sie den Webserver aus, der für NeTAMS automatisch neu " "konfiguriert werden soll." - diff -Nru netams-3.4.5.old/debian/po/es.po netams-3.4.5/debian/po/es.po --- netams-3.4.5.old/debian/po/es.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/es.po 2012-02-10 08:53:49.646091896 +0100 @@ -28,26 +28,30 @@ msgstr "" "Project-Id-Version: netams 3.4.3+dfsg1-4\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-18 09:05+0100\n" "Last-Translator: Francisco Javier Cuadrado <fcocuadr...@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-span...@lists.debian.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect #. Description -#: ../netams.templates:2001 -#: ../netams-web.templates:2001 +#: ../netams.templates:2001 ../netams-web.templates:2001 msgid "Web server to reconfigure automatically:" msgstr "Servidor web a reconfigurar automáticamente:" #. Type: multiselect #. Description #: ../netams.templates:2001 -msgid "Please choose the web server that should be automatically configured for NeTAMS statistics." -msgstr "Escoja el servidor web que se debería configurar automáticamente para las estadísticas de NeTAMS." +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS statistics." +msgstr "" +"Escoja el servidor web que se debería configurar automáticamente para las " +"estadísticas de NeTAMS." #. Type: password #. Description @@ -76,8 +80,12 @@ #. Type: error #. Description #: ../netams.templates:5001 -msgid "The two passwords you entered were not the same. Please enter a password again." -msgstr "Las dos contraseñas que ha introducido no son iguales. Por favor, introduzca la contraseña de nuevo." +msgid "" +"The two passwords you entered were not the same. Please enter a password " +"again." +msgstr "" +"Las dos contraseñas que ha introducido no son iguales. Por favor, introduzca " +"la contraseña de nuevo." #. Type: error #. Description @@ -88,12 +96,18 @@ #. Type: error #. Description #: ../netams.templates:6001 -msgid "You entered an empty password, which is not allowed. Please choose a non- empty password." -msgstr "No está permitido introducir una contraseña vacía. Por favor, introduzca una contraseña no vacía." +msgid "" +"You entered an empty password, which is not allowed. Please choose a non- " +"empty password." +msgstr "" +"No está permitido introducir una contraseña vacía. Por favor, introduzca una " +"contraseña no vacía." #. Type: multiselect #. Description #: ../netams-web.templates:2001 -msgid "Please choose the web server that should be automatically configured for NeTAMS." -msgstr "Escoja el servidor que se debería configurar automáticamente para NeTAMS." - +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS." +msgstr "" +"Escoja el servidor que se debería configurar automáticamente para NeTAMS." diff -Nru netams-3.4.5.old/debian/po/fr.po netams-3.4.5/debian/po/fr.po --- netams-3.4.5.old/debian/po/fr.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/fr.po 2012-02-10 08:53:49.650091999 +0100 @@ -9,10 +9,11 @@ msgstr "" "Project-Id-Version: Netams\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-17 17:34+0100\n" "Last-Translator: Julien Patriarca <patriar...@gmail.com>\n" "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru netams-3.4.5.old/debian/po/it.po netams-3.4.5/debian/po/it.po --- netams-3.4.5.old/debian/po/it.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/it.po 2012-02-10 08:53:49.658092241 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: netams 3.4.3+dfsg1-4\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-17 08:40+0100\n" "Last-Translator: Vincenzo Campanella <vin...@gmail.com>\n" "Language-Team: Italian <t...@lists.linux.it>\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -63,8 +64,7 @@ "The two passwords you entered were not the same. Please enter a password " "again." msgstr "" -"Le due password inserite non sono uguali. Inserire nuovamente una " -"password." +"Le due password inserite non sono uguali. Inserire nuovamente una password." #. Type: error #. Description diff -Nru netams-3.4.5.old/debian/po/nl.po netams-3.4.5/debian/po/nl.po --- netams-3.4.5.old/debian/po/nl.po 1970-01-01 01:00:00.000000000 +0100 +++ netams-3.4.5/debian/po/nl.po 2012-02-13 14:21:38.000000000 +0100 @@ -0,0 +1,91 @@ +# Dutch translation of netams debconf templates. +# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the netams package. +# Jeroen Schot <sc...@a-eskwadraat.nl>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: netams 3.4.5-2\n" +"Report-Msgid-Bugs-To: net...@packages.debian.org\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" +"PO-Revision-Date: 2012-02-10 11:47+0100\n" +"Last-Translator: Jeroen Schot <sc...@a-eskwadraat.nl>\n" +"Language-Team: Debian l10n Dutch <debian-l10n-du...@lists.debian.org>\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../netams.templates:2001 ../netams-web.templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Automatisch te configureren webserver:" + +#. Type: multiselect +#. Description +#: ../netams.templates:2001 +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS statistics." +msgstr "" +"Welke webserver moet automatisch worden geconfigureerd voor de NeTAMS-" +"statistieken?" + +#. Type: password +#. Description +#: ../netams.templates:3001 +msgid "NeTAMS administrator password:" +msgstr "Wachtwoord voor de NeTAMS-beheerder:" + +#. Type: password +#. Description +#: ../netams.templates:3001 +msgid "Please specify a password for the \"admin\" user of NeTAMS." +msgstr "Geef een wachtwoord op voor de \"admin\"-gebruiker van NeTAMS." + +#. Type: password +#. Description +#: ../netams.templates:4001 +msgid "NeTAMS administrator password confirmation:" +msgstr "Wachtwoord voor de NeTAMS-beheerder (nogmaals ter bevestiging):" + +#. Type: error +#. Description +#: ../netams.templates:5001 +msgid "Password mismatch" +msgstr "Wachtwoorden komen niet overeen" + +#. Type: error +#. Description +#: ../netams.templates:5001 +msgid "" +"The two passwords you entered were not the same. Please enter a password " +"again." +msgstr "" +"De twee wachtwoorden die u heeft ingevoerd waren niet gelijk. Voer " +"alstublieft nogmaals een wachtwoord in." + +#. Type: error +#. Description +#: ../netams.templates:6001 +msgid "Empty password" +msgstr "Leeg wachtwoord" + +#. Type: error +#. Description +#: ../netams.templates:6001 +msgid "" +"You entered an empty password, which is not allowed. Please choose a non- " +"empty password." +msgstr "" +"U heeft een leeg wachtwoord ingevoerd, dit is niet toegestaan. U dient een " +"niet-leeg wachtwoord te kiezen." + +#. Type: multiselect +#. Description +#: ../netams-web.templates:2001 +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS." +msgstr "Welke webserver moet automatisch worden geconfigureerd voor NeTAMS?" diff -Nru netams-3.4.5.old/debian/po/pl.po netams-3.4.5/debian/po/pl.po --- netams-3.4.5.old/debian/po/pl.po 1970-01-01 01:00:00.000000000 +0100 +++ netams-3.4.5/debian/po/pl.po 2012-02-10 19:12:35.000000000 +0100 @@ -0,0 +1,95 @@ +# Translation of netams debconf templates to Polish. +# Copyright (C) 2010 +# This file is distributed under the same license as the netams package. +# +# Michał Kułach <michal.kul...@gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: net...@packages.debian.org\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" +"PO-Revision-Date: 2012-02-10 16:34+0100\n" +"Last-Translator: Michał Kułach <michal.kul...@gmail.com>\n" +"Language-Team: Polish <debian-l10n-pol...@lists.debian.org>\n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#. Type: multiselect +#. Description +#: ../netams.templates:2001 ../netams-web.templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Serwer WWW do automatycznej konfiguracji:" + +#. Type: multiselect +#. Description +#: ../netams.templates:2001 +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS statistics." +msgstr "" +"Proszę wybrać serwer WWW, który powinien być automatycznie skonfigurowany w " +"związku ze statystykami NeTAMS." + +#. Type: password +#. Description +#: ../netams.templates:3001 +msgid "NeTAMS administrator password:" +msgstr "Hasło administratora NeTAMS:" + +#. Type: password +#. Description +#: ../netams.templates:3001 +msgid "Please specify a password for the \"admin\" user of NeTAMS." +msgstr "Proszę podać hasło użytkownika \"admin\" NeTAMS." + +#. Type: password +#. Description +#: ../netams.templates:4001 +msgid "NeTAMS administrator password confirmation:" +msgstr "Potwierdzenie hasła administratora NeTAMS:" + +#. Type: error +#. Description +#: ../netams.templates:5001 +msgid "Password mismatch" +msgstr "Hasła nie pasują" + +#. Type: error +#. Description +#: ../netams.templates:5001 +msgid "" +"The two passwords you entered were not the same. Please enter a password " +"again." +msgstr "" +"Dwa hasła, które zostały wprowadzone, nie są identyczne. Proszę wprowadzić " +"hasło ponownie." + +#. Type: error +#. Description +#: ../netams.templates:6001 +msgid "Empty password" +msgstr "Puste hasło" + +#. Type: error +#. Description +#: ../netams.templates:6001 +msgid "" +"You entered an empty password, which is not allowed. Please choose a non- " +"empty password." +msgstr "" +"Wprowadzono puste hasło, co nie jest dozwolone. Proszę wpisać niepuste hasło." + +#. Type: multiselect +#. Description +#: ../netams-web.templates:2001 +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS." +msgstr "" +"Proszę wybrać serwer WWW, który powinien być automatycznie skonfigurowany w " +"związku z NeTAMS." diff -Nru netams-3.4.5.old/debian/po/pt.po netams-3.4.5/debian/po/pt.po --- netams-3.4.5.old/debian/po/pt.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/pt.po 2012-02-10 08:53:49.662092340 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: netams\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-02-01 22:44+0000\n" "Last-Translator: Miguel Figueiredo <el...@debianpt.org>\n" "Language-Team: Portuguese <tra...@debianpt.org>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,9 +25,6 @@ #. Type: multiselect #. Description #: ../netams.templates:2001 -#| msgid "" -#| "Please choose the web server that should be automatically configured to " -#| "show NeTAMS statistics." msgid "" "Please choose the web server that should be automatically configured for " "NeTAMS statistics." @@ -43,14 +41,13 @@ #. Type: password #. Description #: ../netams.templates:3001 -#| msgid "Please enter password for \"admin\" user in NeTAMS database." msgid "Please specify a password for the \"admin\" user of NeTAMS." -msgstr "Por favor introduza uma palavra-passe para o utilizador \"admin\" de NeTAMS." +msgstr "" +"Por favor introduza uma palavra-passe para o utilizador \"admin\" de NeTAMS." #. Type: password #. Description #: ../netams.templates:4001 -#| msgid "NeTAMS administrator password:" msgid "NeTAMS administrator password confirmation:" msgstr "Confirmação da palavra-passe do administrador de NeTAMS:" @@ -63,7 +60,6 @@ #. Type: error #. Description #: ../netams.templates:5001 -#| msgid "The two passwords you entered were not the same. Please try again." msgid "" "The two passwords you entered were not the same. Please enter a password " "again." @@ -90,9 +86,6 @@ #. Type: multiselect #. Description #: ../netams-web.templates:2001 -#| msgid "" -#| "Please choose the web server that should be automatically configured to " -#| "show NeTAMS statistics." msgid "" "Please choose the web server that should be automatically configured for " "NeTAMS." diff -Nru netams-3.4.5.old/debian/po/ru.po netams-3.4.5/debian/po/ru.po --- netams-3.4.5.old/debian/po/ru.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/ru.po 2012-02-10 08:53:49.666092449 +0100 @@ -7,15 +7,17 @@ msgstr "" "Project-Id-Version: netams 3.4.3+dfsg1-4\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-17 11:47+0300\n" "Last-Translator: Yuri Kozlov <yu...@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russ...@lists.debian.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: multiselect #. Description @@ -85,7 +87,4 @@ msgid "" "Please choose the web server that should be automatically configured for " "NeTAMS." -msgstr "" -"Выберите веб-сервер, который нужно автоматически настроить под " -"NeTAMS." - +msgstr "Выберите веб-сервер, который нужно автоматически настроить под NeTAMS." diff -Nru netams-3.4.5.old/debian/po/sv.po netams-3.4.5/debian/po/sv.po --- netams-3.4.5.old/debian/po/sv.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/sv.po 2012-02-10 08:53:49.674092686 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: netams\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-01-18 00:17+0100\n" "Last-Translator: Martin Bagge <brot...@bsnet.se>\n" "Language-Team: Swedish <debian-l10n-swed...@lists.debian.org>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru netams-3.4.5.old/debian/po/vi.po netams-3.4.5/debian/po/vi.po --- netams-3.4.5.old/debian/po/vi.po 2012-02-02 22:22:24.730594858 +0100 +++ netams-3.4.5/debian/po/vi.po 2012-02-10 08:53:49.678092795 +0100 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: netams 3.4.3+dfsg1-4\n" "Report-Msgid-Bugs-To: net...@packages.debian.org\n" -"POT-Creation-Date: 2010-01-17 08:07+0100\n" +"POT-Creation-Date: 2010-02-14 03:26+0300\n" "PO-Revision-Date: 2010-04-01 00:59+0930\n" "Last-Translator: Clytie Siddall <cly...@riverland.net.au>\n" "Language-Team: Vietnamese <vi...@googlegroups.com>\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,15 +19,16 @@ #. Type: multiselect #. Description -#: ../netams.templates:2001 -#: ../netams-web.templates:2001 +#: ../netams.templates:2001 ../netams-web.templates:2001 msgid "Web server to reconfigure automatically:" msgstr "Trình phục vụ Web cần tự động cấu hình lại:" #. Type: multiselect #. Description #: ../netams.templates:2001 -msgid "Please choose the web server that should be automatically configured for NeTAMS statistics." +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS statistics." msgstr "Hãy chọn trình phục vụ Web cần tự động cấu hình cho thống kê NeTAMS." #. Type: password @@ -56,7 +58,9 @@ #. Type: error #. Description #: ../netams.templates:5001 -msgid "The two passwords you entered were not the same. Please enter a password again." +msgid "" +"The two passwords you entered were not the same. Please enter a password " +"again." msgstr "Bạn đã gõ hai mật khẩu không trùng nhau. Hãy gõ lại mật khẩu." #. Type: error @@ -68,12 +72,17 @@ #. Type: error #. Description #: ../netams.templates:6001 -msgid "You entered an empty password, which is not allowed. Please choose a non- empty password." -msgstr "Bạn đã nhập một mật khẩu trống mà không được phép. Hãy chọn một mật khẩu khác trống." +msgid "" +"You entered an empty password, which is not allowed. Please choose a non- " +"empty password." +msgstr "" +"Bạn đã nhập một mật khẩu trống mà không được phép. Hãy chọn một mật khẩu " +"khác trống." #. Type: multiselect #. Description #: ../netams-web.templates:2001 -msgid "Please choose the web server that should be automatically configured for NeTAMS." +msgid "" +"Please choose the web server that should be automatically configured for " +"NeTAMS." msgstr "Hãy chọn trình phục vụ Web nên được tự động cấu hình cho NeTAMS." -
signature.asc
Description: Digital signature
