New version with translations

This commit:
+ Updated spanish translation.
+ Updated the template files.
+ Update the policy version (No changes required)
+ Update the copyright file format

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

6 files changed, 59 insertions, 49 deletions

diff --git a/debian/changelog b/debian/changelog
index 2ed5083..40a9e9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+ucf (3.0031) unstable; urgency=low
+
+  * New bugfixing release
+  * Bug fix: "[INTL:es] Spanish translation of debconf messages", thanks
+    to Matias A. Bellone                                (Closes: #752959).
+  * Bug fix: "incorrectly processed VERBOSE&DEBUG in config", thanks
+    to YK. Correctly send the verbose output to STDERR, not STDOUt.
+                                                         (Closes: #762857).
+  * Bug fix: "[INTL:nl] Dutch translation of debconf messages", thanks to
+    Frans Spiesschaert (Closes: #763459).
+  * Update the policy version to the latest. No changes were required.
+  * Update the copyright file to follow DEP-5 format.
+
+ -- Manoj Srivastava <srivasta@debian.org>  Thu, 05 Nov 2015 12:25:03 -0800
+
 ucf (3.0030) unstable; urgency=low
 
   * Updated german translations. (Closes: #748975).
diff --git a/debian/control b/debian/control
index 9fc175f..8313948 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: utils
 Priority: standard
 Maintainer: Manoj Srivastava <srivasta@debian.org>
 Build-Depends-Indep: po-debconf, gettext, debhelper (>= 9.0.0)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: ucf
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 047ada6..8f41fc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,32 @@
-This is the Debian GNU/Linux packa for ucf.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ucf
+Upstream-Contact:  Manoj Srivastava <srivasta@debian.org>
+Source: git://anonscm.debian.org/users/srivasta/debian/ucf.git
+Copyright: 2002, 2003, 2003, 2004, 2005, 2006, 2015 Manoj Srivastava <srivasta@debian.org>
+License: GPL-2
 
-ucf is Copyright (C) 2002, 2003, 2003, 2004, 2005, 2006 Manoj
-Srivastava <srivasta@debian.org>
+Files: *
+Copyright: 2002, 2003, 2003, 2004, 2005, 2006, 2015 Manoj Srivastava <srivasta@debian.org>
+License: GPL-2
 
+
+License: GPL-2
+   ucf is Copyright (C) 2002, 2003, 2003, 2004, 2005, 2006 Manoj
+   Srivastava <srivasta@debian.org>
+   .
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 dated June, 1991.
-
+   .
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'. 
-
-    A copy of the GNU General Public License is also available at
-    <URL:http://www.gnu.org/copyleft/gpl.html>.  You may also obtain
-    it by writing to the Free Software Foundation, Inc., 51 Franklin
-    St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Manoj Srivastava <srivasta@debian.org>
-arch-tag: d4250e44-a0e0-4ee0-adb9-2bd74f6eeb27
+   .
+   On Debian GNU/Linux systems, the complete text of the GNU General
+   Public License can be found in `/usr/share/common-licenses/GPL-2'.
+   .
+   A copy of the GNU General Public License is also available at
+   <URL:http://www.gnu.org/copyleft/gpl.html>.  You may also obtain
+   it by writing to the Free Software Foundation, Inc., 51 Franklin
+   St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/debian/po/es.po b/debian/po/es.po
index 8452bf6..3bba235 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -1,5 +1,5 @@
 # ucf translation to spanish
-# Copyright (C) 2004-2007 Software in the Public Interest
+# Copyright (C) 2004-2014 Software in the Public Interest
 # This file is distributed under the same license as the ucf package.
 #
 # Changes:
@@ -7,7 +7,7 @@
 #       Lucas Wall <kthulhu@usa.net>, 2004
 # - Updated 
 #       Javier Fernandez-Sanguino <jfs@debian.org>, 2007, 2010
-#
+#       Matías Bellone <matiasbellone+debian@gmail.com>, 2014
 #
 #  Traductores, si no conoce el formato PO, merece la pena leer la 
 #  documentación de gettext, especialmente las secciones dedicadas a este
@@ -32,20 +32,19 @@ msgstr ""
 "Project-Id-Version: ucf 3.0025\n"
 "Report-Msgid-Bugs-To: ucf@packages.debian.org\n"
 "POT-Creation-Date: 2014-05-07 01:28-0700\n"
-"PO-Revision-Date: 2010-08-08 01:53+0200\n"
-"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
+"PO-Revision-Date: 2014-06-13 21:05-0300\n"
+"Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\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 "Archivo de configuración modificado"
 
 #. Type: select
 #. Choices
@@ -88,14 +87,14 @@ msgstr "mostrar las diferencias entre las versiones lado a lado"
 #. Translators, please keep translations *short* (less than 65 columns)
 #: ../templates:3001
 msgid "show a 3-way difference between available versions"
-msgstr "mostrar las diferencias entre las tres versiones"
+msgstr "comparar a tres bandas las versiones disponibles"
 
 #. 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 "fusionar las tres versiones disponibles (experimental)"
+msgstr "fusionar a tres bandas las versiones disponibles (experimental)"
 
 #. Type: select
 #. Choices
@@ -104,7 +103,7 @@ msgstr "fusionar las tres versiones disponibles (experimental)"
 #. 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 analizar la situación"
 
 #. Type: select
 #. Description
@@ -113,23 +112,19 @@ msgstr "ejecutar un nuevo intérprete para examinar la situación"
 #: ../templates:3002 ../templates:4002
 msgid "What do you want to do about modified configuration file ${BASENAME}?"
 msgstr ""
-"¿Qué desea hacer con el fichero de configuración modificado ${BASENAME}?"
+"¿Qué desea hacer con el archivo de configuración modificado «${BASENAME}»?"
 
 #. Type: select
 #. Description
 #. Type: select
 #. Description
 #: ../templates:3002 ../templates:4002
-#, fuzzy
-#| msgid ""
-#| "A new version of configuration file ${FILE} is available, but the version "
-#| "installed currently has been locally modified."
 msgid ""
 "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 del fichero de configuración ${FILE}, pero la versión "
-"que está instalada ha sido modificada localmente."
+"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
@@ -141,7 +136,7 @@ msgstr "Mostrar las diferencias línea a línea entre las versiones"
 #. Description
 #: ../templates:6001
 msgid "Conflicts found in three-way merge"
-msgstr "Se encontraron conflictos al intentar integrar a tres bandas"
+msgstr "Se encontraron conflictos al intentar fusionar a tres bandas"
 
 #. Type: error
 #. Description
@@ -150,8 +145,8 @@ msgid ""
 "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."
+"¡Se encontraron conflictos al intentar la fusionar a tres bandas! Edite "
+"«${dest_file}» y resuélvalos manualmente."
 
 #. Type: error
 #. Description
@@ -160,17 +155,16 @@ msgid ""
 "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."
+"El archivo «${dest_file}.${ERR_SUFFIX}» tiene un registro del fallo de "
+"fusión del archivo de configuración."
 
 #~ 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 fichero de configuración ${FILE}, pero la "
+#~ "Hay una nueva versión del archivo de configuración ${FILE}, pero la "
 #~ "versión que está instalada ha sido modificada localmente."
 
-#, 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}?"
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 08dab0c..8aacef3 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -108,16 +108,12 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:3002 ../templates:4002
-#| msgid ""
-#| "A new version of configuration file ${FILE} is available, but the version "
-#| "installed currently has been locally modified."
 msgid ""
 "A new version (${NEW}) of configuration file ${FILE} is available, but the "
 "version installed currently has been locally modified."
 msgstr ""
-"Dostępna jest nowa wersja (${NEW}) pliku konfiguracyjnego ${FILE}, ale obecna "
-"wersja "
-"została lokalnie zmodyfikowana."
+"Dostępna jest nowa wersja (${NEW}) pliku konfiguracyjnego ${FILE}, ale "
+"obecna wersja została lokalnie zmodyfikowana."
 
 #. Type: note
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 33440b4..7d136d8 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -97,9 +97,6 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:3002 ../templates:4002
-#| msgid ""
-#| "A new version of configuration file ${FILE} is available, but the version "
-#| "installed currently has been locally modified."
 msgid ""
 "A new version (${NEW}) of configuration file ${FILE} is available, but the "
 "version installed currently has been locally modified."