tags 605289 + pending
tags 658859 + pending
tags 687944 + patch
tags 687944 + pending
thanks

Dear maintainer,

I've prepared an NMU for mason (versioned as 1.0.0-12.3) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Die Schmetterlinge: Lied von der menschlichen Gemeinheit
diff -u mason-1.0.0/debian/changelog mason-1.0.0/debian/changelog
--- mason-1.0.0/debian/changelog
+++ mason-1.0.0/debian/changelog
@@ -1,3 +1,25 @@
+mason (1.0.0-12.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "modifies conffiles (policy 10.7.3): /etc/masonrc"
+    follow debconf-devel(7):
+    - install masonrc to /usr/share/mason instead of /etc
+    - config: read values from file and put them into debconf db
+    - postinst/configure: replace values in file with values from debconf
+    - postrm/purge: remove file
+    (Closes: #687944)
+  * Additional changes:
+    - remove broken (as in: triggers ftp-master auto-reject) lintian-override
+    - empty (but don't remove, it's in the .orig.tar.gz) useless
+      debian/conffiles
+  * Debconf translations:
+    - Brazilian Portuguese: update (Flamarion Jorge). Closes: #605289
+    - Dutch: update (Jeroen Schot). Closes: #658859
+    - Danish, Swedish, Norwegian BokmÄl: fix encoding.
+    - Drop almost empty no.po, as recommended by po2debconf.
+
+ -- gregor herrmann <gre...@debian.org>  Mon, 01 Oct 2012 20:47:17 +0200
+
 mason (1.0.0-12.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u mason-1.0.0/debian/postrm mason-1.0.0/debian/postrm
--- mason-1.0.0/debian/postrm
+++ mason-1.0.0/debian/postrm
@@ -22,6 +22,7 @@
 	rm -rf /var/lib/mason
 	rm -rf /var/log/mason
 	rm -rf /etc/mason.d
+	rm -f  /etc/masonrc /etc/masonrc.tmp
 	# Garbage collection: Remove library mason-decide that was moved to /var/lib/mason in version 1.0.0-10 of this package
 	if [ -f /usr/bin/mason-decide ]; then
 	    rm -f /usr/bin/mason-decide;
diff -u mason-1.0.0/debian/config mason-1.0.0/debian/config
--- mason-1.0.0/debian/config
+++ mason-1.0.0/debian/config
@@ -1,15 +1,20 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+ 
+CONFIGFILE=/etc/masonrc
 
 . /usr/share/debconf/confmodule
 
-db_input medium mason/newrulepolicy || true
-db_go
+# Load config file, if it exists.
+if [ -e $CONFIGFILE ]; then
+	. $CONFIGFILE || true
+	# Store values from config file into
+	# debconf db.
+	db_set mason/newrulepolicy "$NEWRULEPOLICY"
+	db_set mason/defaultpolicy "$DEFAULTPOLICY"
+fi
 
+db_input medium mason/newrulepolicy || true
 db_input medium mason/defaultpolicy || true
-db_go
-
-db_input medium mason/savepacketstats || true
-db_go
-
-db_input medium mason/service2restart || true
-db_go
+db_go || true
reverted:
--- mason-1.0.0/debian/mason.lintian-overrides
+++ mason-1.0.0.orig/debian/mason.lintian-overrides
@@ -1 +0,0 @@
-non-etc-file-marked-as-conffile /var/lib/mason/baserules
diff -u mason-1.0.0/debian/rules mason-1.0.0/debian/rules
--- mason-1.0.0/debian/rules
+++ mason-1.0.0/debian/rules
@@ -40,6 +40,7 @@
 	mkdir -p `pwd`/debian/mason/etc/init.d
 	mkdir -p `pwd`/debian/mason/etc/mason.d/restart.d
 	mkdir -p `pwd`/debian/mason/var/log/mason
+	mkdir -p `pwd`/debian/mason/usr/share/mason
 
 	# Add here commands to install the package into debian/mason.
 	$(MAKE) install DESTDIR=`pwd`/debian/mason \
@@ -55,6 +56,7 @@
 	chmod +x debian/mason/var/lib/mason/regression-test
 	mv debian/mason/var/lib/mason/baserules debian/mason/etc/mason.baserules
 	ln -sf /etc/mason.baserules debian/mason/var/lib/mason/baserules
+	mv debian/mason/etc/masonrc debian/mason/usr/share/mason/
 
 	touch install-stamp
 
diff -u mason-1.0.0/debian/postinst mason-1.0.0/debian/postinst
--- mason-1.0.0/debian/postinst
+++ mason-1.0.0/debian/postinst
@@ -22,18 +22,35 @@
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+CONFIGFILE=/etc/masonrc
+
 # We now use debconf
 . /usr/share/debconf/confmodule
 
 case "$1" in
     configure)
-	if [ `egrep '^[:space:]*NEWRULEPOLICY' /etc/masonrc | wc -l` -eq 0 ]
-	then
-            db_get mason/newrulepolicy
-            echo "NEWRULEPOLICY=$RET" >> /etc/masonrc
-            db_get mason/defaultpolicy
-            echo "DEFAULTPOLICY=$RET" >> /etc/masonrc
+	# Copy template if necessary
+	if [ ! -e $CONFIGFILE ]; then
+		cp /usr/share/mason/masonrc $CONFIGFILE
 	fi
+
+	# Get debconf values
+	db_get mason/newrulepolicy
+	NEWRULEPOLICY="$RET"
+	db_get mason/defaultpolicy
+	DEFAULTPOLICY="$RET"
+	cp -a -f $CONFIGFILE $CONFIGFILE.tmp
+
+	# If the admin deleted or commented some variables but then set
+	# them via debconf, (re-)add them to the conffile.
+	test -z "$NEWRULEPOLICY" || grep -Eq '^ *NEWRULEPOLICY=' $CONFIGFILE || echo "NEWRULEPOLICY=" >> $CONFIGFILE
+	test -z "$DEFAULTPOLICY" || grep -Eq '^ *DEFAULTPOLICY=' $CONFIGFILE || echo "DEFAULTPOLICY=" >> $CONFIGFILE
+
+	sed -e "s/^ *NEWRULEPOLICY=.*/NEWRULEPOLICY=\"$NEWRULEPOLICY\"/" \
+	    -e "s/^ *DEFAULTPOLICY=.*/DEFAULTPOLICY=\"$DEFAULTPOLICY\"/" \
+	    < $CONFIGFILE > $CONFIGFILE.tmp
+	mv -f $CONFIGFILE.tmp $CONFIGFILE
+
 	update-rc.d -f mason remove > /dev/null
 	update-rc.d mason start 41 S . > /dev/null
 	# Garbage collection: Remove library mason-decide that was moved to /var/lib/mason in version 1.0.0-10 of this package
reverted:
--- mason-1.0.0/debian/po/no.po
+++ mason-1.0.0.orig/debian/po/no.po
@@ -1,95 +0,0 @@
-#
-#    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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-29 22:07+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: select
-#. Choices
-#. Type: select
-#. Choices
-#: ../templates:1001 ../templates:2001
-msgid "accept"
-msgstr "tillat"
-
-#. Type: select
-#. Choices
-#. Type: select
-#. Choices
-#: ../templates:1001 ../templates:2001
-msgid "reject"
-msgstr "avvis"
-
-#. Type: select
-#. Choices
-#. Type: select
-#. Choices
-#: ../templates:1001 ../templates:2001
-msgid "deny"
-msgstr "nekt"
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid "Default action for new firewall rules:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid ""
-"The new rule default action specifies how Mason will handle unknown packets, "
-"when the firewall is in learning mode."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid ""
-"The \"accept\" action will allow the packet through.  \"Reject\" will stop "
-"the packet with a rejection reply, while \"deny\" will drop the packet "
-"silently."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2002
-msgid "Default action for rulesets:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2002
-msgid ""
-"The default action specifies how Mason will handle unknown packets, when the "
-"firewall is not in learning mode."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2002
-msgid ""
-"Again, \"accept\" allows the packet through, \"reject\" drops the packet "
-"with a reply, and \"deny\" silently drops the packet."
-msgstr ""
diff -u mason-1.0.0/debian/po/pt_BR.po mason-1.0.0/debian/po/pt_BR.po
--- mason-1.0.0/debian/po/pt_BR.po
+++ mason-1.0.0/debian/po/pt_BR.po
@@ -7,22 +7,24 @@
 # /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.
-#
+# Felipe Augusto van de Wiel (faw) <fel...@cathedrallabs.org>, 2010.
+# Flamarion Jorge <jorge.flamar...@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mason 1.0.0\n"
+"Project-Id-Version: mason 1.0.0-12.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-29 22:07+0200\n"
-"PO-Revision-Date: 2005-03-25 05:09-0300\n"
-"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
+"PO-Revision-Date: 2010-11-11 22:48-0200\n"
+"Last-Translator: Flamarion Jorge <jorge.flamar...@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
-"Language-Team: Portuguese/Brazil <debian-l10n-portugu...@lists.debian.org>\n"
 "Language: \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"
 "pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. Type: select
 #. Choices
@@ -52,7 +54,7 @@
 #. Description
 #: ../templates:1002
 msgid "Default action for new firewall rules:"
-msgstr "Açăo \"default\" para novas regras de firewall:"
+msgstr "Ação padrão para novas regras de firewall:"
 
 #. Type: select
 #. Description
@@ -61,6 +63,8 @@
 "The new rule default action specifies how Mason will handle unknown packets, "
 "when the firewall is in learning mode."
 msgstr ""
+"A ação padrão para nova regra especifica como o Mason manipularå pacotes "
+"desconhecidos quando o firewall estiver no modo de aprendizado."
 
 #. Type: select
 #. Description
@@ -70,15 +74,15 @@
 "the packet with a rejection reply, while \"deny\" will drop the packet "
 "silently."
 msgstr ""
-"A açăo \"aceitar (accept)\" permitirá que o pacote passe. \"Rejeitar "
-"(reject)\" vai parar o pacote com uma resposta de rejeiçăo, enquanto \"negar "
-"(deny)\" vai descartar o pacote silenciosamente."
+"A ação \"aceitar\" permitirå passar o pacote. \"Rejeitar\" pararå o pacote "
+"com uma resposta de rejeição, enquanto \"negar\" descartarå o pacote "
+"silenciosamente."
 
 #. Type: select
 #. Description
 #: ../templates:2002
 msgid "Default action for rulesets:"
-msgstr "Açăo \"default\" para os conjuntos de regras:"
+msgstr "Ação padrão para conjuntos de regras:"
 
 #. Type: select
 #. Description
@@ -87,6 +91,8 @@
 "The default action specifies how Mason will handle unknown packets, when the "
 "firewall is not in learning mode."
 msgstr ""
+"A regra padrĂŁo especifica como o Mason manipularĂĄ pacotes desconhecidos "
+"quando o firewall nĂŁo estiver no modo de aprendizado."
 
 #. Type: select
 #. Description
@@ -95,9 +101,8 @@
 "Again, \"accept\" allows the packet through, \"reject\" drops the packet "
 "with a reply, and \"deny\" silently drops the packet."
 msgstr ""
-"Novamente, \"aceitar (accept)\" permite que o pacote passe, \"rejeitar "
-"(reject)\" descarta o pacote com uma resposta, e \"negar (deny)\" "
-"silenciosamente descarta o pacote."
+"Novamente, \"aceitar\" permite passar o pacote, \"rejeitar\" descarta o "
+"pacote com uma resposta, e \"negar\" descarta silenciosamente o pacote."
 
 #~ msgid "accept, reject, deny"
 #~ msgstr "aceitar, rejeitar, negar"
@@ -108,10 +113,10 @@
 #~ msgstr ""
-#~ "Quando Mason detectar um novo tipo de tráfego e criar uma nova regra para "
-#~ "ele, qual açăo a regra deve tomar?"
+#~ "Quando Mason detectar um novo tipo de trĂĄfego e criar uma nova regra para "
+#~ "ele, qual ação a regra deve tomar?"
 
 #~ msgid ""
 #~ "What should the default action be when a packet does not match any of the "
 #~ "rules set up by Mason?"
 #~ msgstr ""
-#~ "Qual deverá ser a açăo \"default\" quando um pacote năo se encaixar em "
+#~ "Qual deverå ser a ação \"default\" quando um pacote não se encaixar em "
 #~ "nenhum dos conjuntos de regras configurados no Mason?"
diff -u mason-1.0.0/debian/po/nb.po mason-1.0.0/debian/po/nb.po
--- mason-1.0.0/debian/po/nb.po
+++ mason-1.0.0/debian/po/nb.po
@@ -8,7 +8,7 @@
 "POT-Creation-Date: 2010-06-29 22:07+0200\n"
 "PO-Revision-Date: 2005-03-29 23:08+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <h...@nordhaug.priv.no>\n"
-"Language-Team: Norwegian Bokmćl <i18n...@lister.ping.uio.no>\n"
+"Language-Team: Norwegian BokmÄl <i18n...@lister.ping.uio.no>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -60,8 +60,8 @@
 "the packet with a rejection reply, while \"deny\" will drop the packet "
 "silently."
 msgstr ""
-"«tillat»-handlingen vil tillate pakken. «avvis» vil stoppe pakken med et "
-"avvisningssvar, mens «nekt» vil droppe pakken uten ć melde tilbake."
+"«tillat»-handlingen vil tillate pakken. «avvis» vil stoppe pakken med et " 
+"avvisningssvar, mens «nekt» vil droppe pakken uten Ä melde tilbake." 
 
 #. Type: select
 #. Description
@@ -84,8 +84,8 @@
 "Again, \"accept\" allows the packet through, \"reject\" drops the packet "
 "with a reply, and \"deny\" silently drops the packet."
 msgstr ""
-"Igjen, «tillat»-handlingen vil tillate pakken. «avvis» vil stoppe pakken med "
-"et avvisningssvar, mens «nekt» vil droppe pakken uten ć melde tilbake."
+"Igjen, «tillat»-handlingen vil tillate pakken. «avvis» vil stoppe pakken med " 
+"et avvisningssvar, mens «nekt» vil droppe pakken uten Ä melde tilbake." 
 
 #~ msgid "accept, reject, deny"
 #~ msgstr "tillat, avvis, nekt"
@@ -97,9 +97,9 @@
-#~ "Nćr Mason opdager en ny type trafikk og lager en regel for det, hvilken "
-#~ "handling skal regelen sć ta?"
+#~ "NĂ„r Mason opdager en ny type trafikk og lager en regel for det, hvilken " 
+#~ "handling skal regelen sÄ ta?" 
 
 #~ msgid ""
 #~ "What should the default action be when a packet does not match any of the "
 #~ "rules set up by Mason?"
 #~ msgstr ""
-#~ "Hva skal være standard handling, nćr en pakke ikke passer til noen av "
-#~ "reglene satt opp av Mason?"
+#~ "Hva skal vÊre standard handling, nÄr en pakke ikke passer til noen av " 
+#~ "reglene satt opp av Mason?" 
diff -u mason-1.0.0/debian/po/sv.po mason-1.0.0/debian/po/sv.po
--- mason-1.0.0/debian/po/sv.po
+++ mason-1.0.0/debian/po/sv.po
@@ -33,7 +33,7 @@
 #. Choices
 #: ../templates:1001 ../templates:2001
 msgid "reject"
-msgstr "förkasta"
+msgstr "förkasta"
 
 #. Type: select
 #. Choices
@@ -47,7 +47,7 @@
 #. Description
 #: ../templates:1002
 msgid "Default action for new firewall rules:"
-msgstr "StandardÄtgÀrd för nya brandsvÀggsregler:"
+msgstr "StandardÄtgÀrd för nya brandsvÀggsregler:"
 
 #. Type: select
 #. Description
@@ -56,8 +56,8 @@
 "The new rule default action specifies how Mason will handle unknown packets, "
 "when the firewall is in learning mode."
 msgstr ""
-"StandardÄtgÀrden anger hur Mason ska hantera okÀnda paket nÀr brandvÃ"
-"€ggen Àr i upplÀrningslÀget."
+"StandardÄtgÀrden anger hur Mason ska hantera okÀnda paket nÀr brandvÀggen "
+"Àr i upplÀrningslÀget."
 
 #. Type: select
 #. Description
@@ -67,14 +67,14 @@
 "the packet with a rejection reply, while \"deny\" will drop the packet "
 "silently."
 msgstr ""
-"\"Acceptera\" slÀpper igenom paketet. \"Förkasta\" kastar paketet och "
-"skickar ett svar medans \"neka\" kastar paketet utan att informera nÄgon."
+"\"Acceptera\" slÀpper igenom paketet. \"Förkasta\" kastar paketet och "
+"skickar ett svar medans \"neka\" kastar paketet utan att informera nÄgon."
 
 #. Type: select
 #. Description
 #: ../templates:2002
 msgid "Default action for rulesets:"
-msgstr "StandardÄtgÀrd för regeluppsÀttning:"
+msgstr "StandardÄtgÀrd för regeluppsÀttning:"
 
 #. Type: select
 #. Description
@@ -83,8 +83,8 @@
 "The default action specifies how Mason will handle unknown packets, when the "
 "firewall is not in learning mode."
 msgstr ""
-"StandardÄtgÀrden anger hur Mason ska hantera okÀnda paket nÀr brandvÃ"
-"€ggen inte Àr i upplÀrningslÀget."
+"StandardÄtgÀrden anger hur Mason ska hantera okÀnda paket nÀr brandvÀggen "
+"inte Àr i upplÀrningslÀget."
 
 #. Type: select
 #. Description
@@ -93,8 +93,8 @@
 "Again, \"accept\" allows the packet through, \"reject\" drops the packet "
 "with a reply, and \"deny\" silently drops the packet."
 msgstr ""
-"Igen, \"acceptera\" slÀpper igenom paketet, \"förkasta\" kastar paketet "
-"och skickar ett svar och \"neka\" kastar paketet utan att informera nÄgon."
+"Igen, \"acceptera\" slÀpper igenom paketet, \"förkasta\" kastar paketet "
+"och skickar ett svar och \"neka\" kastar paketet utan att informera nÄgon."
 
 #~ msgid "accept, reject, deny"
 #~ msgstr "acceptera, förkasta, neka"
diff -u mason-1.0.0/debian/po/da.po mason-1.0.0/debian/po/da.po
--- mason-1.0.0/debian/po/da.po
+++ mason-1.0.0/debian/po/da.po
@@ -1,5 +1,5 @@
 # Danish translation mason.
-# Copyright (C) 2010 mason & nedenst??ende overs??ttere.
+# Copyright (C) 2010 mason & nedenstÄende oversÊttere.
 # This file is distributed under the same license as the mason package.
 # Claus Hindsgaul <clau...@image.dk>, 2005.
 # Joe Hansen <joedalt...@yahoo.dk>, 2010.
@@ -39,7 +39,7 @@
 #. Choices
 #: ../templates:1001 ../templates:2001
 msgid "deny"
-msgstr "n??gt"
+msgstr "nĂŠgt"
 
 #. Type: select
 #. Description
@@ -54,8 +54,8 @@
 "The new rule default action specifies how Mason will handle unknown packets, "
 "when the firewall is in learning mode."
 msgstr ""
-"Den nye regelstandardhandling angiver hvordan Mason vil h??ndtere ukendte "
-"pakker, n??r brandmuren er i l??retilstand."
+"Den nye regelstandardhandling angiver hvordan Mason vil hÄndtere ukendte "
+"pakker, nÄr brandmuren er i lÊretilstand."
 
 #. Type: select
 #. Description
@@ -65,15 +65,15 @@
 "the packet with a rejection reply, while \"deny\" will drop the packet "
 "silently."
 msgstr ""
-"Handlingen ??accepter?? vil lade pakken passere, ??afvis?? vil stoppe pakken "
-"med et afvisningssvar, imens ??n??gt?? vil smide pakken v??k uden at melde "
+"Handlingen »accepter« vil lade pakken passere, »afvis« vil stoppe pakken "
+"med et afvisningssvar, imens »nÊgt« vil smide pakken vÊk uden at melde "
 "tilbage."
 
 #. Type: select
 #. Description
 #: ../templates:2002
 msgid "Default action for rulesets:"
-msgstr "Standardhandling for regels??t:"
+msgstr "Standardhandling for regelsĂŠt:"
 
 #. Type: select
 #. Description
@@ -82,8 +82,8 @@
 "The default action specifies how Mason will handle unknown packets, when the "
 "firewall is not in learning mode."
 msgstr ""
-"Standardhandlingen angiver hvordan Mason vil h??ndtere ukendte pakker, n??r "
-"brandmuren ikke er i l??retilstand."
+"Standardhandlingen angiver hvordan Mason vil hÄndtere ukendte pakker, nÄr "
+"brandmuren ikke er i lĂŠretilstand."
 
 #. Type: select
 #. Description
@@ -95,6 +95,6 @@
-"Igen vil handlingen ??accepter?? lade pakken passere, ??afvis?? vil stoppe "
-"pakken med et afvisningssvar, mens ??n??gt?? vil smide pakken ud uden at "
+"Igen vil handlingen »accepter« lade pakken passere, »afvis« vil stoppe "
+"pakken med et afvisningssvar, mens »nÊgt« vil smide pakken ud uden at " 
 "melde tilbage."
 
 #~ msgid "accept, reject, deny"
-#~ msgstr "accepter, afvis, n??gt"
+#~ msgstr "accepter, afvis, nĂŠgt"
diff -u mason-1.0.0/debian/po/nl.po mason-1.0.0/debian/po/nl.po
--- mason-1.0.0/debian/po/nl.po
+++ mason-1.0.0/debian/po/nl.po
@@ -1,21 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the  package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Dutch translation of mason debconf templates.
+# Copyright (C) 2007-2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mason package.
+# Bart Cornelis <cob...@skolelinux.no>, 2007.
+# Jeroen Schot <sc...@a-eskwadraat.nl>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mason\n"
+"Project-Id-Version: mason 1.0.0-12.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-29 22:07+0200\n"
-"PO-Revision-Date: 2007-10-26 20:16+0100\n"
-"Last-Translator: Bart Cornelis <cob...@skolelinux.no>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-du...@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2012-02-06 14:39+0100\n"
+"Last-Translator: Jeroen Schot <sc...@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-du...@lists.debian.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
 
 #. Type: select
 #. Choices
@@ -54,6 +54,8 @@
 "The new rule default action specifies how Mason will handle unknown packets, "
 "when the firewall is in learning mode."
 msgstr ""
+"De nieuw-standaardactie geeft aan hoe Mason zal omgaan met onbekende "
+"pakketten wanneer de firewall zich in leermodus bevindt."
 
 #. Type: select
 #. Description
@@ -80,6 +82,8 @@
 "The default action specifies how Mason will handle unknown packets, when the "
 "firewall is not in learning mode."
 msgstr ""
+"De standaardactie geeft aan hoe Mason zal omgaan met onbekende pakketten "
+"wanneer de firewall zich niet in leermodus bevindt."
 
 #. Type: select
 #. Description
@@ -94,17 +97,0 @@
-
-#~ msgid "accept, reject, deny"
-#~ msgstr "aanvaarden, verwerpen, niet toelaten"
-
-#~ msgid ""
-#~ "When Mason detects a new kind of traffic and creates a rule for it, what "
-#~ "action should the rule take?"
-#~ msgstr ""
-#~ "Welke actie moeten regels die door Mason voor nieuwe soorten verkeer "
-#~ "aangemaakt worden nemen?"
-
-#~ msgid ""
-#~ "What should the default action be when a packet does not match any of the "
-#~ "rules set up by Mason?"
-#~ msgstr ""
-#~ "Wat dient de standaardactie te zijn wanneer een pakket niet overeenkomt "
-#~ "met een door Mason gedefinieerde regel?"
only in patch2:
unchanged:
--- mason-1.0.0.orig/debian/conffiles
+++ mason-1.0.0/debian/conffiles
@@ -1,3 +0,0 @@
-/etc/masonrc
-/etc/init.d/mason
-/var/lib/mason/baserules

Attachment: signature.asc
Description: Digital signature

Reply via email to