diff -Nru ucf-3.0038/debian/changelog ucf-3.0038+nmu1/debian/changelog --- ucf-3.0038/debian/changelog 2018-02-26 00:58:23.000000000 +0000 +++ ucf-3.0038+nmu1/debian/changelog 2018-12-14 08:51:14.000000000 +0000 @@ -1,3 +1,15 @@ +ucf (3.0038+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Obvious lintian fixes: + -vcs-obsolete-in-debian-infrastructure + * Update Debconf translations: + -es from Matias Bellone (Closes: #891524) + -fr from jean-pierre giraud (Closes: #891545) + -de from Holger Wansing (Closes: #898079) + + -- Helge Kreutzmann Fri, 14 Dec 2018 09:51:14 +0100 + ucf (3.0038) unstable; urgency=medium * A bug fixing and translation adding release. diff -Nru ucf-3.0038/debian/control ucf-3.0038+nmu1/debian/control --- ucf-3.0038/debian/control 2018-02-26 00:58:23.000000000 +0000 +++ ucf-3.0038+nmu1/debian/control 2018-12-14 08:51:14.000000000 +0000 @@ -1,6 +1,6 @@ Source: ucf -Vcs-Git: https://anonscm.debian.org/git/users/srivasta/debian/ucf.git -Vcs-Browser: https://anonscm.debian.org/git/users/srivasta/debian/ucf.git +#Vcs-Git: https://anonscm.debian.org/git/users/srivasta/debian/ucf.git +#Vcs-Browser: https://anonscm.debian.org/git/users/srivasta/debian/ucf.git Section: utils Priority: standard Maintainer: Manoj Srivastava diff -Nru ucf-3.0038/debian/copyright ucf-3.0038+nmu1/debian/copyright --- ucf-3.0038/debian/copyright 2018-02-26 00:58:23.000000000 +0000 +++ ucf-3.0038+nmu1/debian/copyright 2018-12-14 08:51:14.000000000 +0000 @@ -9,6 +9,97 @@ Copyright: 2002, 2003, 2003, 2004, 2005, 2006, 2015 Manoj Srivastava License: GPL-2 +Files: debian/po/ca.po +Copyright: 2004 Aleix Badia i Bosch + 2008, 2009, 2010 Jordi Mallach +License: GPL-2 + +Files: debian/po/cs.po +Copyright: 2014 Miroslav Kure +License: GPL-2 + +Files: debian/po/da.po +Copyright: 2005, 2007 Claus Hindsgaul + 2010, 2014, 2018 Joe Hansen +License: GPL-2 + +Files: debian/po/de.po +Copyright: 2004-2009 Erik Schanze + 2014, 2018 Holger Wansing +License: GPL-2 + +Files: debian/po/es.po +Copyright: 2004 Lucas Wall + 2007, 2010 Javier Fernandez-Sanguino + 2014,2018 Matías Bellone +License: GPL-2 + +Files: debian/po/eu.po +Copyright: 2007, 2009 Piarres Beobide , 2007, 2009 + 2009, 2014 Iñaki Larrañaga Murgoitio +License: GPL-2 + +Files: debian/po/fi.po +Copyright: 2009, 2014 Esko Arajärvi +License: GPL-2 + +Files: debian/po/fr.po +Copyright: 2007 Eric Madesclair + 2009, 2014 Christian Perrier + 2018 Jean-Pierre Giraud +License: GPL-2 + +Files: debian/po/gl.po +Copyright: 2006, 2007 Jacobo Tarrio + 2009 Marce Villarino +License: GPL-2 + +Files: debian/po/it.po +Copyright: 2005-2010 Luca Bruno +License: GPL-2 + +Files: debian/po/ja.po +Copyright: 2018 Kenshi Muto +License: GPL-2 + +Files: debian/po/nl.po +Copyright: 2006 Kurt De Bree + 2011 Jeroen Schot + 2016 Frans Spiesschaert +License: GPL-2 + +Files: debian/po/pl.po +Copyright: 2007 Wojciech Zaręba + 2012, 2014 Michał Kułach +License: GPL-2 + +Files: debian/po/pt_BR.po +Copyright: 2010 Flamarion Jorge + 2014-2018 Adriano Rafael Gomes +License: GPL-2 + +Files: debian/po/pt.po +Copyright: 2007 Bruno Queiros + 2010-2018 Américo Monteiro +License: GPL-2 + +Files: debian/po/ru.po +Copyright: 2006, 2007 Yuri Kozlov + 2009, 2014, 2018 Yuri Kozlov +License: GPL-2 + +Files: debian/po/sk.po +Copyright: 2011, 2014 Slavko +License: GPL-2 + +Files: debian/po/sv.po +Copyright: 2007 Daniel Nylander + 2009, 2014 Martin Bagge +License: GPL-2 + +Files: debian/po/vi.po +Copyright: 2005-2009 Clytie Siddall +License: GPL-2 License: GPL-2 ucf is Copyright (C) 2002, 2003, 2003, 2004, 2005, 2006 Manoj diff -Nru ucf-3.0038/debian/po/de.po ucf-3.0038+nmu1/debian/po/de.po --- ucf-3.0038/debian/po/de.po 2018-02-26 00:58:23.000000000 +0000 +++ ucf-3.0038+nmu1/debian/po/de.po 2018-12-14 08:51:14.000000000 +0000 @@ -11,13 +11,13 @@ # Developers do not need to manually edit POT or PO files. # # Erik Schanze , 2004-2009. -# Holger Wansing , 2014. +# Holger Wansing , 2014, 2018. msgid "" msgstr "" -"Project-Id-Version: ucf 3.0028\n" +"Project-Id-Version: ucf 3.0037\n" "Report-Msgid-Bugs-To: ucf@packages.debian.org\n" "POT-Creation-Date: 2018-02-16 15:56-0800\n" -"PO-Revision-Date: 2014-05-22 20:42+0200\n" +"PO-Revision-Date: 2018-05-06 22:11+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: German \n" "Language: de\n" @@ -78,10 +78,8 @@ #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -#, fuzzy -#| msgid "show a 3-way difference between available versions" msgid "do a 3-way merge between available versions" -msgstr "3-Wege-Unterschiede verfügbarer Versionen anzeigen" +msgstr "eine 3-Wege-Zusammenführung der verfügbaren Versionen durchführen" #. Type: select #. Choices @@ -109,21 +107,17 @@ "version installed currently has been locally modified." msgstr "" "Eine neue Version (${NEW}) der Konfigurationsdatei ${FILE} ist verfügbar, " -"aber die installierte Version wurde verändert." +"aber die derzeit installierte Version wurde verändert." #. Type: select #. Description #: ../templates:4002 -#, fuzzy -#| msgid "" -#| "A new version (${NEW}) of configuration file ${FILE} is available, but " -#| "the version installed currently has been locally modified." msgid "" "${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " "available, but the version installed currently has been locally modified." msgstr "" -"Eine neue Version (${NEW}) der Konfigurationsdatei ${FILE} ist verfügbar, " -"aber die installierte Version wurde verändert." +"${BASENAME}: Eine neue Version (${NEW}) der Konfigurationsdatei ${FILE} ist " +"verfügbar, aber die derzeit installierte Version wurde verändert." #. Type: note #. Description @@ -135,7 +129,7 @@ #. Description #: ../templates:6001 msgid "Conflicts found in three-way merge" -msgstr "Konflikte bei der 3-Wege-Vereinigung" +msgstr "Konflikte bei der 3-Wege-Zusammenführung" #. Type: error #. Description @@ -144,7 +138,7 @@ "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 passen " +"Es wurden Konflikte bei der 3-Wege-Zusammenführung festgestellt! Bitte passen " "Sie die Datei »${dest_file}« selbst an, um die Konflikte zu beseitigen." #. Type: error @@ -155,7 +149,4 @@ "the configuration file." msgstr "" "Die Datei »${dest_file}.${ERR_SUFFIX}« enthält eine Aufzeichnung der " -"fehlgeschlagenen Vereinigung der Konfigurationsdateien." - -#~ msgid "do a 3-way merge between available versions (experimental)" -#~ msgstr "3-Wege-Vereinigung verfügbarer Versionen [experimentell]" +"fehlgeschlagenen Zusammenführung der Konfigurationsdateien." diff -Nru ucf-3.0038/debian/po/es.po ucf-3.0038+nmu1/debian/po/es.po --- ucf-3.0038/debian/po/es.po 2018-02-26 00:58:23.000000000 +0000 +++ ucf-3.0038+nmu1/debian/po/es.po 2018-12-14 08:51:14.000000000 +0000 @@ -32,7 +32,7 @@ "Project-Id-Version: ucf 3.0025\n" "Report-Msgid-Bugs-To: ucf@packages.debian.org\n" "POT-Creation-Date: 2018-02-16 15:56-0800\n" -"PO-Revision-Date: 2014-06-13 21:05-0300\n" +"PO-Revision-Date: 2018-02-19 23:45-0300\n" "Last-Translator: Matías Bellone \n" "Language-Team: Debian Spanish \n" "Language: es\n" @@ -93,10 +93,8 @@ #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -#, fuzzy -#| msgid "show a 3-way difference between available versions" msgid "do a 3-way merge between available versions" -msgstr "comparar a tres bandas las versiones disponibles" +msgstr "hacer una fusión a tres bandas de las versiones disponibles" #. Type: select #. Choices @@ -129,16 +127,12 @@ #. Type: select #. Description #: ../templates:4002 -#, fuzzy -#| msgid "" -#| "A new version (${NEW}) of configuration file ${FILE} is available, but " -#| "the version installed currently has been locally modified." msgid "" "${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " "available, but the version installed currently has been locally modified." msgstr "" -"Hay una nueva versión («${NEW}») del archivo de configuración «${FILE}» , " -"pero la versión que está instalada ha sido modificada localmente." +"${BASENAME}: Hay una nueva versión («${NEW}») del archivo de configuración " +"«${FILE}», pero la versión que está instalada ha sido modificada localmente." #. Type: note #. Description @@ -170,18 +164,4 @@ "the configuration file." msgstr "" "El archivo «${dest_file}.${ERR_SUFFIX}» tiene un registro del fallo de " -"fusión del archivo de configuración." - -#~ msgid "do a 3-way merge between available versions (experimental)" -#~ msgstr "fusionar a tres bandas las versiones disponibles (experimental)" - -#~ msgid "" -#~ "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 archivo de configuración ${FILE}, pero la " -#~ "versión que está instalada ha sido modificada localmente." - -#~| 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}?" +"fusión del archivo de configuración." \ No newline at end of file diff -Nru ucf-3.0038/debian/po/fr.po ucf-3.0038+nmu1/debian/po/fr.po --- ucf-3.0038/debian/po/fr.po 2018-02-26 00:58:23.000000000 +0000 +++ ucf-3.0038+nmu1/debian/po/fr.po 2018-12-14 08:51:14.000000000 +0000 @@ -6,19 +6,20 @@ # # Eric Madesclair , 2007. # Christian Perrier , 2009, 2014. +# Jean-Pierre Giraud , 2018. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: ucf@packages.debian.org\n" "POT-Creation-Date: 2018-02-16 15:56-0800\n" -"PO-Revision-Date: 2014-05-07 13:44+0200\n" -"Last-Translator: Christian Perrier \n" +"PO-Revision-Date: 2018-02-17 10:11+0100\n" +"Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. Type: title @@ -74,10 +75,9 @@ #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -#, fuzzy #| msgid "show a 3-way difference between available versions" msgid "do a 3-way merge between available versions" -msgstr "Montrer les différences entre les trois versions du fichier" +msgstr "Fusionner les différences entre les trois versions du fichier" #. Type: select #. Choices @@ -110,7 +110,6 @@ #. Type: select #. Description #: ../templates:4002 -#, fuzzy #| msgid "" #| "A new version (${NEW}) of configuration file ${FILE} is available, but " #| "the version installed currently has been locally modified." @@ -118,8 +117,9 @@ "${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " "available, but the version installed currently has been locally modified." msgstr "" -"Une nouvelle version (${NEW}) du fichier de configuration ${FILE} est " -"disponible mais la version actuellement utilisée a été modifiée localement." +"${BASENAME} : Une nouvelle version (${NEW}) du fichier de configuration " +"${FILE} est disponible mais la version actuellement utilisée a été modifiée " +"localement." #. Type: note #. Description