[Pkg-clamav-devel] [mom at ubuntu.com: Ubuntu clamav 0.96.3+dfsg-1ubuntu3]
Michael Tautschnig
mt at debian.org
Sat Sep 25 09:19:09 UTC 2010
Hi Scott,
Could you elaborate on that change? #1941 does not contain any patches and in
fact states that there is a bug in FreeBSD code, not in clamav!? But probably I
just got something wrong, so could you maybe also state whether this change is
relevant for Debian?
Thanks a lot,
Michael
----- Forwarded message from Ubuntu Merge-o-Matic <mom at ubuntu.com> -----
Date: Thu, 23 Sep 2010 14:05:32 -0000
From: Ubuntu Merge-o-Matic <mom at ubuntu.com>
To: clamav at packages.qa.debian.org
Subject: Ubuntu clamav 0.96.3+dfsg-1ubuntu3
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.8
Date: Wed, 22 Sep 2010 20:09:07 -0400
Source: clamav
Binary: clamav-base clamav-docs clamav-dbg clamav libclamav-dev libclamav6 clamav-daemon clamav-testfiles clamav-freshclam clamav-milter
Architecture: source
Version: 0.96.3+dfsg-1ubuntu3
Distribution: maverick
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Scott Kitterman <scott at kitterman.com>
Description:
clamav - anti-virus utility for Unix - command-line interface
clamav-base - anti-virus utility for Unix - base package
clamav-daemon - anti-virus utility for Unix - scanner daemon
clamav-dbg - debug symbols for ClamAV
clamav-docs - anti-virus utility for Unix - documentation
clamav-freshclam - anti-virus utility for Unix - virus database update utility
clamav-milter - anti-virus utility for Unix - sendmail integration
clamav-testfiles - anti-virus utility for Unix - test files
libclamav-dev - anti-virus utility for Unix - development files
libclamav6 - anti-virus utility for Unix - library
Changes:
clamav (0.96.3+dfsg-1ubuntu3) maverick; urgency=low
.
* Change from upstream to fix clamd/clamd.c to only check RLIMIT_DATA on
FreeBSD since the check is not relevant to Linux (See clamav bug #1941 for
details)
Checksums-Sha1:
e14b5563c74e9522d30ea489fa2906537251f7b8 1643 clamav_0.96.3+dfsg-1ubuntu3.dsc
af968dff8c5ada206c2bdd78df1a4027140095ed 285513 clamav_0.96.3+dfsg-1ubuntu3.diff.gz
Checksums-Sha256:
f4358854936ecdc196f0d82f6a0a00b6e86e3b0b0fef9be169ce9bb18929a006 1643 clamav_0.96.3+dfsg-1ubuntu3.dsc
105348718c2a2ff2ca377f598b764ca6228056681bbe36a1dffa85eea3ec60d8 285513 clamav_0.96.3+dfsg-1ubuntu3.diff.gz
Files:
21c888d4ab101fa41567bd30bda7ee14 1643 utils optional clamav_0.96.3+dfsg-1ubuntu3.dsc
b0e9047a23fdb6da859165e74fe07495 285513 utils optional clamav_0.96.3+dfsg-1ubuntu3.diff.gz
Original-Maintainer: ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>
diff -pruN 0.96.3+dfsg-1ubuntu2/clamd/clamd.c 0.96.3+dfsg-1ubuntu3/clamd/clamd.c
--- 0.96.3+dfsg-1ubuntu2/clamd/clamd.c 2010-08-31 14:06:43.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/clamd/clamd.c 2010-09-23 14:34:47.000000000 +0100
@@ -297,7 +297,7 @@ int main(int argc, char **argv)
logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);
#endif
-#ifdef RLIMIT_DATA
+#if defined(RLIMIT_DATA) && defined(C_BSD)
if (getrlimit(RLIMIT_DATA, &rlim) == 0) {
/* bb #1941.
* On 32-bit FreeBSD if you set ulimit -d to >2GB then mmap() will fail
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/changelog 0.96.3+dfsg-1ubuntu3/debian/changelog
--- 0.96.3+dfsg-1ubuntu2/debian/changelog 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/changelog 2010-09-23 14:34:47.000000000 +0100
@@ -1,3 +1,11 @@
+clamav (0.96.3+dfsg-1ubuntu3) maverick; urgency=low
+
+ * Change from upstream to fix clamd/clamd.c to only check RLIMIT_DATA on
+ FreeBSD since the check is not relevant to Linux (See clamav bug #1941 for
+ details)
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 22 Sep 2010 20:09:07 -0400
+
clamav (0.96.3+dfsg-1ubuntu2) maverick; urgency=low
* debian/usr.bin.freshclam: updated to give read access to
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/cs.po 0.96.3+dfsg-1ubuntu3/debian/po/cs.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/cs.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/cs.po 2010-09-23 14:34:47.000000000 +0100
@@ -19,10 +19,10 @@ msgstr ""
"PO-Revision-Date: 2009-07-04 11:15+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at 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"
+"Language: cs\n"
#. Type: select
#. Choices
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/da.po 0.96.3+dfsg-1ubuntu3/debian/po/da.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/da.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/da.po 2010-09-23 14:34:47.000000000 +0100
@@ -9,10 +9,10 @@ msgstr ""
"PO-Revision-Date: 2005-06-22 12:57+0200\n"
"Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
"Language-Team: Danish <dansk at klid.dk>\n"
-"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/de.po 0.96.3+dfsg-1ubuntu3/debian/po/de.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/de.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/de.po 2010-09-23 14:34:47.000000000 +0100
@@ -15,10 +15,10 @@ msgstr ""
"PO-Revision-Date: 2010-05-02 20:31+0200\n"
"Last-Translator: Thomas M??ller <thomas.mueller at tmit.eu>\n"
"Language-Team: German <debian-l10n-german at 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"
+"Language: de\n"
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -825,8 +825,7 @@ msgstr ""
"Format\n"
" ??unix:Pfad?? (zum Beispiel: unix:/var/run/clamd/clamd.socket)\n"
" - ein lokaler oder in der Ferne befindlicher TCP-Socket im Format\n"
-" ??tcp:Rechner:Port?? (zum Beispiel tcp:192.168.0.1). Der Wert f??r "
-"??Rechner??\n"
+" ??tcp:Rechner:Port?? (zum Beispiel tcp:192.168.0.1). Der Wert f??r ??Rechner??\n"
" kann entweder ein Rechnername oder eine IP-Adresse sein. Der Port ist "
"nur\n"
" f??r IPv6-Adressen notwendig. Anderenfalls ist 3310 die Voreinstellung."
@@ -858,8 +857,8 @@ msgid ""
msgstr ""
"Bitte geben Sie die Rechner in CIDR-Notation (Rechner(name)/Netzmaske) an, "
"f??r die eingehende E-Mail nicht ??berpr??ft werden soll. Mehrfache Eintr??ge "
-"sollten mit Leerzeichen getrennt werden. Die Abk??rzung ??local?? kann "
-"verwendet werden, um lokal erzeugte (nicht SMTP) E-Mail anzugeben."
+"sollten mit Leerzeichen getrennt werden. Die Abk??rzung ??local?? kann verwendet "
+"werden, um lokal erzeugte (nicht SMTP) E-Mail anzugeben."
#. Type: string
#. Description
@@ -1078,9 +1077,9 @@ msgid ""
"headers will be attached to each processed message, possibly replacing "
"existing similar headers."
msgstr ""
-"Falls Sie diese Option w??hlen, werden ??X-Virus-Scanned??- und ??X-Virus-"
-"Status??-Kopfzeilen in jede verarbeitete Nachricht eingef??gt. M??glicherweise "
-"werden dabei vorhandene ??hnliche Kopfzeilen ersetzt."
+"Falls Sie diese Option w??hlen, werden ??X-Virus-Scanned??- und ??X-Virus-Status??-"
+"Kopfzeilen in jede verarbeitete Nachricht eingef??gt. M??glicherweise werden "
+"dabei vorhandene ??hnliche Kopfzeilen ersetzt."
#. Type: string
#. Description
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/es.po 0.96.3+dfsg-1ubuntu3/debian/po/es.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/es.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/es.po 2010-09-23 14:34:47.000000000 +0100
@@ -40,10 +40,10 @@ msgstr ""
"PO-Revision-Date: 2010-05-06 12:39+0200\n"
"Last-Translator: Omar Campagne <>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
-"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.6.0\n"
@@ -358,8 +358,8 @@ msgid ""
"Enter \"any\" to listen on every IP address configured. If you want to "
"listen on a single address or host name, enter it here."
msgstr ""
-"Escriba ??any?? para que escuche en cada direcci??n IP configurada. Si en vez "
-"de eso quiere que escuche en una ??nica direcci??n o nombre de equipo, "
+"Escriba ??any?? para que escuche en cada direcci??n IP configurada. Si en vez de "
+"eso quiere que escuche en una ??nica direcci??n o nombre de equipo, "
"introd??zcala aqu??."
#. Type: error
@@ -417,8 +417,8 @@ msgid ""
"clamav-docs/clamdoc.pdf or the manpage clamscan(5)."
msgstr ""
"Si desea m??s informaci??n sobre los tipos de archivos que se analizar??n, "
-"consulte ??/usr/share/doc/clamav/clamdoc.pdf.gz?? o la p??gina de manual "
-"clamscan(5)."
+"consulte ??/usr/share/doc/clamav/clamdoc.pdf.gz?? o la p??gina de manual clamscan"
+"(5)."
#. Type: string
#. Description
@@ -560,10 +560,10 @@ msgid ""
msgstr ""
"Se recomienda que ejecute los programas de ClamAV como usuario no "
"privilegiado. Esto funciona bien con la mayor??a de agentes de transporte de "
-"correo con pocos cambios, pero probablemente no pueda evitar ejecutar "
-"??clamd?? como root si quiere utilizarlo para analizar los sistemas de "
-"ficheros. Consulte el fichero ??README.Debian?? en el paquete clamav-base si "
-"desea m??s informaci??n."
+"correo con pocos cambios, pero probablemente no pueda evitar ejecutar ??clamd?? "
+"como root si quiere utilizarlo para analizar los sistemas de ficheros. "
+"Consulte el fichero ??README.Debian?? en el paquete clamav-base si desea m??s "
+"informaci??n."
#. Type: string
#. Description
@@ -890,8 +890,8 @@ msgid ""
msgstr ""
"Defina, con leyenda CIDR (equipo(nombre)/m??scara), los equipos cuyo correo "
"entrante no se analizar??. Puede introducir varias entradas separadas por "
-"espacios. Puede usar un atajo ??local?? para definir correo generado "
-"localmente (sin SMTP)."
+"espacios. Puede usar un atajo ??local?? para definir correo generado localmente "
+"(sin SMTP)."
#. Type: string
#. Description
@@ -1006,8 +1006,7 @@ msgstr ""
" - Agujero negro: Acepta el mensaje, y lo elimina.\n"
" - Cuarentena: Acepta el mensaje, y lo pone en cuarentena. Puede "
"examinar\n"
-" la cola de cuarentena con Sendmail usando ??mailq -qQ??. "
-"Con\n"
+" la cola de cuarentena con Sendmail usando ??mailq -qQ??. Con\n"
" Postfix, estos env??os son retenidos."
#. Type: select
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/eu.po 0.96.3+dfsg-1ubuntu3/debian/po/eu.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/eu.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/eu.po 2010-09-23 14:34:47.000000000 +0100
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2008-09-24 11:03+0200\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: KBabel 1.11.4\n"
#. Type: select
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/fi.po 0.96.3+dfsg-1ubuntu3/debian/po/fi.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/fi.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/fi.po 2010-09-23 14:34:47.000000000 +0100
@@ -7,10 +7,10 @@ msgstr ""
"PO-Revision-Date: 2009-06-22 22:47+0300\n"
"Last-Translator: Esko Araj??rvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
-"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/fr.po 0.96.3+dfsg-1ubuntu3/debian/po/fr.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/fr.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/fr.po 2010-09-23 14:34:47.000000000 +0100
@@ -13,10 +13,10 @@ msgstr ""
"PO-Revision-Date: 2010-06-14 19:37+0200\n"
"Last-Translator: Florentin Duneau <fduneau at gmail.com>\n"
"Language-Team: French <debian-l10n-french at 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"
+"Language: fr\n"
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -491,8 +491,7 @@ msgstr ""
#. Description
#: ../clamav-base.templates:21001
msgid "Log file for clamav-daemon (enter none to disable):"
-msgstr ""
-"Fichier de journalisation de clamav-daemon (????none???? pour d??sactiver)??:"
+msgstr "Fichier de journalisation de clamav-daemon (????none???? pour d??sactiver)??:"
#. Type: boolean
#. Description
@@ -665,8 +664,7 @@ msgstr ""
#. Description
#: ../clamav-milter.templates:4001
msgid "Remove stale socket after unclean shutdown?"
-msgstr ""
-"Faut-il supprimer la ????socket???? r??siduelle apr??s un arr??t non correct???"
+msgstr "Faut-il supprimer la ????socket???? r??siduelle apr??s un arr??t non correct???"
#. Type: string
#. Description
@@ -1083,8 +1081,8 @@ msgid ""
"headers will be attached to each processed message, possibly replacing "
"existing similar headers."
msgstr ""
-"Si vous choisissez cette option, les en-t??tes ????X-Virus-Scanned???? et ????X-"
-"Virus-Status???? seront ajout??s ?? chaque message trait?? ou remplac??s s'ils "
+"Si vous choisissez cette option, les en-t??tes ????X-Virus-Scanned???? et ????X-Virus-"
+"Status???? seront ajout??s ?? chaque message trait?? ou remplac??s s'ils "
"existaient d??j??."
#. Type: string
@@ -1101,8 +1099,8 @@ msgid ""
"for the clamav daemon. Enter none to disable."
msgstr ""
"Veuillez entrer le chemin absolu du fichier de journal de clamav-milter. Ce "
-"fichier doit ??tre accessible en ??criture par le d??mon clamav. Entrez "
-"????none???? pour d??sactiver la journalisation."
+"fichier doit ??tre accessible en ??criture par le d??mon clamav. Entrez ????none???? "
+"pour d??sactiver la journalisation."
#. Type: string
#. Description
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/gl.po 0.96.3+dfsg-1ubuntu3/debian/po/gl.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/gl.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/gl.po 2010-09-23 14:34:47.000000000 +0100
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2009-05-06 21:40+0200\n"
"Last-Translator: marce villarino <mvillarino at users.sourceforge.net>\n"
"Language-Team: Galician <proxecto at trasno.ent>\n"
-"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
"X-Generator: Lokalize 0.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
@@ -320,8 +320,8 @@ msgid ""
"Enter \"any\" to listen on every IP address configured. If you want to "
"listen on a single address or host name, enter it here."
msgstr ""
-"Introduza ??any?? para escoitar en todos os enderezos IP configurados. Se "
-"quere escoitar nun s?? enderezo ou nome de servidor, introd??zao aqu??."
+"Introduza ??any?? para escoitar en todos os enderezos IP configurados. Se quere "
+"escoitar nun s?? enderezo ou nome de servidor, introd??zao aqu??."
#. Type: error
#. Description
@@ -1053,9 +1053,9 @@ msgid ""
"headers will be attached to each processed message, possibly replacing "
"existing similar headers."
msgstr ""
-"Se escolle esta opci??n, engadiranse as cabeceiras ??X-Virus-Scanned?? e ??X-"
-"Virus-Status?? a cada mensaxe procesada, posibelmente substituindo cabeceiras "
-"xa existentes semellantes."
+"Se escolle esta opci??n, engadiranse as cabeceiras ??X-Virus-Scanned?? e ??X-Virus-"
+"Status?? a cada mensaxe procesada, posibelmente substituindo cabeceiras xa "
+"existentes semellantes."
#. Type: string
#. Description
@@ -1114,8 +1114,8 @@ msgid ""
"Please specify the maximum size for the log file. Using \"0\" will allow "
"that file to grow indefinitely."
msgstr ""
-"Indique o tama??o m??ximo do ficheiro de rexistro. Se emprega ??0?? permitir?? "
-"que o ficheiro medre indefinidamente."
+"Indique o tama??o m??ximo do ficheiro de rexistro. Se emprega ??0?? permitir?? que "
+"o ficheiro medre indefinidamente."
#. Type: boolean
#. Description
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/it.po 0.96.3+dfsg-1ubuntu3/debian/po/it.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/it.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/it.po 2010-09-23 14:34:47.000000000 +0100
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2010-09-18 16:35+0200\n"
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
-"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
#. Type: select
#. Choices
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/ja.po 0.96.3+dfsg-1ubuntu3/debian/po/ja.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/ja.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/ja.po 2010-09-23 14:34:47.000000000 +0100
@@ -7,10 +7,10 @@ msgstr ""
"PO-Revision-Date: 2009-04-22 08:45+0900\n"
"Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
-"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
#. Type: select
#. Choices
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/nl.po 0.96.3+dfsg-1ubuntu3/debian/po/nl.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/nl.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/nl.po 2010-09-23 14:34:47.000000000 +0100
@@ -18,10 +18,10 @@ msgstr ""
"PO-Revision-Date: 2009-09-04 19:27+0100\n"
"Last-Translator: Paul Gevers <paul at climbing.nl>\n"
"Language-Team: Dutch <debian-l10n-dutch at 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"
+"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Dutch\n"
"X-Poedit-SourceCharset: utf-8\n"
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/pt_BR.po 0.96.3+dfsg-1ubuntu3/debian/po/pt_BR.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/pt_BR.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/pt_BR.po 2010-09-23 14:34:47.000000000 +0100
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2007-10-06 14:39-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at debian.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"pt_BR utf-8\n"
#. Type: select
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/pt.po 0.96.3+dfsg-1ubuntu3/debian/po/pt.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/pt.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/pt.po 2010-09-23 14:34:47.000000000 +0100
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2010-04-25 21:48+0100\n"
"Last-Translator: Am??rico Monteiro <a_monteiro at netcabo.pt>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
-"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/ru.po 0.96.3+dfsg-1ubuntu3/debian/po/ru.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/ru.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/ru.po 2010-09-23 14:34:47.000000000 +0100
@@ -12,13 +12,13 @@ msgstr ""
"PO-Revision-Date: 2010-06-13 11:49+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at 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"
+"Language: ru\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: select
#. Choices
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/sv.po 0.96.3+dfsg-1ubuntu3/debian/po/sv.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/sv.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/sv.po 2010-09-23 14:34:47.000000000 +0100
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2010-05-03 22:45+0100\n"
"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: Swedish <debian at 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"
+"Language: sv\n"
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: Sweden\n"
diff -pruN 0.96.3+dfsg-1ubuntu2/debian/po/vi.po 0.96.3+dfsg-1ubuntu3/debian/po/vi.po
--- 0.96.3+dfsg-1ubuntu2/debian/po/vi.po 2010-09-23 14:35:02.000000000 +0100
+++ 0.96.3+dfsg-1ubuntu3/debian/po/vi.po 2010-09-23 14:34:47.000000000 +0100
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2009-09-23 21:54+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
-"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
@@ -316,8 +316,8 @@ msgid ""
"Enter \"any\" to listen on every IP address configured. If you want to "
"listen on a single address or host name, enter it here."
msgstr ""
-"G?? ?? any ?? (b???t k???) ????? l???ng nghe tr??n m???i ?????a ch??? IP ???????c c???u h??nh. Mu???n "
-"l???ng nghe tr??n m???t ?????a ch??? hay t??n m??y n??o ???? th?? g?? n?? v??o ????y."
+"G?? ?? any ?? (b???t k???) ????? l???ng nghe tr??n m???i ?????a ch??? IP ???????c c???u h??nh. Mu???n l???ng "
+"nghe tr??n m???t ?????a ch??? hay t??n m??y n??o ???? th?? g?? n?? v??o ????y."
#. Type: error
#. Description
@@ -379,8 +379,8 @@ msgid ""
"clamav-docs/clamdoc.pdf or the manpage clamscan(5)."
msgstr ""
"????? t??m th??m th??ng tin v??? nh???ng kho n??n n??o ???????c h??? tr???, xem t???p tin ?? /usr/"
-"share/doc/clamav-docs/clamdoc.pdf ??, ho???c ?????c trang h?????ng d???n (man) ?? "
-"clamscan(5) ??."
+"share/doc/clamav-docs/clamdoc.pdf ??, ho???c ?????c trang h?????ng d???n (man) ?? clamscan"
+"(5) ??."
#. Type: string
#. Description
@@ -609,9 +609,9 @@ msgid ""
msgstr ""
"N?? kh??ng ho???t ?????ng ???????c n???u kh??ng c?? c???u h??nh. N???u kh??ng t??? ?????ng c???u h??nh "
"n??, b???n c???n t??? c???u h??nh t?? ?? /etc/clamav/clamav-milter.conf ?? ho???c ch???y c??u "
-"l???nh c???u h??nh l???i ?? dpkg-reconfigure clamav-milter ?? v??? sau. Trong m???i "
-"tr?????ng h???p ?????u, c??c s??? thay ?????i b???ng tay trong ?? /etc/clamav/clamav-milter."
-"conf ?? s??? c?? t??c ?????ng."
+"l???nh c???u h??nh l???i ?? dpkg-reconfigure clamav-milter ?? v??? sau. Trong m???i tr?????ng "
+"h???p ?????u, c??c s??? thay ?????i b???ng tay trong ?? /etc/clamav/clamav-milter.conf ?? s??? "
+"c?? t??c ?????ng."
#. Type: string
#. Description
@@ -679,8 +679,8 @@ msgstr ""
#: ../clamav-milter.templates:7001 ../clamav-milter.templates:8001
msgid "Please see README.Debian in the clamav-base package for details."
msgstr ""
-"Xem t??i li???u ?????c ??i ?? README.Debian ?? trong g??i c?? b???n clamav-base ????? t??m "
-"chi ti???t."
+"Xem t??i li???u ?????c ??i ?? README.Debian ?? trong g??i c?? b???n clamav-base ????? t??m chi "
+"ti???t."
#. Type: string
#. Description
@@ -886,10 +886,10 @@ msgid ""
"whitelisting apply to matching sender addresses; otherwise, or with a \"To:"
"\" prefix, it affects recipient addresses."
msgstr ""
-"D??ng c?? th??? b???t ?????u v???i ?? From: ?? (T???) (m?? kh??ng c?? d???u c??ch ?????ng sau d???u "
-"hai ch???m) ????? l??m cho danh s??ch ch???p nh???n c??ng ??p d???ng cho c??c ?????a ch??? ng?????i "
-"g???i t????ng ???ng. Kh??ng, ho???c v???i ti???n t??? ?? To: ?? (Cho) th?? n?? ???nh h?????ng ?????n "
-"c??c ?????a ch??? c???a ng?????i nh???n."
+"D??ng c?? th??? b???t ?????u v???i ?? From: ?? (T???) (m?? kh??ng c?? d???u c??ch ?????ng sau d???u hai "
+"ch???m) ????? l??m cho danh s??ch ch???p nh???n c??ng ??p d???ng cho c??c ?????a ch??? ng?????i g???i "
+"t????ng ???ng. Kh??ng, ho???c v???i ti???n t??? ?? To: ?? (Cho) th?? n?? ???nh h?????ng ?????n c??c ?????a "
+"ch??? c???a ng?????i nh???n."
#. Type: select
#. Choices
@@ -1055,9 +1055,9 @@ msgid ""
"headers will be attached to each processed message, possibly replacing "
"existing similar headers."
msgstr ""
-"B???t t??y ch???n n??y th?? hai d??ng ?????u ?? X-Virus-Scanned ?? (???? qu??t t??m vi-r??t) "
-"v?? ?? X-Virus-Status ?? (tr???ng th??i vi-r??t) ???????c th??m v??o m???i th?? ???????c x??? l??, "
-"c?? th??? c??ng thay th??? d??ng ?????u t????ng t???."
+"B???t t??y ch???n n??y th?? hai d??ng ?????u ?? X-Virus-Scanned ?? (???? qu??t t??m vi-r??t) v?? "
+"?? X-Virus-Status ?? (tr???ng th??i vi-r??t) ???????c th??m v??o m???i th?? ???????c x??? l??, c?? "
+"th??? c??ng thay th??? d??ng ?????u t????ng t???."
#. Type: string
#. Description
----- End forwarded message -----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20100925/b9150789/attachment-0001.pgp>
More information about the Pkg-clamav-devel
mailing list