Dear maintainer of ucf, On Wednesday, July 07, 2010 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 Friday, July 02, 2010.
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: ucf Version: 3.0025+nmu1 Distribution: unstable Urgency: low Maintainer: Christian Perrier <[email protected]> Date: Sat, 28 Aug 2010 08:55:44 +0200 Closes: 559554 588304 588369 588980 592174 Changes: ucf (3.0025+nmu1) unstable; urgency=low . * Non-maintainer upload. * Fix pending l10n issues. Debconf translations: - Italian (Luca Bruno). Closes: #559554 - Catalan (Jordi Mallach). Closes: #588304 - Danish (Joe Hansen). Closes: #588369 - Portuguese (Américo Monteiro). Closes: #588980 - Spanish (Javier Fernandez-Sanguino). Closes: #592174 --
diff -Nru ucf-3.0025+nmu1.old/debian/changelog ucf-3.0025+nmu1/debian/changelog --- ucf-3.0025+nmu1.old/debian/changelog 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/changelog 2010-08-28 08:55:44.000000000 +0200 @@ -1,3 +1,15 @@ +ucf (3.0025+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Italian (Luca Bruno). Closes: #559554 + - Catalan (Jordi Mallach). Closes: #588304 + - Danish (Joe Hansen). Closes: #588369 + - Portuguese (Américo Monteiro). Closes: #588980 + - Spanish (Javier Fernandez-Sanguino). Closes: #592174 + + -- Christian Perrier <[email protected]> Sat, 28 Aug 2010 08:55:44 +0200 + ucf (3.0025) unstable; urgency=low * [ucf 39603a0] Added russian translation. diff -Nru ucf-3.0025+nmu1.old/debian/po/ca.po ucf-3.0025+nmu1/debian/po/ca.po --- ucf-3.0025+nmu1.old/debian/po/ca.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/ca.po 2010-07-07 18:30:53.000000000 +0200 @@ -1,16 +1,17 @@ # ucf (debconf) translation to Catalan. -# Copyright © 2004, 2008, 2009 Free Software Foundation, Inc. +# Copyright © 2004, 2008, 2009, 2010 Free Software Foundation, Inc. # Aleix Badia i Bosch <[email protected]>, 2004. -# Jordi Mallach <[email protected]>, 2008, 2009. +# Jordi Mallach <[email protected]>, 2008, 2009, 2010. # msgid "" msgstr "" -"Project-Id-Version: ucf 3.0021\n" +"Project-Id-Version: ucf 3.0025+nmu1\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2009-10-13 08:14-0500\n" -"PO-Revision-Date: 2009-09-03 21:08+0200\n" +"PO-Revision-Date: 2010-07-07 09:53+0200\n" "Last-Translator: Jordi Mallach <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -85,9 +86,9 @@ #. Type: select #. Description #: ../templates:3002 ../templates:4002 -#, fuzzy msgid "What do you want to do about modified configuration file ${BASENAME}?" -msgstr "Què voleu fer respecte a ${BASENAME}?" +msgstr "" +"Què voleu fer respecte al fitxer de configuració modificat ${BASENAME}?" #. Type: select #. Description @@ -130,10 +131,5 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" -"El fitxer «${dest_file}.${ERR_SUFFIX}» té un registre de la fusió fallida del " -"fitxer de configuració." - -#, fuzzy -#~| msgid "What would you like to do about ${BASENAME}?" -#~ msgid "What do you want to do about modified configration file ${BASENAME}?" -#~ msgstr "Què voleu fer respecte a ${BASENAME}?" +"El fitxer «${dest_file}.${ERR_SUFFIX}» té un registre de la fusió fallida " +"del fitxer de configuració." diff -Nru ucf-3.0025+nmu1.old/debian/po/cs.po ucf-3.0025+nmu1/debian/po/cs.po --- ucf-3.0025+nmu1.old/debian/po/cs.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/cs.po 2010-07-07 08:56:07.000000000 +0200 @@ -19,6 +19,7 @@ "PO-Revision-Date: 2009-10-13 18:53+0200\n" "Last-Translator: Miroslav Kure <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/da.po ucf-3.0025+nmu1/debian/po/da.po --- ucf-3.0025+nmu1.old/debian/po/da.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/da.po 2010-07-08 07:18:29.000000000 +0200 @@ -1,27 +1,31 @@ -# SOME DESCRIPTIVE TITLE. -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# +# Danish translation ucf. +# This file is distributed under the same license as the ucf package. +# Copyright (C) 2010 ucf & nedenstående oversættere. # Claus Hindsgaul <[email protected]>, 2005. # Claus Hindsgaul <[email protected]>, 2007. +# Joe Hansen <[email protected]>, 2010. +# +# configuration file -> opsætningsfil (normalt konfigurationsfil, men tidligere +# havde opsætningsfil så har beholdt den). +# msgid "" msgstr "" "Project-Id-Version: ucf debconf template\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2009-10-13 08:14-0500\n" -"PO-Revision-Date: 2007-09-19 01:09-0500\n" -"Last-Translator: Claus Hindsgaul <[email protected]>\n" -"Language-Team: Danish\n" +"PO-Revision-Date: 2010-07-07 17:34+0000\n" +"Last-Translator: Joe Hansen <[email protected]>\n" +"Language-Team: Danish <[email protected]>\n" +"Language: da\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" #. Type: title #. Description #: ../templates:2001 msgid "Modified configuration file" -msgstr "�ndret ops�tningsfil" +msgstr "Ændret opsætningsfil" #. Type: select #. Choices @@ -30,7 +34,7 @@ #. Choices #: ../templates:3001 ../templates:4001 msgid "install the package maintainer's version" -msgstr "install�r pakkevedligeholderens udgave" +msgstr "installér pakkevedligeholderens udgave" #. Type: select #. Choices @@ -64,7 +68,7 @@ #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 msgid "show a 3-way difference between available versions" -msgstr "vis 3-vejs forskelle mellem de tilg�ngelige udgaver af filen" +msgstr "vis 3-vejs forskelle mellem de tilgængelige udgaver af filen" #. Type: select #. Choices @@ -72,8 +76,7 @@ #: ../templates:3001 msgid "do a 3-way merge between available versions (experimental)" msgstr "" -"udf�r en 3-vejs fletning mellem de tilg�ngelige udgaver af filen [Meget " -"eksperimentelt]" +"udfør en 3-vejs fletning mellem tilgængelige versioner (eksperimentelt)" #. Type: select #. Choices @@ -82,16 +85,15 @@ #. Choices #: ../templates:3001 ../templates:4001 msgid "start a new shell to examine the situation" -msgstr "start en ny skal for at unders�ge situationen" +msgstr "start en ny skal for at undersøge situationen" #. Type: select #. Description #. Type: select #. Description #: ../templates:3002 ../templates:4002 -#, fuzzy msgid "What do you want to do about modified configuration file ${BASENAME}?" -msgstr "Hvad vil du g�re med ${BASENAME}?" +msgstr "Hvad vil du gøre med ændret opsætningsfil ${BASENAME}?" #. Type: select #. Description @@ -102,8 +104,8 @@ "A new version of configuration file ${FILE} is available, but the version " "installed currently has been locally modified." msgstr "" -"Der er kommet en ny version af ops�tningsfilen ${FILE}, men din version er " -"blevet �ndret lokalt." +"Der er kommet en ny version af opsætningsfilen ${FILE}, men din version er " +"blevet ændret lokalt." #. Type: note #. Description @@ -115,7 +117,7 @@ #. Description #: ../templates:6001 msgid "Conflicts found in three-way merge" -msgstr "" +msgstr "Konflikter fundet i trevejssammenføjning" #. Type: error #. Description @@ -124,6 +126,8 @@ "Conflicts found during three-way merge! Please edit `${dest_file}' and sort " "them out manually." msgstr "" +"Konflikter fundet under trevejssammenføjning! Rediger venligst `" +"${dest_file}' og ret dem manuelt." #. Type: error #. Description @@ -132,14 +136,5 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" - -#, fuzzy -#~| msgid "What would you like to do about ${BASENAME}?" -#~ msgid "What do you want to do about modified configration file ${BASENAME}?" -#~ msgstr "Hvad vil du g�re med ${BASENAME}?" - -#~ msgid "The differences" -#~ msgstr "Forskellene" - -#~ msgid "${DIFF}" -#~ msgstr "${DIFF}" +"Filen `${dest_file}.${ERR_SUFFIX}' har en post over den mislykkede " +"sammenføjning af opsætningsfilen." diff -Nru ucf-3.0025+nmu1.old/debian/po/de.po ucf-3.0025+nmu1/debian/po/de.po --- ucf-3.0025+nmu1.old/debian/po/de.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/de.po 2010-07-07 08:56:07.000000000 +0200 @@ -19,6 +19,7 @@ "PO-Revision-Date: 2009-10-30 22:16+0100\n" "Last-Translator: Erik Schanze <[email protected]>\n" "Language-Team: German <[email protected]>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -97,8 +98,7 @@ #: ../templates:3002 ../templates:4002 msgid "What do you want to do about modified configuration file ${BASENAME}?" msgstr "" -"Wie wollen Sie mit der geänderten Konfigurationsdatei ${BASENAME} " -"verfahren?" +"Wie wollen Sie mit der geänderten Konfigurationsdatei ${BASENAME} verfahren?" #. Type: select #. Description @@ -109,8 +109,8 @@ "A new version of configuration file ${FILE} is available, but the version " "installed currently has been locally modified." msgstr "" -"Eine neue Version der Konfigurationsdatei ${FILE} ist verfügbar, " -"aber die installierte Version wurde verändert." +"Eine neue Version der Konfigurationsdatei ${FILE} ist verfügbar, aber die " +"installierte Version wurde verändert." #. Type: note #. Description @@ -131,8 +131,8 @@ "Conflicts found during three-way merge! Please edit `${dest_file}' and sort " "them out manually." msgstr "" -"Es wurden Konflikte bei der 3-Wege-Vereinigung festgestellt! " -"Bitte beheben Sie diese selbst in der Datei »${dest_file}«." +"Es wurden Konflikte bei der 3-Wege-Vereinigung festgestellt! Bitte beheben " +"Sie diese selbst in der Datei »${dest_file}«." #. Type: error #. Description @@ -141,6 +141,5 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" -"Die fehlgeschlagene Vereinigung der Konfigurationsdatei wurde " -"in der Datei »${dest_file}.${ERR_SUFFIX}« abgespeichert." - +"Die fehlgeschlagene Vereinigung der Konfigurationsdatei wurde in der Datei " +"»${dest_file}.${ERR_SUFFIX}« abgespeichert." diff -Nru ucf-3.0025+nmu1.old/debian/po/es.po ucf-3.0025+nmu1/debian/po/es.po --- ucf-3.0025+nmu1.old/debian/po/es.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/es.po 2010-08-09 00:58:23.000000000 +0200 @@ -6,44 +6,46 @@ # - Initial translation # Lucas Wall <[email protected]>, 2004 # - Updated -# Javier Fernandez-Sanguino <[email protected]>, 2007 +# Javier Fernandez-Sanguino <[email protected]>, 2007, 2010 # # # Traductores, si no conoce el formato PO, merece la pena leer la -# documentaci�n de gettext, especialmente las secciones dedicadas a este +# 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 +# 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 +# - El proyecto de traducción de Debian al español # http://www.debian.org/intl/spanish/coordinacion -# especialmente las notas de traducci�n en +# 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: +# - 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: ucf 1.06\n" +"Project-Id-Version: ucf 3.0025\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2009-10-13 08:14-0500\n" -"PO-Revision-Date: 2007-06-21 13:41+0200\n" +"PO-Revision-Date: 2010-08-08 01:53+0200\n" "Last-Translator: Javier Fernandez-Sanguino <[email protected]>\n" "Language-Team: Debian Spanish <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-POFile-SpellExtra: BASENAME destfile ERRSUFFIX\n" #. Type: title #. Description #: ../templates:2001 msgid "Modified configuration file" -msgstr "Fichero de configuraci�n modificado" +msgstr "Fichero de configuración modificado" #. Type: select #. Choices @@ -52,7 +54,7 @@ #. Choices #: ../templates:3001 ../templates:4001 msgid "install the package maintainer's version" -msgstr "instalar la versi�n del responsable del paquete" +msgstr "instalar la versión del responsable del paquete" #. Type: select #. Choices @@ -61,7 +63,7 @@ #. Choices #: ../templates:3001 ../templates:4001 msgid "keep the local version currently installed" -msgstr "conservar la versi�n local actualmente instalada" +msgstr "conservar la versión local actualmente instalada" #. Type: select #. Choices @@ -102,16 +104,16 @@ #. Choices #: ../templates:3001 ../templates:4001 msgid "start a new shell to examine the situation" -msgstr "ejecutar un nuevo int�rprete para examinar la situaci�n" +msgstr "ejecutar un nuevo intérprete para examinar la situación" #. Type: select #. Description #. Type: select #. Description #: ../templates:3002 ../templates:4002 -#, fuzzy msgid "What do you want to do about modified configuration file ${BASENAME}?" -msgstr "�Qu� desea hacer con ${BASENAME}?" +msgstr "" +"¿Qué desea hacer con el fichero de configuración modificado ${BASENAME}?" #. Type: select #. Description @@ -122,20 +124,20 @@ "A new version of configuration file ${FILE} is available, but the version " "installed currently has been locally modified." msgstr "" -"Hay una nueva versi�n del fichero de configuraci�n ${FILE}, pero la versi�n " -"que est� instalada ha sido modificada localmente." +"Hay una nueva versión del fichero de configuración ${FILE}, pero la versión " +"que está instalada ha sido modificada localmente." #. Type: note #. Description #: ../templates:5001 msgid "Line by line differences between versions" -msgstr "Mostrar las diferencias l�nea a l�nea entre las versiones" +msgstr "Mostrar las diferencias línea a línea entre las versiones" #. Type: error #. Description #: ../templates:6001 msgid "Conflicts found in three-way merge" -msgstr "" +msgstr "Se encontraron conflictos al intentar integrar a tres bandas" #. Type: error #. Description @@ -144,6 +146,8 @@ "Conflicts found during three-way merge! Please edit `${dest_file}' and sort " "them out manually." msgstr "" +"¡Se encontraron conflictos al intentar la integración a tres bandas! Por " +"favor, edite «${dest_file}» y ordénelos manualmente." #. Type: error #. Description @@ -152,8 +156,10 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" +"El fichero «${dest_file}.${ERR_SUFFIX}» tiene el registro del fallo de " +"integración del fichero de configuración." #, fuzzy #~| msgid "What would you like to do about ${BASENAME}?" #~ msgid "What do you want to do about modified configration file ${BASENAME}?" -#~ msgstr "�Qu� desea hacer con ${BASENAME}?" +#~ msgstr "¿Qué desea hacer con ${BASENAME}?" diff -Nru ucf-3.0025+nmu1.old/debian/po/eu.po ucf-3.0025+nmu1/debian/po/eu.po --- ucf-3.0025+nmu1.old/debian/po/eu.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/eu.po 2010-07-07 08:56:07.000000000 +0200 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2009-10-29 12:11+0100\n" "Last-Translator: Iñaki Larrañaga Murgoitio <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/fi.po ucf-3.0025+nmu1/debian/po/fi.po --- ucf-3.0025+nmu1.old/debian/po/fi.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/fi.po 2010-07-07 08:56:07.000000000 +0200 @@ -7,6 +7,7 @@ "PO-Revision-Date: 2009-10-13 21:50+0300\n" "Last-Translator: Esko Arajärvi <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/fr.po ucf-3.0025+nmu1/debian/po/fr.po --- ucf-3.0025+nmu1.old/debian/po/fr.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/fr.po 2010-07-07 08:56:07.000000000 +0200 @@ -14,6 +14,7 @@ "PO-Revision-Date: 2009-10-13 18:06+0200\n" "Last-Translator: Christian Perrier <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -135,8 +136,8 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" -"Le fichier « ${dest_file}.${ERR_SUFFIX} » contient une trace de la fusion qui " -"a échoué." +"Le fichier « ${dest_file}.${ERR_SUFFIX} » contient une trace de la fusion " +"qui a échoué." #, fuzzy #~| msgid "What would you like to do about ${BASENAME}?" diff -Nru ucf-3.0025+nmu1.old/debian/po/gl.po ucf-3.0025+nmu1/debian/po/gl.po --- ucf-3.0025+nmu1.old/debian/po/gl.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/gl.po 2010-07-07 08:56:07.000000000 +0200 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2009-11-05 20:38+0100\n" "Last-Translator: Marce Villarino <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -131,8 +132,8 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" -"O ficheiro «${dest_file}.{ERR_SUFFIX}» contén un rexistro da fusión fracasada " -"do ficheiro de configuración." +"O ficheiro «${dest_file}.{ERR_SUFFIX}» contén un rexistro da fusión " +"fracasada do ficheiro de configuración." #, fuzzy #~| msgid "What would you like to do about ${BASENAME}?" diff -Nru ucf-3.0025+nmu1.old/debian/po/it.po ucf-3.0025+nmu1/debian/po/it.po --- ucf-3.0025+nmu1.old/debian/po/it.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/it.po 2010-07-07 18:12:08.000000000 +0200 @@ -1,13 +1,14 @@ # translation of ucf_1.18_templates.po to italian -# Copyright Luca Bruno <[email protected]>, 2005. +# Copyright Luca Bruno <[email protected]>, 2005-2010. msgid "" msgstr "" "Project-Id-Version: ucf_1.18_templates\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2009-10-13 08:14-0500\n" "PO-Revision-Date: 2007-09-19 01:10-0500\n" -"Last-Translator: Luca Bruno <[email protected]>\n" +"Last-Translator: Luca Bruno <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -51,25 +52,22 @@ #. Type: select #. Choices #: ../templates:3001 ../templates:4001 -#, fuzzy msgid "show a side-by-side difference between the versions" -msgstr "mostrare le differenze tra le versioni" +msgstr "mostrare affiancate le differenze tra le versioni" #. Type: select #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 msgid "show a 3-way difference between available versions" -msgstr "Mostrare le differenze tra 3 versioni del file disponibili" +msgstr "mostrare le differenze tra le 3 versioni del file disponibili" #. Type: select #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 msgid "do a 3-way merge between available versions (experimental)" -msgstr "" -"Integrare le differenze tra 3 versioni del file disponibili [Molto " -"sperimentale]" +msgstr "integrare le differenze tra le 3 versioni (sperimentale)" #. Type: select #. Choices @@ -85,9 +83,8 @@ #. Type: select #. Description #: ../templates:3002 ../templates:4002 -#, fuzzy msgid "What do you want to do about modified configuration file ${BASENAME}?" -msgstr "Cosa si vuol fare di ${BASENAME}?" +msgstr "Cosa si vuol fare del file di configurazione modificato ${BASENAME}?" #. Type: select #. Description @@ -105,13 +102,13 @@ #. Description #: ../templates:5001 msgid "Line by line differences between versions" -msgstr "mostrare le differenze tra le versioni" +msgstr "Differenze riga per riga tra le versioni" #. Type: error #. Description #: ../templates:6001 msgid "Conflicts found in three-way merge" -msgstr "" +msgstr "Conflitto nell'integrazione delle 3 versioni" #. Type: error #. Description @@ -120,6 +117,8 @@ "Conflicts found during three-way merge! Please edit `${dest_file}' and sort " "them out manually." msgstr "" +"Si sono verificati conflitti nell'integrazione delle 3 versioni! Modificare " +"il file «${dest_file}» e risolvere manualmente la situazione." #. Type: error #. Description @@ -128,8 +127,5 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" - -#, fuzzy -#~| msgid "What would you like to do about ${BASENAME}?" -#~ msgid "What do you want to do about modified configration file ${BASENAME}?" -#~ msgstr "Cosa si vuol fare di ${BASENAME}?" +"Il file «${dest_file}.${ERR_SUFFIX}» contiene il resoconto della tentata " +"integrazione del file di configurazione." diff -Nru ucf-3.0025+nmu1.old/debian/po/ja.po ucf-3.0025+nmu1/debian/po/ja.po --- ucf-3.0025+nmu1.old/debian/po/ja.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/ja.po 2010-07-07 08:56:07.000000000 +0200 @@ -19,6 +19,7 @@ "PO-Revision-Date: 2009-10-15 22:11+0900\n" "Last-Translator: Kenshi Muto <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/nl.po ucf-3.0025+nmu1/debian/po/nl.po --- ucf-3.0025+nmu1.old/debian/po/nl.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/nl.po 2010-07-07 08:56:07.000000000 +0200 @@ -19,6 +19,7 @@ "PO-Revision-Date: 2007-09-19 01:09-0500\n" "Last-Translator: Kurt De Bree <kdebree(AT)telenet(DOT)be>\n" "Language-Team: Nederlands <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/pl.po ucf-3.0025+nmu1/debian/po/pl.po --- ucf-3.0025+nmu1.old/debian/po/pl.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/pl.po 2010-07-07 08:56:07.000000000 +0200 @@ -21,6 +21,7 @@ "PO-Revision-Date: 2007-06-27 17:15+0200\n" "Last-Translator: Wojciech Zar�ba <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/pt.po ucf-3.0025+nmu1/debian/po/pt.po --- ucf-3.0025+nmu1.old/debian/po/pt.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/pt.po 2010-07-14 09:00:38.000000000 +0200 @@ -1,18 +1,25 @@ # Portuguese translation of ucf's debconf messages. +# Copyright (C) 2007 the ucf's copyright holder +# This file is distributed under the same license as the ucf package. +# # 2007, Pedro Ribeiro <[email protected]> # Bruno Queiros <[email protected]>, 2007. +# Américo Monteiro <[email protected]>, 2010. # msgid "" msgstr "" -"Project-Id-Version: ucf 2.0020\n" +"Project-Id-Version: ucf 3.0025\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2009-10-13 08:14-0500\n" -"PO-Revision-Date: 2007-09-19 01:09-0500\n" -"Last-Translator: Bruno Queiros <[email protected]>\n" +"PO-Revision-Date: 2010-07-11 23:46+0100\n" +"Last-Translator: Américo Monteiro <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: title #. Description @@ -61,7 +68,7 @@ #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 msgid "show a 3-way difference between available versions" -msgstr "mostrar uma diferença em 3 vias entre versões disponíveis do ficheiro" +msgstr "mostrar uma diferença em 3 vias entre as versões disponíveis" #. Type: select #. Choices @@ -69,8 +76,8 @@ #: ../templates:3001 msgid "do a 3-way merge between available versions (experimental)" msgstr "" -"fazer uma junção em 3 vias entre versões disponíveis do ficheiro [Muito " -"Experimental]" +"fazer uma fusão em 3 vias entre versões disponíveis do ficheiro " +"(experimental)" #. Type: select #. Choices @@ -86,9 +93,9 @@ #. Type: select #. Description #: ../templates:3002 ../templates:4002 -#, fuzzy msgid "What do you want to do about modified configuration file ${BASENAME}?" -msgstr "O que quer fazer acerca de ${BASENAME}?" +msgstr "" +"O que deseja fazer acerca do ficheiro de configuração modificado ${BASENAME}?" #. Type: select #. Description @@ -100,19 +107,19 @@ "installed currently has been locally modified." msgstr "" "Uma nova versão do ficheiro de configuração ${FILE} está disponível, mas a " -"sua versão foi modificada localmente." +"versão instalada foi modificada localmente." #. Type: note #. Description #: ../templates:5001 msgid "Line by line differences between versions" -msgstr "mostrar a diferença entre as versões" +msgstr "Diferenças entre as versões linha por linha" #. Type: error #. Description #: ../templates:6001 msgid "Conflicts found in three-way merge" -msgstr "" +msgstr "Conflitos encontrados na fusão de três vias" #. Type: error #. Description @@ -121,6 +128,8 @@ "Conflicts found during three-way merge! Please edit `${dest_file}' and sort " "them out manually." msgstr "" +"Conflitos encontrados na fusão de três vias! Por favor edite '${dest_file}' " +"e organize-os manualmente." #. Type: error #. Description @@ -129,14 +138,5 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" - -#, fuzzy -#~| msgid "What would you like to do about ${BASENAME}?" -#~ msgid "What do you want to do about modified configration file ${BASENAME}?" -#~ msgstr "O que quer fazer acerca de ${BASENAME}?" - -#~ msgid "The differences" -#~ msgstr "As diferenças" - -#~ msgid "${DIFF}" -#~ msgstr "${DIFF}" +"O ficheiro '${dest_file}.${ERR_SUFFIX}' tem um registo da fusão falhada do " +"ficheiro de configuração." diff -Nru ucf-3.0025+nmu1.old/debian/po/pt_BR.po ucf-3.0025+nmu1/debian/po/pt_BR.po --- ucf-3.0025+nmu1.old/debian/po/pt_BR.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/pt_BR.po 2010-07-07 08:56:07.000000000 +0200 @@ -19,6 +19,7 @@ "PO-Revision-Date: 2007-09-19 01:11-0500\n" "Last-Translator: André Luís Lopes <[email protected]>\n" "Language-Team: Debian-BR Project <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/ru.po ucf-3.0025+nmu1/debian/po/ru.po --- ucf-3.0025+nmu1.old/debian/po/ru.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/ru.po 2010-07-07 08:56:07.000000000 +0200 @@ -12,12 +12,13 @@ "PO-Revision-Date: 2009-10-13 18:02+0400\n" "Last-Translator: Yuri Kozlov <[email protected]>\n" "Language-Team: Russian <[email protected]>\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: title #. Description diff -Nru ucf-3.0025+nmu1.old/debian/po/sv.po ucf-3.0025+nmu1/debian/po/sv.po --- ucf-3.0025+nmu1.old/debian/po/sv.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/sv.po 2010-07-07 08:56:07.000000000 +0200 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2009-10-13 18:38+0100\n" "Last-Translator: Martin Bagge <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru ucf-3.0025+nmu1.old/debian/po/vi.po ucf-3.0025+nmu1/debian/po/vi.po --- ucf-3.0025+nmu1.old/debian/po/vi.po 2010-06-29 22:27:27.000000000 +0200 +++ ucf-3.0025+nmu1/debian/po/vi.po 2010-07-07 08:56:07.000000000 +0200 @@ -10,6 +10,7 @@ "PO-Revision-Date: 2009-10-14 19:51+0930\n" "Last-Translator: Clytie Siddall <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -134,5 +135,5 @@ "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of " "the configuration file." msgstr "" -"Tập tin đích « ${dest_file}.${ERR_SUFFIX} » đã ghi lưu tiến trình hoà trộn bị " -"lỗi của tập tin cấu hình." +"Tập tin đích « ${dest_file}.${ERR_SUFFIX} » đã ghi lưu tiến trình hoà trộn " +"bị lỗi của tập tin cấu hình."
signature.asc
Description: Digital signature
