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.
We finally agreed that you would do the update yourself at the end of
the l10n update round.
That time has come.
To help you out, here's the patch which I would have used for an NMU.
Please feel free to use all of it...or only the l10n part of it.
The corresponding changelog is:
Source: ucf
Version: 3.0025+nmu1
Distribution: UNRELEASED
Urgency: low
Maintainer: Christian Perrier <bubu...@debian.org>
Date: Fri, 02 Jul 2010 06:50:56 +0200
Closes: 559554 588304 588369 588980
Changes:
ucf (3.0025+nmu1) UNRELEASED; 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
--
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.779501008 +0200
+++ ucf-3.0025+nmu1/debian/changelog 2010-07-14 09:05:47.628642344 +0200
@@ -1,3 +1,14 @@
+ucf (3.0025+nmu1) UNRELEASED; 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
+
+ -- Christian Perrier <bubu...@debian.org> Fri, 02 Jul 2010 06:50:56 +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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/ca.po 2010-07-07 18:30:53.813422652 +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 <aba...@ica.es>, 2004.
-# Jordi Mallach <jo...@debian.org>, 2008, 2009.
+# Jordi Mallach <jo...@debian.org>, 2008, 2009, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: ucf 3.0021\n"
+"Project-Id-Version: ucf 3.0025+nmu1\n"
"Report-Msgid-Bugs-To: u...@packages.debian.org\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 <jo...@debian.org>\n"
"Language-Team: Catalan <debian-l10n-cata...@lists.debian.org>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/cs.po 2010-07-07 08:56:07.253031851 +0200
@@ -19,6 +19,7 @@
"PO-Revision-Date: 2009-10-13 18:53+0200\n"
"Last-Translator: Miroslav Kure <ku...@debian.cz>\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 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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/da.po 2010-07-08 07:18:29.400756358 +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 <clau...@image.dk>, 2005.
# Claus Hindsgaul <claus.hindsg...@gmail.com>, 2007.
+# Joe Hansen <joedalt...@yahoo.dk>, 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: u...@packages.debian.org\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 <claus.hindsg...@gmail.com>\n"
-"Language-Team: Danish\n"
+"PO-Revision-Date: 2010-07-07 17:34+0000\n"
+"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n"
+"Language-Team: Danish <da...@dansk-gruppen.dk>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/de.po 2010-07-07 08:56:07.269038551 +0200
@@ -19,6 +19,7 @@
"PO-Revision-Date: 2009-10-30 22:16+0100\n"
"Last-Translator: Erik Schanze <er...@debian.org>\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"
@@ -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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/es.po 2010-07-07 08:56:07.277029818 +0200
@@ -35,6 +35,7 @@
"PO-Revision-Date: 2007-06-21 13:41+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <j...@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-span...@lists.debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/eu.po 2010-07-07 08:56:07.281038233 +0200
@@ -12,10 +12,10 @@
"PO-Revision-Date: 2009-10-29 12:11+0100\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <doo...@euskalgnu.org>\n"
"Language-Team: Basque <debian-l10n-bas...@lists.debian.org>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/fi.po 2010-07-07 08:56:07.285030234 +0200
@@ -7,6 +7,7 @@
"PO-Revision-Date: 2009-10-13 21:50+0300\n"
"Last-Translator: Esko Arajärvi <e...@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finn...@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"
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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/fr.po 2010-07-07 08:56:07.301031067 +0200
@@ -14,6 +14,7 @@
"PO-Revision-Date: 2009-10-13 18:06+0200\n"
"Last-Translator: Christian Perrier <bubu...@debian.org>\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"
@@ -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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/gl.po 2010-07-07 08:56:07.305030612 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2009-11-05 20:38+0100\n"
"Last-Translator: Marce Villarino <mvillar...@gmail.com>\n"
"Language-Team: Galician <proxe...@trasno.net>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/it.po 2010-07-07 18:12:08.050490065 +0200
@@ -1,13 +1,14 @@
# translation of ucf_1.18_templates.po to italian
-# Copyright Luca Bruno <luca...@uno.it>, 2005.
+# Copyright Luca Bruno <lu...@debian.org>, 2005-2010.
msgid ""
msgstr ""
"Project-Id-Version: ucf_1.18_templates\n"
"Report-Msgid-Bugs-To: u...@packages.debian.org\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 <luca...@uno.it>\n"
+"Last-Translator: Luca Bruno <lu...@debian.org>\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"
@@ -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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/ja.po 2010-07-07 08:56:07.317030712 +0200
@@ -19,6 +19,7 @@
"PO-Revision-Date: 2009-10-15 22:11+0900\n"
"Last-Translator: Kenshi Muto <km...@debian.org>\n"
"Language-Team: Japanese <debian-japan...@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"
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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/nl.po 2010-07-07 08:56:07.329030253 +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 <debian-l10n-du...@lists.debian.org>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/pl.po 2010-07-07 08:56:07.337030739 +0200
@@ -21,6 +21,7 @@
"PO-Revision-Date: 2007-06-27 17:15+0200\n"
"Last-Translator: Wojciech Zarêba <wojt...@itrium.icd.waw.pl>\n"
"Language-Team: Polish <p...@li.org>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/pt.po 2010-07-14 09:00:38.389644022 +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 <p.m42.ribe...@gmail.com>
# Bruno Queiros <brunomiguelquei...@sapo.pt>, 2007.
+# Américo Monteiro <a_monte...@netcabo.pt>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: ucf 2.0020\n"
+"Project-Id-Version: ucf 3.0025\n"
"Report-Msgid-Bugs-To: u...@packages.debian.org\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 <brunomiguelquei...@sapo.pt>\n"
+"PO-Revision-Date: 2010-07-11 23:46+0100\n"
+"Last-Translator: Américo Monteiro <a_monte...@netcabo.pt>\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"
+"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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/pt_BR.po 2010-07-07 08:56:07.349037823 +0200
@@ -19,6 +19,7 @@
"PO-Revision-Date: 2007-09-19 01:11-0500\n"
"Last-Translator: André LuÃs Lopes <andre...@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portugu...@lists.debian.org>\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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/ru.po 2010-07-07 08:56:07.353056295 +0200
@@ -12,12 +12,13 @@
"PO-Revision-Date: 2009-10-13 18:02+0400\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: 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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/sv.po 2010-07-07 08:56:07.361029612 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2009-10-13 18:38+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 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.775502504 +0200
+++ ucf-3.0025+nmu1/debian/po/vi.po 2010-07-07 08:56:07.369038618 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2009-10-14 19:51+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"
@@ -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
