Imported Debian version 3.0025+nmu2

3 files changed, 50 insertions, 48 deletions

diff --git a/debian/changelog b/debian/changelog
index 1f1a9e7..ad87b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ucf (3.0025+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Brazilian Portuguese (Flamarion Jorge).  Closes: #594786
+    - Dutch; (Jeroen Schot).  Closes: #622789
+
+ -- Christian Perrier <bubulle@debian.org>  Fri, 15 Apr 2011 08:27:12 +0200
+
 ucf (3.0025+nmu1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/po/nl.po b/debian/po/nl.po
index cbce899..c9e5d2f 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,30 +1,21 @@
-# translation of ucf_2.007_templates.po to dutch
+# Dutch translation of ucf debconf templates.
+# Copyright (C) 2006-2011 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the ucf package.
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
+# Kurt De Bree <kdebree@telenet.be>, 2006.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ucf_2.007_nl\n"
+"Project-Id-Version: ucf_3.0025\n"
 "Report-Msgid-Bugs-To: ucf@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: Kurt De Bree <kdebree(AT)telenet(DOT)be>\n"
-"Language-Team: Nederlands <debian-l10n-dutch@lists.debian.org>\n"
+"PO-Revision-Date: 2011-04-14 11:43+0200\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: title
 #. Description
@@ -73,17 +64,14 @@ msgstr "toon de verschillende versies zij-aan-zij"
 #. Translators, please keep translations *short* (less than 65 columns)
 #: ../templates:3001
 msgid "show a 3-way difference between available versions"
-msgstr ""
-"toon een drievoudig verschil tussen de beschikbare versies van het bestand"
+msgstr "toon een 3-voudig verschil tussen de beschikbare versies"
 
 #. 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 ""
-"doe een drievoudige samenvoeging tussen de beschikbare versies van het "
-"bestand (Zeer Experimenteel)"
+msgstr "doe een 3-voudige samenvoeging tussen beschikbare versies (test)"
 
 #. Type: select
 #. Choices
@@ -99,9 +87,8 @@ msgstr "start een nieuwe shell om de situatie te onderzoeken"
 #. Type: select
 #. Description
 #: ../templates:3002 ../templates:4002
-#, fuzzy
 msgid "What do you want to do about modified configuration file ${BASENAME}?"
-msgstr "Wat wilt u met ${BASENAME} doen?"
+msgstr "Wat wilt u met het aangepaste configuratiebestand ${BASENAME} doen?"
 
 #. Type: select
 #. Description
@@ -113,19 +100,19 @@ msgid ""
 "installed currently has been locally modified."
 msgstr ""
 "Een nieuwe versie van het configuratiebestand ${FILE} is beschikbaar, maar "
-"uw versie werd handmatig gewijzigd."
+"de geïnstalleerde versie is lokaal gewijzigd."
 
 #. Type: note
 #. Description
 #: ../templates:5001
 msgid "Line by line differences between versions"
-msgstr "toon de verschillen tussen de versies"
+msgstr "Toon de verschillen tussen de versies"
 
 #. Type: error
 #. Description
 #: ../templates:6001
 msgid "Conflicts found in three-way merge"
-msgstr ""
+msgstr "Conflicten gevonden in de drievoudige samenvoeging"
 
 #. Type: error
 #. Description
@@ -134,6 +121,8 @@ msgid ""
 "Conflicts found during three-way merge! Please edit `${dest_file}' and sort "
 "them out manually."
 msgstr ""
+"Conflicten gevonden tijdens de drievoudige samenvoeging! Wijzig alstublieft `"
+"${dest_file}` handmatig om dit op te lossen."
 
 #. Type: error
 #. Description
@@ -142,8 +131,5 @@ msgid ""
 "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 "Wat wilt u met ${BASENAME} doen?"
+"Het bestand `${dest_file}.${ERR_SUFFIX}' bevat een verslag van de mislukte "
+"samenvoeging van het configuratiebestand."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index d175a2c..088e60d 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -10,19 +10,23 @@
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
 #    Developers do not need to manually edit POT or PO files.
+# Flamarion Jorge <jorge.flamarion@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ucf\n"
 "Report-Msgid-Bugs-To: ucf@packages.debian.org\n"
 "POT-Creation-Date: 2009-10-13 08:14-0500\n"
-"PO-Revision-Date: 2007-09-19 01:11-0500\n"
-"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2010-08-22 12:12-0300\n"
+"Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"pt_BR utf-8\n"
 
 #. Type: title
 #. Description
@@ -46,7 +50,7 @@ msgstr "instalar a versão do mantenedor do pacote"
 #. Choices
 #: ../templates:3001 ../templates:4001
 msgid "keep the local version currently installed"
-msgstr "manter a versão instalada atualmente"
+msgstr "manter a versão local atualmente instalada"
 
 #. Type: select
 #. Choices
@@ -64,21 +68,21 @@ msgstr "exibir as diferenças entre as versões"
 #. Choices
 #: ../templates:3001 ../templates:4001
 msgid "show a side-by-side difference between the versions"
-msgstr "exibir as diferenças lado-a-lado entre as versões"
+msgstr "exibir as diferenças entre as versões lado-a-lado"
 
 #. Type: select
 #. Choices
 #. Translators, please keep translations *short* (less than 65 columns)
 #: ../templates:3001
 msgid "show a 3-way difference between available versions"
-msgstr "exibir as diferenças entre as três versões disponíveis do arquivo"
+msgstr "exibir as diferenças entre as 3 versões disponíveis"
 
 #. 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 "juntar as 3 versões disponíveis do arquivo [Bem Experimental]"
+msgstr "juntar as 3 versões disponíveis (experimental)"
 
 #. Type: select
 #. Choices
@@ -87,16 +91,16 @@ msgstr "juntar as 3 versões disponíveis do arquivo [Bem Experimental]"
 #. Choices
 #: ../templates:3001 ../templates:4001
 msgid "start a new shell to examine the situation"
-msgstr "iniciar um novo shell e examinar a situação"
+msgstr "iniciar um novo shell para examinar a situação"
 
 #. Type: select
 #. Description
 #. Type: select
 #. Description
 #: ../templates:3002 ../templates:4002
-#, fuzzy
 msgid "What do you want to do about modified configuration file ${BASENAME}?"
-msgstr "O que você gostaria de fazer em relação a ${BASENAME}?"
+msgstr ""
+"O que você quer fazer sobre o arquivo de configuração modificado ${BASENAME}?"
 
 #. Type: select
 #. Description
@@ -107,20 +111,20 @@ msgid ""
 "A new version of configuration file ${FILE} is available, but the version "
 "installed currently has been locally modified."
 msgstr ""
-"Uma nova versão do arquivo de configuração ${FILE} está disponível, mas sua "
-"versão local foi modificada."
+"Uma nova versão do arquivo de configuração ${FILE} está disponível, mas a "
+"versão atualmente instalada foi modificada localmente."
 
 #. Type: note
 #. Description
 #: ../templates:5001
 msgid "Line by line differences between versions"
-msgstr "exibir as diferenças 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 junção das três versões"
 
 #. Type: error
 #. Description
@@ -129,6 +133,8 @@ msgid ""
 "Conflicts found during three-way merge! Please edit `${dest_file}' and sort "
 "them out manually."
 msgstr ""
+"Foram encontrados conflitos durante a junção das três versões! Por favor "
+"edite '${dest_file}' e os corrija manualmente."
 
 #. Type: error
 #. Description
@@ -137,8 +143,9 @@ msgid ""
 "The file `${dest_file}.${ERR_SUFFIX}' has a record of the failed merge of "
 "the configuration file."
 msgstr ""
+"O arquivo '${dest_file}.${ERR_SUFFIX}' contém um registro da falha na junção "
+"do arquivo de configuração."
 
-#, 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 você gostaria de fazer em relação a ${BASENAME}?"