Updated dutch translationdebian/3.0032

Bug fix: "[INTL:nl] Dutch translation of debconf messages", thanks to
Frans Spiesschaert (Closes: #812354).

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

2 files changed, 23 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 40a9e9f..ce049c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ucf (3.0032) unstable; urgency=low
+
+  * Ran shellcheck on all the shell scripts, and fixed most of the issues
+    found.
+  * Bug fix: "[INTL:nl] Dutch translation of debconf messages", thanks to
+    Frans Spiesschaert (Closes: #812354).
+
+ -- Manoj Srivastava <srivasta@debian.org>  Fri, 22 Jan 2016 18:23:28 -0800
+
 ucf (3.0031) unstable; urgency=low
 
   * New bugfixing release
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 91be9d8..fd6304a 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -3,19 +3,22 @@
 # This file is distributed under the same license as the ucf package.
 # Kurt De Bree <kdebree@telenet.be>, 2006.
 # Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ucf_3.0025\n"
+"Project-Id-Version: ucf_3.0031\n"
 "Report-Msgid-Bugs-To: ucf@packages.debian.org\n"
 "POT-Creation-Date: 2014-05-07 01:28-0700\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"
+"PO-Revision-Date: 2016-01-12 23:14+0100\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\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"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #. Type: title
 #. Description
@@ -71,7 +74,7 @@ msgstr "toon een 3-voudig verschil tussen de beschikbare versies"
 #. Translators, please keep translations *short* (less than 65 columns)
 #: ../templates:3001
 msgid "do a 3-way merge between available versions (experimental)"
-msgstr "doe een 3-voudige samenvoeging tussen beschikbare versies (test)"
+msgstr "een 3-voudige samenvoeging tussen beschikbare versies (testfase)"
 
 #. Type: select
 #. Choices
@@ -95,7 +98,6 @@ msgstr "Wat wilt u met het aangepaste configuratiebestand ${BASENAME} doen?"
 #. 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."
@@ -103,8 +105,8 @@ msgid ""
 "A new version (${NEW}) of configuration file ${FILE} is available, but the "
 "version installed currently has been locally modified."
 msgstr ""
-"Een nieuwe versie van het configuratiebestand ${FILE} is beschikbaar, maar "
-"de geïnstalleerde versie is lokaal gewijzigd."
+"Een nieuwe versie (${NEW}) van het configuratiebestand ${FILE} is "
+"beschikbaar, maar de geïnstalleerde versie is lokaal gewijzigd."
 
 #. Type: note
 #. Description
@@ -116,7 +118,7 @@ msgstr "Toon de verschillen tussen de versies"
 #. Description
 #: ../templates:6001
 msgid "Conflicts found in three-way merge"
-msgstr "Conflicten gevonden in de drievoudige samenvoeging"
+msgstr "Tegenstrijdigheden gevonden in de drievoudige samenvoeging"
 
 #. Type: error
 #. Description
@@ -125,8 +127,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."
+"Tegenstrijdigheden gevonden tijdens de drievoudige samenvoeging! Wijzig "
+"alstublieft `${dest_file}` handmatig om dit op te lossen."
 
 #. Type: error
 #. Description