[Pkg-cups-devel] r666 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/local debian/local/filters debian/patches debian/po

Wed Jan 2 12:39:01 UTC 2008

Author: mpitt
Date: Wed Jan  2 12:39:01 2008
New Revision: 666

Log:
merge with trunk

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/local/acroread.conf
   cupsys/branches/cups-1.2-ubuntu/debian/local/pdftops.conf
   cupsys/branches/cups-1.2-ubuntu/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
Removed:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch
Modified:
   cupsys/branches/cups-1.2-ubuntu/   (props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install
   cupsys/branches/cups-1.2-ubuntu/debian/local/filters/pdftops
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
   cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/cs.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/da.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/de.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/es.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/fi.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/gl.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/it.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/ja.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/nb.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/pt.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/ru.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/sv.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/templates.pot
   cupsys/branches/cups-1.2-ubuntu/debian/po/tr.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================

--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Wed Jan  2 12:39:01 2008
@@ -1,3 +1,73 @@
+cupsys (1.3.5-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian unstable; remaining Ubuntu changes:
+    - TearDown (fast shutdown):
+      + debian/control: Add sysv-rc (>= 2.86.ds1-14.1ubuntu2) dependency.
+      + debian/rules: Use 'multiuser' update-rc.d mode.
+    - debian/control, debian/rules: Drop cupsys-dbg package.
+    - debian/cupsys.{pre,post}inst, debian/cupsys.preinst: Various upgrade
+      fixes that need to be kept until after the next LTS:
+      + Revert to single cupsd.conf file.
+      + Remove obsolete rc.d links.
+      + Revert usr/share/doc symlink/directory breakage.
+    - debian/patches/ubuntu-default-error-policy-retry-job.dpatch: Retry a
+      failed job instead of stopping the print queue.
+    - debian/patches/ubuntu-disable-browsing.dpatch: Disable browsing by
+      default.
+    - Add AppArmor profile:
+      + debian/local/apparmor-profile
+      + debian/cupsys.postinst: Reload AA profile on configuration.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Wed, 02 Jan 2008 13:29:53 +0100
+
+cupsys (1.3.5-1) unstable; urgency=high
+
+  [ Kenshi Muto]
+  * New upstream release
+    - cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress patch is
+      merged.
+    - Fix that SNMP backend did not check for negative string lengths.
+      (CVE-2007-5849, closes: #457453).
+  * Update pdftops.pl to 1.20. It fixes overwriting arbitary files
+    via symlink attack. (CVE-2007-6358, closes: #456960)
+
+  [ Till Kamppeter ]
+  * debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch :
+    Fix a regression in upstream code that has removed the network interface
+    update poll (CUPS STR #2631, LP: #177075). Thanks to Hugues Fournier
+    (hugues dot fournier at gmail dot com) for the patch.
+
+ -- Kenshi Muto <kmuto at debian.org>  Wed, 19 Dec 2007 17:07:05 +0900
+
+cupsys (1.3.4-4) unstable; urgency=high
+
+  [ Kenshi Muto]
+  * cupsys depends on "ghostscript | gs-esp", not "ghostscript | gsp-esp"!
+    I should punish myself.
+    (closes: #456455)
+
+ -- Kenshi Muto <kmuto at debian.org>  Tue, 18 Dec 2007 07:49:17 +0900
+
+cupsys (1.3.4-3) unstable; urgency=high
+
+  [ Martin Pitt ]
+  * debian/control: Bump Standards-Version to 3.7.3 (no changes necessary).
+
+  [ Till Kamppeter ]
+  * debian/patches/cups-stops-broadcasting-on-hup-with-explicit-browseaddress.dpatch:
+    cups stopped broadcasting on a hup signal when using a fixed
+    browseaddress (cups str #2618, lp: #173470).
+
+  [ Kenshi Muto]
+  * Debconf translation
+    - French (closes: #456272)
+    - do update-debconfpo. Update all translations to use the msgstr 'dnssd'
+      for msgid 'dnssd'.
+  * cupsys depends on "ghostscript | gs-esp", to ease testing transition and
+    upgrades from etch (closes: #456455).
+
+ -- Kenshi Muto <kmuto at debian.org>  Mon, 17 Dec 2007 10:25:02 +0900
+
 cupsys (1.3.4-2ubuntu3) hardy; urgency=low
 
   * debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch:

Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control	Wed Jan  2 12:39:01 2008
@@ -51,7 +51,7 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, ghostscript, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, ghostscript | gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install	Wed Jan  2 12:39:01 2008
@@ -39,3 +39,5 @@
 ../local/*.ppd usr/share/ppd/cups-included/
 ../local/*.types usr/share/cups/mime/
 ../local/*.convs usr/share/cups/mime/
+../local/pdftops.conf etc/cups/
+../local/acroread.conf etc/cups/

Added: cupsys/branches/cups-1.2-ubuntu/debian/local/acroread.conf
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/acroread.conf	Wed Jan  2 12:39:01 2008
@@ -0,0 +1,43 @@
+#
+# Configuration file for acroread as alternate pdftops filter
+#
+# 2006-09-26/Bl
+#	initial
+#
+# This configuration file sets some useful default options for use of
+# the Adobe readder (acroread) as an alternate pdftops filter.
+#
+# Most of these options may be overridden by using the commandline options
+# of pdftops prefixed with 'pdf'. Example: to expand the PDF pages to match
+# the specified media size, add 
+#	pdf-expand
+# to the command line options.
+# We use the option names of xpdf's pdftops utility for compatibility reasons;
+# for use with acroread they are translated by the pdftops wrapper. For
+# details see the script itself.
+
+#
+# Paper size handling
+#	We default to the media size in the PDF file. If acroread uses
+#	the media box or the crop box is unknown to me and cannot be modified
+#	by command line options, but we use the shrink to fit option by default.
+#
+shrink
+
+#
+# By default, we use level2 output, as most printers only support level2.
+# Note that acroread does no longer support level1, thus level1 will be
+# silently ignored.
+#
+level2
+
+#
+# As we convert to PostScript for printing only, we do not output comments
+# or annotations and emit all used fonts once at the beginning of the document.
+#
+optimizeForSpeed
+commentsOff
+annotsOff
+transQuality 3
+
+

Modified: cupsys/branches/cups-1.2-ubuntu/debian/local/filters/pdftops
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/local/filters/pdftops	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/filters/pdftops	Wed Jan  2 12:39:01 2008
@@ -3,22 +3,27 @@
 # ==============================================================================
 # 1.00 - 2004-10-05/Bl
 #	Initial implementation
+# 1.10 - 2006-09-27/Bl
+#	Alternatively, use Adobe Reader in place of Xpdf's pdftops
+# 1.20 - 2007-12-03/Bl
+#	Safe temp file creation (fix gentoo bug # 201042)
 #
-# Copyright: Helge Blischke / SRZ Berlin 2004
+# Copyright: Helge Blischke / SRZ Berlin 2004-2006
 # This program is free seoftware and governed by the GNU Public License Version 2.
 #
 # Description:
 # ------------
 #	This program wraps the pdftops utility from the xpdf 3.00 (and higher) suite
 #	to behave as a CUPS filter as a replacement for the original pdftops filter.
+#	As an alternative the Adobe Reader may be used.
 #
 #	The main purpose of this approach is to keep the properties of a PDF to be
 #	printed as undesturbed as possible, especially with respect to page size,
 #	scaling, and positioning.
 #
-#	The pdftops utility reads a configuration file 'pdftops.conf' in the 
-#	CUPS_SERVERROOT directory, which must exist but may be empty. The sample
-#	configuration file accompanying this program sets the defaults which
+#	The pdftops utility reads a configuration file 'pdftops.conf' or 'acroread.conf',
+#	respectively, in the CUPS_SERVERROOT directory, which must exist but may be empty. 
+#	The sample configuration file accompanying this program sets the defaults which
 #	seem plausible to me with respect to high end production printers.
 #
 #	To give the user highest possible flexibility, this program accepts and
@@ -27,18 +32,26 @@
 #	
 #		pdf-pages=<f>,<l>
 #				expands to the -f and -l options of pdftops
+#				or the -start and -end options of acroread, respectively
 #				to select a page range to process. This is independent
 #				of the page-ranges attribute and may significantly
 #				increase throughput when printing page ranges.
 #				Either of these numbers may be omitted.
 #
 #		pdf-paper=<name>
+#				For pdftops, <name> may be one of "letter", "legal",
+#				"A4", "A3", or "match"; for acroread, the permetted values
+#				are "letter", "legal", "tabloid", "ledger", "executive",
+#				"a3", "a4", "a5", "b4", "b5", respectively (without the
+#				quotes; the names are treated case independent).
+#				In case of acroread, no paper specification is equivalent
+#				to pdsftops's "match".
 #		pdf-paper=<width>x<height>
 #				<name> may be one of letter, legal , A4, A3, or match;
 #				<width> and <height> are the paper width and height
 #				in printers points (1/72 inch). This expands to
 #				either the -paper or the -paperh and -paperw options
-#				of pdftops
+#				of pdftops or the -size option of acroread.
 #
 #		pdf-opw=<password>
 #		pdf-upw=<password>
@@ -51,23 +64,46 @@
 #				opi, nocrop, expand, noshrink, nocenter.
 #				See the pdftops manpage for a detailed description of
 #				the respective options.
+#				In case of acroread, the options level1, level?sep, opi,
+#				nocrop, noshrink, and nocenter are silently ignored.
 #
 #	All other pdftops commandline options are refused.
 #
-#	When printing from STDIN, the program copies the input to a temporary file
-#	in TMPDIR, which is deleted on exit.
-#
-#	The return code of the pdftops utility, if nonzero, is used as the exit code
+#	The return code of the pdftops utility or acroread, if nonzero, is used as the exit code
 #	of this program; error messages of the pdftops utility are only visible
 #	if 'debug' is specified as LogLevel in cupsd.conf.
+#
+#	NOTE:
+#	-----
+#	This wrapper script has been initially designed to use the original pdftops utility
+#	as a CUPS filter and now extended to alternately use acroread.
+#	But there are situations where you need to be able to select either variant, thus it
+#	is possible to configure the wrapper to both programs but select one of them by default;
+#	the other one then may be selected by command line option:
+#
+#	use-pdftops		selects pdftops
+#	use-acroread		selects acroread
+#
+#	if both are configured (by defining the appropriate configuration file).
+#
 
 #
 # Site specific parameters - modify as needed
-# ------------------------------------------------------------------------------
-$pdftops_path = "/usr/bin/pdftops";	# path to the xpdf utility
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------
+$pdftops_path = "/usr/bin/pdftops";		# path to the xpdf utility
+$acroread_path = "/usr/bin/acroread";		# path to Adobe Reader
+$default_app = 'use-pdftops';			# the default if both are configured
+# ----------------------------------------------------------------------------------
+
+use File::Temp qw( tempfile );
 
-use File::Copy;
+#
+# Check which app to use - pdftops or acroread
+#
+$rootdir = $ENV{CUPS_SERVERROOT} || die ("ERROR: CUPS server root directory undefined\n");
+$use_pdftops = -f "$rootdir/pdftops.conf" && -r "$rootdir/pdftops.conf";
+$use_acroread = -f "$rootdir/acroread.conf" && -r "$rootdir/acroread.conf";
+$use_both = $use_pdftops && $use_acroread;
 
 #
 # Check the arguments
@@ -82,37 +118,114 @@
 $options = shift;				# Textual representation of job attributes
 $pdffile = shift;				# Pathname of PDF file to process
 
-# If we are reading from STDIN, we must copy the input to a temporary file
-# as the PDF consumer needs a seekable input.
+if (defined $use_both && $use_both)
+{
+	my $optstr = " $options ";
+	my $to_use = '';
+	if ($optstr =~ /\s+(use-acroread|use-pdftops)\s+/)
+	{
+		$to_use = $1;
+	}
+	else
+	{
+		$to_use = $default_app;
+	}
+	if ($to_use eq 'use-acroread')
+	{
+		undef $use_pdftops;
+	}
+	elsif ($to_use eq 'use-pdftops')
+	{
+		undef $use_acroread;
+	}
+	else
+	{
+		die ("ERROR: cannot use both pdftops and acroread simultaneously\n");
+	}
+}
+
 
-if (! defined $pdffile)
+if (defined $use_pdftops)
 {
-	my $tmpfile = $ENV{TMPDIR} . "pdfin.$$.tmp";
-	open (TEMP, ">$tmpfile") || die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
-	if (! copy (\*STDIN, \*TEMP))
-	{
-		close (TEMP);
-		unlink $tmpfile;
-		die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
-	}
-	close (TEMP);
-	$pdffile = $tmpfile;
-	$delete_input = 1;			# for deleting the temp file after converting
+	# If we are reading from STDIN, we must copy the input to a temporary file
+	# as the PDF consumer needs a seekable input.
+	if (! defined $pdffile)
+	{
+		my $template = "pdfinXXXXXX";
+		my $tmpdir = $ENV{TMPDIR};
+		my ($bytes, $buffer);
+		my ($tmpfh, $tmpfile) = tempfile ($template, OPEN => 1, DIR => $tmpdir, UNLINK => 0, SUFFIX => '.tmp');
+		while (($bytes = read (STDIN, $buffer, 1024)) > 0)
+		{
+			print $tmpfh "$buffer";
+		}
+		if ($bytes < 0)
+		{
+			close ($tmpfh);
+			unlink $tmpfile;
+			die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
+		}
+		close ($tmpfh);
+		$pdffile = $tmpfile;
+		$delete_input = 1;			# for deleting the temp file after converting
+	}
 }
+		
 
 # 
 # Check the options string for options to modify the bahaviour of the pdftops utility:
 #
 @optarr = split (/\s+/, $options);
-$cfgfile = $ENV{CUPS_SERVERROOT} . "/pdftops.conf";
-if (-e $cfgfile) {
-    $cmdopt = "-cfg " . $ENV{CUPS_SERVERROOT} . "/pdftops.conf";	# This cannot be changed
-} else {
-    $cmdopt = "";
-}
-# The following are the (parameterless) command line options that may be used to change the 
-# defaults defiend by pdftops.conf
-$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
+if (defined $use_pdftops)
+{
+	$cmdopt = "-cfg " . $ENV{CUPS_SERVERROOT} . "/pdftops.conf";	# This cannot be changed
+	# The following are the (parameterless) command line options that may be used to change the 
+	# defaults defiend by pdftops.conf
+	$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
+	%papernames = (
+		'letter'	=>	'-paper letter',
+		'tabloid'	=>	'-paperw 792 -paperh 1224',
+		'ledger'	=>	'-paperw 1224 -paperh 792',
+		'legal'		=>	'-paper legal',
+		'executive'	=>	'-paperw 756 -paperh 522',
+		'a3'		=>	'-paper A3',
+		'a4'		=>	'-paper A4',
+		'a5'		=>	'-paperw 421 -paperh 595',
+		'b4'		=>	'-paperw 709 -paperh 1002',
+		'b5'		=>	'-paperw 501 -paperh 709',
+		'match'		=>	'-paper match'
+	);
+}
+else
+{
+	open (CFG, "<$rootdir/acroread.conf") || die ("ERROR: acroread.conf: $!\n");
+	$cmdopt = '-toPostScript';
+	while (<CFG>)
+	{
+		chomp;
+		next if (/^\s*#/);			# skip comment lines
+		next if (/^\s*$/);			# skip blank lines
+		s/^-\s*//;				# discard leading '-' and white space, as it will be generated later
+		s/\s+$//;				# discard trailing white space
+		$cmdopt .= " -$_";
+	}
+	close (CFG);
+	$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
+	%papernames = (
+		'letter'	=>	'-size letter',
+		'tabloid'	=>	'-size tabloid',
+		'ledger'	=>	'-size ledger',
+		'legal'		=>	'-size legal',
+		'executive'	=>	'-size executive',
+		'a3'		=>	'-size a3',
+		'a4'		=>	'-size a4',
+		'a5'		=>	'-size a5',
+		'b4'		=>	'-size b4',
+		'b5'		=>	'-size b5',
+		'match'		=>	''		# this is the default with acroread
+	);
+}
+
 foreach my $option (@optarr)
 {
 	if ($option =~ /^pdf-(.+)$/)
@@ -125,24 +238,62 @@
 			# to be omitted.
 			my $first = $1;
 			my $lastp = $2;
-			$cmdopt .= " -f $1" if ($1);		# first page
-			$cmdopt .= " -l $2" if ($2);		# last page
+			if (defined $use_pdftops)
+			{
+				$cmdopt .= " -f $1" if ($1);		# first page
+				$cmdopt .= " -l $2" if ($2);		# last page
+			}
+			else
+			{
+				$cmdopt .= " -start $1" if ($1);	# first page
+				$cmdopt .= " -end $2" if ($2);		# last page
+			}
 		}
-		elsif ($optkey =~ /^paper=(letter|legal|A4|A3|match)$/)
+		elsif ($optkey =~ /^paper=(letter|tabloid|ledger|legal|[Aa]3|[Aa]4|[Aa]5|[Bb]4|[Bb]5|match)$/)
 		{
-			$cmdopt .= " -paper $1";			# paper name
+			# evaluate paper name
+			my $paper = $1;
+			$paper =~ tr/A-Z/a-z/;
+			my $value = $papernames{$paper};
+			$cmdopt .= " $value" if ($value);
 		}
 		elsif ($optkey =~ /^paper=(\d+)x(\d+)$/)
 		{
-			$cmdopt .= " -paperw $1 -paperh $2";		# paper dimensions
+			# evaluate paper dimensions
+			if (defined $use_pdftops)
+			{
+				$cmdopt .= " -paperw $1 -paperh $2";
+			}
+			else
+			{
+				$cmdopt .= " -size $1" . 'x' . "$2";
+			}
 		}
 		elsif ($optkey =~ /^(o|u)pw=(\S+)$/)
 		{
-			$cmdopt .= " $1" . 'pw ' . $2;			# owner/user password
+			$cmdopt .= " $1" . 'pw ' . $2 if (defined $use_pdftops);	# owner/user password
 		}
 		elsif ($optkey =~ /^($simple)$/)
 		{
-			$cmdopt .= ' -' . $1;				# allowed simple options
+			my $thisopt = $1;
+			if (defined $use_pdftops)
+			{
+				$cmdopt .= ' -' . $1;				# allowed simple options
+			}
+			else
+			{
+				$thisopt =~ s/sep$//;				# ignore the ...sep suffix
+				if ($thisopt =~ /level1|opi|nocrop|nocenter/)
+				{
+					$thisopt = '';
+				}
+				elsif ($thisopt eq 'noshrink')
+				{
+					$thisopt = '';
+					$cmdopt =~ s/ -shrink//;
+				}
+				$cmdopt .= " -" . $thisopt if ($thisopt);
+			}
 		}
 		else
 		{
@@ -154,13 +305,35 @@
 #
 # Complete the command
 #
-warn ("ERROR: pdftops-options: $cmdopt\n");
-$rc = system ("$pdftops_path $cmdopt $pdffile -");
+if (defined $use_pdftops)
+{
+	warn ("ERROR: pdftops-options: $cmdopt\n");
+}
+else
+{
+	warn ("ERROR: acroread-options: $cmdopt\n");
+}
+if (defined $use_pdftops)
+{
+	$rc = system ("$pdftops_path $cmdopt $pdffile -");
+}
+else
+{
+	if (defined $pdffile && $pdffile)
+	{
+		$rc = system ("$acroread_path $cmdopt < $pdffile")
+	}
+	else
+	{
+		$rc = system ("$acroread_path $cmdopt");
+	}
+}
 if ($rc)
 {
 	$ir = $rc & 127;
 	$rc >>= 8;
-	warn ("ERROR: pdftops_path exited with ", ($ir) ? "signal $ir, " : " exit code $rc", "\n");
+	my $temp = (defined $use_pdftops) ? $pdftops_path : $acroread_path;
+	warn ("ERROR: $temp exited with ", ($ir) ? "signal $ir, " : " exit code $rc", "\n");
 	exit $rc;
 }
 unlink ($pdffile) if (defined $delete_input);		# Delete the temp file if any

Added: cupsys/branches/cups-1.2-ubuntu/debian/local/pdftops.conf
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/pdftops.conf	Wed Jan  2 12:39:01 2008
@@ -0,0 +1,61 @@
+#
+# Configuration file for the alternate pdftops filter
+#
+# 2004-10-05/Bl
+#	initial
+#
+# This configuration file defaults the configuration settings for xpdf's pdftops
+# utility for use as a CUPS filter (under the pdftops wrapper). Short of 
+# unicode handling, those options are listed which are (or seem to me) relevant
+# to convert PDFs to PostScript suitable for production printers.
+#
+# Most of these options may be overridden by osing the commandline options
+# pr pdftops prefixed with 'pdf'. Example: to enable OPI handling, add
+#	pdf-opi
+# to the command line options. For the details see the pdftops wrapper.
+
+#
+# Where to search for fonts not embedded in the PDF (currently, Type1 fonts only)
+#
+fontDir /PostScript/pfa
+
+#
+# Paper size handling
+#	We default to the media size specified in the PDF file.
+#	If a crop box is specified, it wil be used, otherwise the media box instead.
+#	By default, we use this size as imageable area.
+#
+psPaperSize match
+psCrop yes
+psExpandSmaller no
+psShrinkLarger no
+psCenter yes
+
+#
+# As we have (level 2) printers which don't understand CID fonts, we produce level 2
+# output.
+#
+psLevel level2
+
+#
+# Font handling.
+# We embed all fonts embedded in the PDF in the generated PS (level2 compatible composite
+# fonts in case of CID fonts.
+#
+psEmbedType1Fonts yes
+psEmbedTrueTypeFonts yes
+psEmbedCIDTrueTypeFonts yes
+psEmbedCIDPostScriptFonts yes
+
+#
+# OPI.
+# As OPI handling is rather uncommon to printers, disable it by default. But it may be
+# enabled by print command attribute.
+#
+psOPI no
+
+#
+# Use ASCII85 encoding.
+#
+psASCIIHex no
+

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Wed Jan  2 12:39:01 2008
@@ -13,6 +13,6 @@
 reactivate_recommended_driver.dpatch
 include_krb5_h_in_job_h.dpatch
 search_mime_files_in_usr_share.dpatch
-cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch
+fix_regression_reactivate_net_ifaces_changes_detection.dpatch
 ubuntu-disable-browsing.dpatch
 ubuntu-default-error-policy-retry-job.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch	Wed Jan  2 12:39:01 2008
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_regression_reactivate_net_ifaces_changes_detection.dpatch by Hugues Fournier <hugues.fournier at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Forwarded and committed upstream: http://www.cups.org/str.php?L2631 (revision 7141 - pre 1.3.6)
+
+ at DPATCH@
+diff -urNad cupsys-1.3.5~/scheduler/main.c cupsys-1.3.5/scheduler/main.c
+--- cupsys-1.3.5~/scheduler/main.c	2007-12-23 10:51:11.864573425 +0900
++++ cupsys-1.3.5/scheduler/main.c	2007-12-23 10:52:58.700407295 +0900
+@@ -151,6 +151,8 @@
+ #ifdef __APPLE__
+   int			run_as_child = 0;
+ 					/* Needed for Mac OS X fork/exec */
++#else
++  time_t		netif_time = 0; /* Time since last network update */
+ #endif /* __APPLE__ */
+ #if HAVE_LAUNCHD
+   int			launchd_idle_exit;
+@@ -834,6 +836,18 @@
+ 
+     current_time = time(NULL);
+ 
++#ifndef __APPLE__
++   /*
++    * Update the network interfaces once a minute...
++    */
++
++    if ((current_time - netif_time) >= 60)
++    {
++      netif_time  = current_time;
++      NetIFUpdate = 1;
++    }
++#endif /* !__APPLE__ */
++
+ #if HAVE_LAUNCHD
+    /*
+     * If no other work was scheduled and we're being controlled by launchd

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po	Wed Jan  2 12:39:01 2008
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.7-4\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-27 11:01+0200\n"
 "Last-Translator: JordÃ  Polo <jorda at ettin.org>\n"
 "Language-Team: CatalÃ  <debian-l10n-catalan at lists.debian.org>\n"
@@ -19,13 +19,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Voleu configurar el servidor compatible amb l'lpd de BSD?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -39,14 +39,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "Voleu que CUPS imprimeixi les tasques desconegudes com tasques en brut?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -71,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -81,61 +81,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paralÂ·lel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "sÃ¨rie"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "sÃ²col"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr ""
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Mecanisme de comunicaciÃ³ amb la impressora:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -144,7 +150,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -154,7 +160,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/cs.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/cs.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/cs.po	Wed Jan  2 12:39:01 2008
@@ -14,9 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
-"PO-Revision-Date: 2007-03-31 17:45+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
+"PO-Revision-Date: 2007-12-16 15:37+0900\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,13 +25,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Chcete spustit server kompatibilnÃ s BSD lpd?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -45,13 +45,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Chcete, aby CUPS tisknul neznÃ¡mÃ© Ãºlohy jako typ \"raw\"?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -66,7 +66,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -77,7 +77,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -87,68 +87,74 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paralelnÃ"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "sÃ©riovÃ½"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "OvladaÄe pro komunikaci s tiskÃ¡rnou:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr "CUPS pouÅ¾ÃvÃ¡ ovladaÄe pro komunikaci s tiskÃ¡rnou nebo jejÃm portem."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -158,7 +164,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/da.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/da.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/da.po	Wed Jan  2 12:39:01 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-25 04:32+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-27 20:59+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -128,6 +128,12 @@
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
 #: ../cupsys.templates:3002
 msgid "Printer communication backends:"
@@ -162,78 +168,79 @@
 "Vælg det bagvedliggende program, CUPS skal bruge. Det forvalgte burde være "
 "passende under de mest almindelige forhold."
 
-msgid ""
-"If you will be accepting print jobs from Windows computers, you probably "
-"want this option set, as Windows gives all IPP print jobs processed by a "
-"local driver the MIME type application/octet-stream. Samba also submits its "
-"print jobs this way."
-msgstr ""
-"Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
-"denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
-"lokal driver MIME-typen \"application/octet-stream\". Samba sender sine jobs "
-"på samme måde."
-
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
-
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater er "
-"gyldige:"
-
-msgid ""
-" - Port number (631);\n"
-" - Host name   (debian.example.com);\n"
-" - Host:Port   (debian.example.com:631);\n"
-" - File domain socket (/var/run/cups/cups.sock)."
-msgstr ""
-" - Portnummer  (631);\n"
-" - værtsnavn   (debian.eksempel.dk);\n"
-" - Vært:Port   (debian.eksempel.dk:631);\n"
-" - Fildomænesokkel (/var/run/cups/cups.sock)."
-
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
-
-msgid ""
-"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to setup a standalone environment for "
-"security reasons."
-msgstr ""
-"Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
-"\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et selvstændigt "
-"miljø op."
-
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
-
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket og "
-"detektere printere på netværket automatisk."
-
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
-"rundsendinger for at detektere printere."
-
-msgid "Incorrect value entered"
-msgstr "Ugyldig værdi indtastet"
-
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
+#~ msgid ""
+#~ "If you will be accepting print jobs from Windows computers, you probably "
+#~ "want this option set, as Windows gives all IPP print jobs processed by a "
+#~ "local driver the MIME type application/octet-stream. Samba also submits "
+#~ "its print jobs this way."
+#~ msgstr ""
+#~ "Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
+#~ "denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
+#~ "lokal driver MIME-typen \"application/octet-stream\". Samba sender sine "
+#~ "jobs på samme måde."
+
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
+
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater "
+#~ "er gyldige:"
+
+#~ msgid ""
+#~ " - Port number (631);\n"
+#~ " - Host name   (debian.example.com);\n"
+#~ " - Host:Port   (debian.example.com:631);\n"
+#~ " - File domain socket (/var/run/cups/cups.sock)."
+#~ msgstr ""
+#~ " - Portnummer  (631);\n"
+#~ " - værtsnavn   (debian.eksempel.dk);\n"
+#~ " - Vært:Port   (debian.eksempel.dk:631);\n"
+#~ " - Fildomænesokkel (/var/run/cups/cups.sock)."
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
+
+#~ msgid ""
+#~ "The default port 631 is reserved for the Internet Printing Protocol "
+#~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
+#~ "for security reasons."
+#~ msgstr ""
+#~ "Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
+#~ "\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et "
+#~ "selvstændigt miljø op."
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket "
+#~ "og detektere printere på netværket automatisk."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
+#~ "rundsendinger for at detektere printere."
+
+#~ msgid "Incorrect value entered"
+#~ msgstr "Ugyldig værdi indtastet"
+
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
 
-msgid "Please correct your input."
-msgstr "Ret venligst din indtastning."
+#~ msgid "Please correct your input."
+#~ msgstr "Ret venligst din indtastning."
 
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
 
-msgid "Select the backends you want."
-msgstr "Vælg det bagvedliggende program, du ønsker."
+#~ msgid "Select the backends you want."
+#~ msgstr "Vælg det bagvedliggende program, du ønsker."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/de.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/de.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/de.po	Wed Jan  2 12:39:01 2008
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-31 11:14-0400\n"
 "Last-Translator: Matthias Julius <mdeb at julius-net.net>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -28,13 +28,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "MÃ¶chten Sie den KompatibilitÃ¤ts-Server fÃ¼r BSD lpd einrichten?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -49,14 +49,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "MÃ¶chten Sie, dass CUPS unbekannte DruckauftrÃ¤ge unbearbeitet (raw) druckt?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -71,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -81,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -91,61 +91,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "IPP"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "SCSI"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "seriell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "Socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "USB"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "SNMP"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Backends fÃ¼r die Kommunikation mit dem Drucker:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -153,7 +159,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -163,7 +169,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/es.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/es.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/es.po	Wed Jan  2 12:39:01 2008
@@ -23,8 +23,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 1.2.2-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-09 04:30+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-06-21 18:51+0200\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag at dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish Team <debian-l10n-spanish at lists.debian."
@@ -47,7 +47,12 @@
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr "Este paquete incluye un servidor que acepta trabajos de impresión al estilo BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya otras máquinas que envíen trabajos de impresión mediante la red, usando los servicios \"BSD\" o \"LPR\" y no se puede hacer que estos utilice el protocolo IPP que utiliza CUPS."
+msgstr ""
+"Este paquete incluye un servidor que acepta trabajos de impresión al estilo "
+"BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya "
+"otras máquinas que envíen trabajos de impresión mediante la red, usando los "
+"servicios \"BSD\" o \"LPR\" y no se puede hacer que estos utilice el "
+"protocolo IPP que utiliza CUPS."
 
 #. Type: boolean
 #. Description
@@ -63,7 +68,11 @@
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
-msgstr "En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no todas las fuentes de trabajos de impresión asignan correctamente algún tipo MIME, muchos llegan con el tipo «application/octet-stream» y podrían rechazarse si CUPS no puede adivinar el formato del trabajo."
+msgstr ""
+"En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no "
+"todas las fuentes de trabajos de impresión asignan correctamente algún tipo "
+"MIME, muchos llegan con el tipo «application/octet-stream» y podrían "
+"rechazarse si CUPS no puede adivinar el formato del trabajo."
 
 #. Type: boolean
 #. Description
@@ -71,7 +80,9 @@
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
-msgstr "Es posible hacer que CUPS trate todos estos trabajos como trabajos «en crudo», con lo que se mandan directamente a la impresora sin procesar."
+msgstr ""
+"Es posible hacer que CUPS trate todos estos trabajos como trabajos «en "
+"crudo», con lo que se mandan directamente a la impresora sin procesar."
 
 #. Type: boolean
 #. Description
@@ -79,7 +90,9 @@
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
-msgstr "Se recomienda que escoga esta opción si el servidor va a aceptar trabajos de impresión de ordenadores con Windows o servidores Samba."
+msgstr ""
+"Se recomienda que escoga esta opción si el servidor va a aceptar trabajos de "
+"impresión de ordenadores con Windows o servidores Samba."
 
 #. Type: multiselect
 #. Choices
@@ -130,6 +143,12 @@
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
 #: ../cupsys.templates:3002
 msgid "Printer communication backends:"
@@ -140,7 +159,9 @@
 #: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
-msgstr "CUPS utiliza diversos motores para comunicarse con el puerto o dispositivo de la impresora."
+msgstr ""
+"CUPS utiliza diversos motores para comunicarse con el puerto o dispositivo "
+"de la impresora."
 
 #. Type: multiselect
 #. Description
@@ -148,7 +169,10 @@
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
-msgstr "Desafortunadamente, ciertos motores pueden causar problemas. Por ejemplo, con el motor del puerto paralelo se producen algunas caídas del núcleo en la arquitectura PPC."
+msgstr ""
+"Desafortunadamente, ciertos motores pueden causar problemas. Por ejemplo, "
+"con el motor del puerto paralelo se producen algunas caídas del núcleo en la "
+"arquitectura PPC."
 
 #. Type: multiselect
 #. Description

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po	Wed Jan  2 12:39:01 2008
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys-eu\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-27 15:56+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "BSD lpd bateragarritasun zerbitzaria konfiguratu nahi al duzu?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,13 +38,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "CUPS-ek lan ezezagunak lan gordinak bezala inprimatzea nahi duzu?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -52,109 +52,115 @@
 "be rejected if CUPS cannot guess the job's format."
 msgstr ""
 "Internet Inprimatze Protokoloak (IPP) MIME mota bat indartzen du inprimatze "
-"lan guztientzat. Inprimatze lan jatorri guztiek ezin dutenez mota zuzena ezarri, "
-"lan asko application/octet-stream MIME mota bezala bidaltzen dira eta ukatu egin "
-"daitezke CUPS ez bada lan formatu bezeroa ezagutzeko gauza."
+"lan guztientzat. Inprimatze lan jatorri guztiek ezin dutenez mota zuzena "
+"ezarri, lan asko application/octet-stream MIME mota bezala bidaltzen dira "
+"eta ukatu egin daitezke CUPS ez bada lan formatu bezeroa ezagutzeko gauza."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
 msgstr ""
-"Posible da CUPS-ek lan hauek guztiak lan \"gordinak\" bezala kudea "
-"ditzan, honela lan hauek prozesatu gabe bidaliko dira inprimagailura."
+"Posible da CUPS-ek lan hauek guztiak lan \"gordinak\" bezala kudea ditzan, "
+"honela lan hauek prozesatu gabe bidaliko dira inprimagailura."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
 msgstr ""
-"Gomendagarria da aukera hau hautatzea zerbitzariak windows duten ordenagailu edo "
-"Samba zerbitzarietatik lanak jasoko baditu."
+"Gomendagarria da aukera hau hautatzea zerbitzariak windows duten ordenagailu "
+"edo Samba zerbitzarietatik lanak jasoko baditu."
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lds"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paraleloa"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "seriea"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Inprimagailu komunikazio motorea:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-msgid "CUPS uses backend programs to communicate with the printer device or port."
+#: ../cupsys.templates:3002
+msgid ""
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"CUPS-ek inprimagailu gailu edo atakarekin komunikazioa lortzeko interfaze programak"
-"erabiltzen ditu."
+"CUPS-ek inprimagailu gailu edo atakarekin komunikazioa lortzeko interfaze "
+"programakerabiltzen ditu."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Zoritxarrez, zenbait interaze programek arazoak zor ditzakete. (Adibidez zenbait PPC "
-"kernel haustura motore paraleloaz)"
+"Zoritxarrez, zenbait interaze programek arazoak zor ditzakete. (Adibidez "
+"zenbait PPC kernel haustura motore paraleloaz)"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
 "Mesedez hautatu CUPS-ek erabiliko duen komunikazio motorea. Aukera "
 "lehenetsiak ingurune arruntenetan funtzionatu beharko luke."
-

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/fi.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/fi.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/fi.po	Wed Jan  2 12:39:01 2008
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys_1.3.2-1_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-20 04:30+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-10-15 13:13+0200\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -26,8 +26,17 @@
 #. Type: boolean
 #. Description
 #: ../cupsys-bsd.templates:2001
-msgid "The CUPS package contains a server that can accept BSD-style print jobs and submit them to CUPS. It should only be set up if other computers are likely to submit jobs over the network via the \"BSD\" or \"LPR\" services, and these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr "CUPS-paketti sisÃ¤ltÃ¤Ã¤ palvelimen, joka voi vastaanottaa BSD-tyylisiÃ¤ tulostustÃ¶itÃ¤ ja lÃ¤hettÃ¤Ã¤ ne CUPSille. Palvelinta tulisi kÃ¤yttÃ¤Ã¤ vain, jos on todennÃ¤kÃ¶istÃ¤, ettÃ¤ muut tietokoneet lÃ¤hettÃ¤vÃ¤t tÃ¶itÃ¤ verkon yli kÃ¤yttÃ¤en BSD- tai LPR-palveluita, eikÃ¤ nÃ¤itÃ¤ tietokoneita voida asettaa kÃ¤yttÃ¤mÃ¤Ã¤n CUPSin IPP-protokollaa."
+msgid ""
+"The CUPS package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if other computers are likely "
+"to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
+"these computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"CUPS-paketti sisÃ¤ltÃ¤Ã¤ palvelimen, joka voi vastaanottaa BSD-tyylisiÃ¤ "
+"tulostustÃ¶itÃ¤ ja lÃ¤hettÃ¤Ã¤ ne CUPSille. Palvelinta tulisi kÃ¤yttÃ¤Ã¤ vain, jos "
+"on todennÃ¤kÃ¶istÃ¤, ettÃ¤ muut tietokoneet lÃ¤hettÃ¤vÃ¤t tÃ¶itÃ¤ verkon yli kÃ¤yttÃ¤en "
+"BSD- tai LPR-palveluita, eikÃ¤ nÃ¤itÃ¤ tietokoneita voida asettaa kÃ¤yttÃ¤mÃ¤Ã¤n "
+"CUPSin IPP-protokollaa."
 
 #. Type: boolean
 #. Description
@@ -38,20 +47,37 @@
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:2001
-msgid "The Internet Printing Protocol (IPP) enforces a MIME type for all print jobs. Since not all sources of print jobs can attach an appropriate type, many jobs get submitted as the MIME type application/octet-stream and could be rejected if CUPS cannot guess the job's format."
-msgstr "Internet Printing Protocol (IPP) vaatii, ettÃ¤ tulostustÃ¶ille on mÃ¤Ã¤ritelty MIME-tyyppi. Koska kaikki tulostustÃ¶itÃ¤ lÃ¤hettÃ¤vÃ¤t tahot eivÃ¤t pysty asettamaan sopivaa tyyppiÃ¤, monet tyÃ¶t tulevat lÃ¤hetetyiksi MIME-tyypillÃ¤ application/octet-stream ja saattavat tulla hylÃ¤tyiksi, jos CUPS ei pysty arvaamaan niiden tyyppiÃ¤."
+msgid ""
+"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
+"jobs. Since not all sources of print jobs can attach an appropriate type, "
+"many jobs get submitted as the MIME type application/octet-stream and could "
+"be rejected if CUPS cannot guess the job's format."
+msgstr ""
+"Internet Printing Protocol (IPP) vaatii, ettÃ¤ tulostustÃ¶ille on mÃ¤Ã¤ritelty "
+"MIME-tyyppi. Koska kaikki tulostustÃ¶itÃ¤ lÃ¤hettÃ¤vÃ¤t tahot eivÃ¤t pysty "
+"asettamaan sopivaa tyyppiÃ¤, monet tyÃ¶t tulevat lÃ¤hetetyiksi MIME-tyypillÃ¤ "
+"application/octet-stream ja saattavat tulla hylÃ¤tyiksi, jos CUPS ei pysty "
+"arvaamaan niiden tyyppiÃ¤."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:2001
-msgid "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent directly to the printer without processing."
-msgstr "CUPS pystyy kÃ¤sittelemÃ¤Ã¤n kaikki tÃ¤llaiset tyÃ¶t â€raakatÃ¶inÃ¤â€. TÃ¤llÃ¶in ne lÃ¤hetetÃ¤Ã¤n suoraan tulostimelle ilman kÃ¤sittelyÃ¤."
+msgid ""
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
+msgstr ""
+"CUPS pystyy kÃ¤sittelemÃ¤Ã¤n kaikki tÃ¤llaiset tyÃ¶t â€raakatÃ¶inÃ¤â€. TÃ¤llÃ¶in ne "
+"lÃ¤hetetÃ¤Ã¤n suoraan tulostimelle ilman kÃ¤sittelyÃ¤."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:2001
-msgid "It is recommended to choose this option if the server will be accepting print jobs from Windows computers or Samba servers."
-msgstr "On suositeltavaa kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ optiota, jos palvelin ottaa vastaa tÃ¶itÃ¤ Windows-tietokoneilta tai Samba-palvelimilta."
+msgid ""
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
+"On suositeltavaa kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ optiota, jos palvelin ottaa vastaa tÃ¶itÃ¤ "
+"Windows-tietokoneilta tai Samba-palvelimilta."
 
 #. Type: multiselect
 #. Choices
@@ -102,6 +128,12 @@
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
 #: ../cupsys.templates:3002
 msgid "Printer communication backends:"
@@ -110,18 +142,29 @@
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:3002
-msgid "CUPS uses backend programs to communicate with the printer device or port."
-msgstr "CUPS kÃ¤yttÃ¤Ã¤ taustaliitÃ¤ntÃ¤ohjelmia viestiessÃ¤Ã¤n tulostinlaitteelle tai tulostusporttiin."
+msgid ""
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr ""
+"CUPS kÃ¤yttÃ¤Ã¤ taustaliitÃ¤ntÃ¤ohjelmia viestiessÃ¤Ã¤n tulostinlaitteelle tai "
+"tulostusporttiin."
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:3002
-msgid "Unfortunately, some backend programs are likely to cause some trouble. For example, some PPC kernels crash with the parallel backend."
-msgstr "IkÃ¤vÃ¤ kyllÃ¤ jotkin taustaliitÃ¤ntÃ¤ohjelmat aiheuttavat usein ongelmia. Esimerkiksi jotkin PPC-ytimet kaatuvat kÃ¤ytettÃ¤essÃ¤ rinnakkaistaustaliitÃ¤ntÃ¤Ã¤."
+msgid ""
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
+msgstr ""
+"IkÃ¤vÃ¤ kyllÃ¤ jotkin taustaliitÃ¤ntÃ¤ohjelmat aiheuttavat usein ongelmia. "
+"Esimerkiksi jotkin PPC-ytimet kaatuvat kÃ¤ytettÃ¤essÃ¤ "
+"rinnakkaistaustaliitÃ¤ntÃ¤Ã¤."
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:3002
-msgid "Please choose the backend program to be used by CUPS. The default choice should fit the most common environments."
-msgstr "Valitse taustaliitÃ¤ntÃ¤ohjelma, jota CUPSin tulisi kÃ¤yttÃ¤Ã¤. Oletusvalinnan pitÃ¤isi toimia yleisimmissÃ¤ ympÃ¤ristÃ¶issÃ¤."
-
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Valitse taustaliitÃ¤ntÃ¤ohjelma, jota CUPSin tulisi kÃ¤yttÃ¤Ã¤. Oletusvalinnan "
+"pitÃ¤isi toimia yleisimmissÃ¤ ympÃ¤ristÃ¶issÃ¤."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po	Wed Jan  2 12:39:01 2008
@@ -1,23 +1,15 @@
-# translation of fr.po to French
-#    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'
+# Translation of cupsys debconf templates to French
+# Copyright (C) 2004-2007 Christian Perrier <bubulle at debian.org>
+# This file is distributed under the same license as the cupsys package.
 #
-#    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.
 #
 # Christian Perrier <bubulle at debian.org>, 2004, 2005, 2006, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
-"PO-Revision-Date: 2007-03-27 20:37+0200\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-14 11:54+0530\n"
+"PO-Revision-Date: 2007-12-14 11:57+0530\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,13 +20,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Faut-il installer le serveur compatible avec le dÃ©mon lpd de BSDÂ ?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -44,18 +36,18 @@
 "Le paquet de CUPS fournit un serveur capable d'accepter des demandes "
 "d'impression au style BSD et de les donner Ã  CUPS. Ne le configurez que si "
 "des postes du rÃ©seau ne sont capable de communiquer avec le serveur qu'avec "
-"les services Â«Â BSDÂ Â» ou Â«Â LPRÂ Â» et ne gÃ¨rent pas le protocole IPP utilisÃ© "
-"par CUPS."
+"les services Â«Â BSDÂ Â» ou Â«Â LPRÂ Â» et ne gÃ¨rent pas le protocole IPP utilisÃ© par "
+"CUPS."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "CUPS doit-il imprimer les demandes sans type MIME sous forme bruteÂ ?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -71,7 +63,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -81,7 +73,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -91,61 +83,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "IPP"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallÃ¨le"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "SCSI"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "sÃ©rie"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "USB"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "SNMP"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Mode de communication avec les imprimantesÂ :"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -154,7 +152,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -165,7 +163,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/gl.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/gl.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/gl.po	Wed Jan  2 12:39:01 2008
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
-"PO-Revision-Date: 2007-03-27 08:56+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
+"PO-Revision-Date: 2007-12-16 15:35+0900\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr ""
 "causan problemas (por exemplo, algÃºns nÃºcleos para PPC fallan co adaptador "
@@ -25,7 +25,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -40,14 +40,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "Â¿Quere que CUPS imprima os traballos descoÃ±ecidos coma traballos en cru?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -62,7 +62,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -72,7 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -82,61 +82,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paralelo"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "serie"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Sistemas de comunicaciÃ³n coa impresora:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -145,7 +151,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -155,7 +161,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/it.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/it.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/it.po	Wed Jan  2 12:39:01 2008
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 1.2.7 italian debconf templates\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-27 20:09+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -17,13 +17,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Si vuole configurare il server di compatibilità con lpd di BSD?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,13 +38,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Si vuole che CUPS stampi i job sconosciuti come job \"raw\"?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -58,7 +58,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -68,7 +68,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -78,61 +78,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallela"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "seriale"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Backend di comunicazione con la stampante:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -141,7 +147,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -152,7 +158,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/ja.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/ja.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/ja.po	Wed Jan  2 12:39:01 2008
@@ -14,9 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 1.2\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
-"PO-Revision-Date: 2007-03-27 22:25+0900\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
+"PO-Revision-Date: 2007-12-16 15:35+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,124 +25,147 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "BSD lpd äº’æ›ã‚µãƒ¼ãƒã‚’ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr "CUPS ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ BSD ã‚¹ã‚¿ã‚¤ãƒ«ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã‚’å—ã‘ä»˜ã‘ã€CUPS ã«ãã‚Œã‚’é€ã‚‹ã‚µãƒ¼ãƒã‚’å«ã‚“ã§ã„ã¾ã™ã€‚\"BSD\" ã¾ãŸã¯ \"LPR\" ã‚µãƒ¼ãƒ“ã‚¹çµŒç”±ã§ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¶Šã—ã«ã‚¸ãƒ§ãƒ–ã‚’é€ã‚‹ã»ã‹ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãŒã‚ã‚Šã€ã‹ã¤ãã‚Œã‚‰ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã¯ CUPS ã®ä½¿ã£ã¦ã„ã‚‹ IPP ãƒ—ãƒãƒˆã‚³ãƒ«ã‚’ä½¿ã†ã‚ˆã†å¤‰æ›´ã§ããªã„ã€ã¨ã„ã†å ´åˆã«ã®ã¿ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã™ã¹ãã§ã™ã€‚"
+msgstr ""
+"CUPS ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ BSD ã‚¹ã‚¿ã‚¤ãƒ«ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã‚’å—ã‘ä»˜ã‘ã€CUPS ã«ãã‚Œã‚’é€ã‚‹ã‚µãƒ¼ãƒ"
+"ã‚’å«ã‚“ã§ã„ã¾ã™ã€‚\"BSD\" ã¾ãŸã¯ \"LPR\" ã‚µãƒ¼ãƒ“ã‚¹çµŒç”±ã§ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¶Šã—ã«ã‚¸ãƒ§ãƒ–"
+"ã‚’é€ã‚‹ã»ã‹ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãŒã‚ã‚Šã€ã‹ã¤ãã‚Œã‚‰ã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã¯ CUPS ã®ä½¿ã£ã¦ã„ã‚‹ "
+"IPP ãƒ—ãƒãƒˆã‚³ãƒ«ã‚’ä½¿ã†ã‚ˆã†å¤‰æ›´ã§ããªã„ã€ã¨ã„ã†å ´åˆã«ã®ã¿ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã™ã¹ãã§"
+"ã™ã€‚"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "æœªçŸ¥ã®ã‚¸ãƒ§ãƒ–ã‚’ç”Ÿãƒ‡ãƒ¼ã‚¿ (raw) ã‚¸ãƒ§ãƒ–ã¨ã—ã¦ CUPS ã«å°åˆ·ã•ã›ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
-msgstr "Internet Printing Protocol (IPP) ã§ã®ã™ã¹ã¦ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã¯ MIME å½¢å¼ã‚’æŒã¡ã¾ã™ã€‚å°åˆ·ã‚¸ãƒ§ãƒ–ã®ã™ã¹ã¦ã®ã‚½ãƒ¼ã‚¹ã«é©åˆ‡ãªå½¢å¼ãŒä»˜ã„ã¦ã„ã‚‹ã¨ã¯é™ã‚‰ãšã€å¤šãã®ã‚¸ãƒ§ãƒ–ã¯ MIME å½¢å¼ application/octet-stream ã¨ã—ã¦é€ã‚‰ã‚Œ,CUPS ãŒãã®ã‚¸ãƒ§ãƒ–ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’æŽ¨æ¸¬ã§ããªã‹ã£ãŸã¨ãã«ã¯æ‹’å¦ã•ã‚Œã¾ã™ã€‚"
+msgstr ""
+"Internet Printing Protocol (IPP) ã§ã®ã™ã¹ã¦ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã¯ MIME å½¢å¼ã‚’æŒã¡ã¾"
+"ã™ã€‚å°åˆ·ã‚¸ãƒ§ãƒ–ã®ã™ã¹ã¦ã®ã‚½ãƒ¼ã‚¹ã«é©åˆ‡ãªå½¢å¼ãŒä»˜ã„ã¦ã„ã‚‹ã¨ã¯é™ã‚‰ãšã€å¤šãã®ã‚¸ãƒ§"
+"ãƒ–ã¯ MIME å½¢å¼ application/octet-stream ã¨ã—ã¦é€ã‚‰ã‚Œ,CUPS ãŒãã®ã‚¸ãƒ§ãƒ–ã®"
+"ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’æŽ¨æ¸¬ã§ããªã‹ã£ãŸã¨ãã«ã¯æ‹’å¦ã•ã‚Œã¾ã™ã€‚"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
-msgstr "ãã®ã‚ˆã†ãªã‚¸ãƒ§ãƒ–ã‚’ã€ã™ã¹ã¦ç”Ÿãƒ‡ãƒ¼ã‚¿ (\"raw\") ã‚¸ãƒ§ãƒ–ã¨ã—ã¦åŠ å·¥ãªã—ã«ç›´æŽ¥ãƒ—ãƒªãƒ³ã‚¿ã«é€ã‚‹ã‚ˆã†ã« CUPS ã‚’è¨å®šã§ãã¾ã™ã€‚"
+msgstr ""
+"ãã®ã‚ˆã†ãªã‚¸ãƒ§ãƒ–ã‚’ã€ã™ã¹ã¦ç”Ÿãƒ‡ãƒ¼ã‚¿ (\"raw\") ã‚¸ãƒ§ãƒ–ã¨ã—ã¦åŠ å·¥ãªã—ã«ç›´æŽ¥ãƒ—ãƒªãƒ³"
+"ã‚¿ã«é€ã‚‹ã‚ˆã†ã« CUPS ã‚’è¨å®šã§ãã¾ã™ã€‚"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
-msgstr "ã‚µãƒ¼ãƒãŒ Windows ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‚ã‚‹ã„ã¯ Samba ã‚µãƒ¼ãƒã‹ã‚‰ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã‚’å—ã‘ä»˜ã‘ã‚‹å ´åˆã¯ã€ã“ã®é¸æŠžè‚¢ã§ã€Œã¯ã„ã€ã¨ç”ãˆã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
+msgstr ""
+"ã‚µãƒ¼ãƒãŒ Windows ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‚ã‚‹ã„ã¯ Samba ã‚µãƒ¼ãƒã‹ã‚‰ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã‚’å—ã‘ä»˜ã‘"
+"ã‚‹å ´åˆã¯ã€ã“ã®é¸æŠžè‚¢ã§ã€Œã¯ã„ã€ã¨ç”ãˆã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "IPP"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "LPD"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "ãƒ‘ãƒ©ãƒ¬ãƒ«"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "SCSI"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "ã‚·ãƒªã‚¢ãƒ«"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "ã‚½ã‚±ãƒƒãƒˆ"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "USB"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "SNMP"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "ãƒ—ãƒªãƒ³ã‚¿é€šä¿¡ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
-msgstr "CUPS ã¯ãƒ—ãƒªãƒ³ã‚¿ãƒ‡ãƒã‚¤ã‚¹ã¾ãŸã¯ãƒãƒ¼ãƒˆã¨ä¼šè©±ã™ã‚‹ã®ã«ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’ä½¿ã„ã¾ã™ã€‚"
+msgstr ""
+"CUPS ã¯ãƒ—ãƒªãƒ³ã‚¿ãƒ‡ãƒã‚¤ã‚¹ã¾ãŸã¯ãƒãƒ¼ãƒˆã¨ä¼šè©±ã™ã‚‹ã®ã«ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’ä½¿ã„"
+"ã¾ã™ã€‚"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
-msgstr "å›°ã£ãŸã“ã¨ã«ã€ã„ãã¤ã‹ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãƒ—ãƒã‚°ãƒ©ãƒ ã¯ç¨®ã€…ã®å•é¡Œã‚’å¼•ãèµ·ã“ã—ã¾ã™ã€‚ãŸã¨ãˆã°ã€ã‚ã‚‹ç¨®ã® PPC ã‚«ãƒ¼ãƒãƒ«ã¯ parallel ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã§ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã™ã€‚"
+msgstr ""
+"å›°ã£ãŸã“ã¨ã«ã€ã„ãã¤ã‹ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãƒ—ãƒã‚°ãƒ©ãƒ ã¯ç¨®ã€…ã®å•é¡Œã‚’å¼•ãèµ·ã“ã—ã¾ã™ã€‚"
+"ãŸã¨ãˆã°ã€ã‚ã‚‹ç¨®ã® PPC ã‚«ãƒ¼ãƒãƒ«ã¯ parallel ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã§ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã™ã€‚"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po	Wed Jan  2 12:39:01 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 20070331\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-31 07:18+0530\n"
 "Last-Translator: Praveen|à´ªàµà´°à´µàµ€à´£àµâ€ A|à´Ž <pravi.a at gmail.com>\n"
 "Language-Team: Swathanthra|à´¸àµà´µà´¤à´¨àµà´¤àµà´° Malayalam|à´®à´²à´¯à´¾à´³à´‚ Computing|à´•à´®àµà´ªàµà´¯àµ‚à´Ÿàµà´Ÿà´¿à´™àµà´™àµ  <smc-"
@@ -19,13 +19,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "BSD lpd à´ªàµŠà´°àµà´¤àµà´¤ à´¸àµ‡à´µà´•à´¨àµâ€ à´¸à´œàµà´œàµ€à´•à´°à´¿à´¯àµà´•àµà´•à´¾à´¨àµâ€ à´¨à´¿à´™àµà´™à´³à´¾à´—àµà´°à´¹à´¿à´¯àµà´•àµà´•àµà´¨àµà´¨àµà´£àµà´Ÿàµ‹?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -40,14 +40,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "à´®à´¨à´¸à´¿à´²à´¾à´µà´¾à´¤àµà´¤ à´œàµ‹à´²à´¿à´•à´³àµâ€ à´…à´¸à´‚à´¸àµà´•àµƒà´¤ à´œàµ‹à´²à´¿à´•à´³à´¾à´¯à´¿ CUPS à´…à´šàµà´šà´Ÿà´¿à´¯àµà´•àµà´•à´£à´®àµ†à´¨àµà´¨àµ à´¨à´¿à´™àµà´™à´³à´¾à´—àµà´°à´¹à´¿à´¯àµà´•àµà´•àµà´¨àµà´¨àµà´£àµà´Ÿàµ‹?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -62,7 +62,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -72,7 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -82,61 +82,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "serial"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "à´…à´šàµà´šà´Ÿà´¿ à´¯à´¨àµà´¤àµà´° à´†à´¶à´¯à´µà´¿à´¨à´¿à´®à´¯ à´¬à´¾à´•àµà´•àµ†à´¨àµâ€à´¡àµà´•à´³àµâ€:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -145,7 +151,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -155,7 +161,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/nb.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/nb.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/nb.po	Wed Jan  2 12:39:01 2008
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb.po_[sQSfZa]\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-27 19:04+0200\n"
 "Last-Translator: BjÃ¸rn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian BokmÃ¥l <i18n-nb at lister.ping.uio.no>\n"
@@ -18,34 +18,34 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Vil du sette opp en tjener kompatibel med BSD lpd?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
 msgstr ""
-"CUPS-pakka inneholder en tjener som kan ta imot utskriftsjobber som er i "
-"BSD-stil og sende dem over til CUPS. Du bÃ¸r bare sette den opp dersom du har "
+"CUPS-pakka inneholder en tjener som kan ta imot utskriftsjobber som er i BSD-"
+"stil og sende dem over til CUPS. Du bÃ¸r bare sette den opp dersom du har "
 "andre datamaskiner som sender utskrifter over nettverket via Â«BSDÂ» eller "
 "Â«LPRÂ»-tjenester, og disse maskinene ikke kan endres til Ã¥ bruke IPP - "
 "Internet Printing Protocol - som CUPS bruker."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Vil du at CUPS skal skrive ut ukjente jobber som rÃ¥ utskrift?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -54,103 +54,114 @@
 msgstr ""
 "Alle utskriftsjobber i IPP fÃ¥r en MIME-type. Siden ikke alle kilder som "
 "sender utskriftsjobber kan legge pÃ¥ en passende type, sÃ¥ blir mange jobber "
-"levert som MIME-typen application/octet-stream og kan bli avvist hvis CUPS ikke kan gjette seg til den rette typen."
+"levert som MIME-typen application/octet-stream og kan bli avvist hvis CUPS "
+"ikke kan gjette seg til den rette typen."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
-msgstr "CUPS kan behandle alle slike jobber som Â«rÃ¥Â» utskrift, noe som gjÃ¸r at de sendes direkte til skriveren uten behandling."
+msgstr ""
+"CUPS kan behandle alle slike jobber som Â«rÃ¥Â» utskrift, noe som gjÃ¸r at de "
+"sendes direkte til skriveren uten behandling."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
-msgstr "Hvis tjeneren kommer til Ã¥ behandle utskriftsjobber fra Windows-maskiner eller Samba-tjenere anbefales det at dette slÃ¥s pÃ¥."
+msgstr ""
+"Hvis tjeneren kommer til Ã¥ behandle utskriftsjobber fra Windows-maskiner "
+"eller Samba-tjenere anbefales det at dette slÃ¥s pÃ¥."
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "seriell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "sokkel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Kommunikasjonsmotorer for skriver:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-msgid "CUPS uses backend programs to communicate with the printer device or port."
+#: ../cupsys.templates:3002
+msgid ""
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 "CUPS bruker bakgrunns-Â«motorerÂ» til Ã¥ kommunisere med skriverenheten eller "
 "porten."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Dessverre lager noen motorer vanskeligheter. Noen PPD-kjerner, for "
-"eksempel, krasjer med parallell-motoren."
+"Dessverre lager noen motorer vanskeligheter. Noen PPD-kjerner, for eksempel, "
+"krasjer med parallell-motoren."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
 "Velg motor-program som CUPS skal bruke. Standardvalget passer antakelig i de "
 "vanligste miljÃ¸ene."
-

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po	Wed Jan  2 12:39:01 2008
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 1.1.20candidate6\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-30 17:47+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: Debian Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -26,14 +26,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr ""
 "Wilt u de server die zorgt voor compatibiliteit met de BSD-lpd instellen?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -49,13 +49,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Wilt u dat CUPS onbekende opdrachten onbewerkt naar de printer stuurt?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -71,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -81,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -91,61 +91,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "serieel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Backends voor printercommunicatie:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -154,7 +160,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -164,7 +170,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/pt.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/pt.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/pt.po	Wed Jan  2 12:39:01 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-04-08 23:35+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Deseja configurar o servidor de compatibilidade lpd BSD?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -39,14 +39,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "Deseja que o CUPS imprima trabalhos desconhecidos como trabalhos 'raw'?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -71,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -81,61 +81,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paralela"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "sÃ©rie"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "'Backends' de comunicaÃ§Ã£o com a impressora"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -144,7 +150,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -154,7 +160,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po	Wed Jan  2 12:39:01 2008
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
-"PO-Revision-Date: 2007-04-01 22:46-0300\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
+"PO-Revision-Date: 2007-12-16 15:36+0900\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw at debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "VocÃª quer configurar o servidor de compatibilidade BSD lpd?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,7 +38,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "VocÃª deseja que o CUPS imprima trabalhos desconhecidos como trabalhos \"raw"
@@ -46,7 +46,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -72,7 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -82,61 +82,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paralelo"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "serial"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "\"Backends\" de comunicaÃ§Ã£o com impressoras:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -145,7 +151,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -156,7 +162,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/ru.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/ru.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/ru.po	Wed Jan  2 12:39:01 2008
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys_1.2.7-4_ru.po\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-04-05 11:27+0300\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -30,13 +30,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ð¾ÑÑ‚Ð¸ Ñ BSD lpd?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -51,14 +51,14 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾Ð±Ñ‹ CUPS Ð¿ÐµÑ‡Ð°Ñ‚Ð°Ð» Ð½ÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ðµ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ ÐºÐ°Ðº Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ñ‹Ðµ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -72,7 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -82,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -92,61 +92,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "serial"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ½Ñ‹Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ Ð´Ð»Ñ ÑÐ²ÑÐ·Ð¸ Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð¼:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -155,7 +161,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -165,7 +171,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/sv.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/sv.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/sv.po	Wed Jan  2 12:39:01 2008
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 1.1.23-13\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-03-27 08:57+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -25,111 +25,153 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Vill du konfigurera den BSD-kompatibla lpd-servern?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
-msgid "The CUPS package contains a server that can accept BSD-style print jobs and submit them to CUPS. It should only be set up if other computers are likely to submit jobs over the network via the \"BSD\" or \"LPR\" services, and these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr "CUPS-paketet innehåller en server som kan acceptera utskriftsjobb av BSD-stil och skicka dem till CUPS. Den bör endast konfigureras om du har andra datorer som kommer att skicka jobb över nätverket via \"BSD\" eller \"LPR\"-tjänster och dessa datorer inte kan konverteras till att använda IPP-protokollet som CUPS använder."
+#: ../cupsys-bsd.templates:2001
+msgid ""
+"The CUPS package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if other computers are likely "
+"to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
+"these computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"CUPS-paketet innehåller en server som kan acceptera utskriftsjobb av BSD-"
+"stil och skicka dem till CUPS. Den bör endast konfigureras om du har andra "
+"datorer som kommer att skicka jobb över nätverket via \"BSD\" eller \"LPR\"-"
+"tjänster och dessa datorer inte kan konverteras till att använda IPP-"
+"protokollet som CUPS använder."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Vill du att CUPS ska skriva ut okända jobb som råjobb?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-msgid "The Internet Printing Protocol (IPP) enforces a MIME type for all print jobs. Since not all sources of print jobs can attach an appropriate type, many jobs get submitted as the MIME type application/octet-stream and could be rejected if CUPS cannot guess the job's format."
-msgstr "Internet Printing Protocol (IPP) använder en MIME-typ för alla sorters utskriftsjobb. Eftersom inte alla källor för utskriftsjobb kan skicka med en lämplig typ blir många jobb skickade som MIME-typen \"application/octet-stream\" och kan bli nekade om CUPS inte kan gissa jobbtypen."
+#: ../cupsys.templates:2001
+msgid ""
+"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
+"jobs. Since not all sources of print jobs can attach an appropriate type, "
+"many jobs get submitted as the MIME type application/octet-stream and could "
+"be rejected if CUPS cannot guess the job's format."
+msgstr ""
+"Internet Printing Protocol (IPP) använder en MIME-typ för alla sorters "
+"utskriftsjobb. Eftersom inte alla källor för utskriftsjobb kan skicka med en "
+"lämplig typ blir många jobb skickade som MIME-typen \"application/octet-"
+"stream\" och kan bli nekade om CUPS inte kan gissa jobbtypen."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-msgid "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent directly to the printer without processing."
-msgstr "CUPS kan hantera alla sådan jobb som \"raw\"-jobb vilket orsakar att de skickas direkt till skrivaren utan att först behandlas."
+#: ../cupsys.templates:2001
+msgid ""
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
+msgstr ""
+"CUPS kan hantera alla sådan jobb som \"raw\"-jobb vilket orsakar att de "
+"skickas direkt till skrivaren utan att först behandlas."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-msgid "It is recommended to choose this option if the server will be accepting print jobs from Windows computers or Samba servers."
-msgstr "Det är rekommenderat att välja det här alternativet om servern ska acceptera utskriftsjobb från Windows-datorer eller Samba-servrar."
+#: ../cupsys.templates:2001
+msgid ""
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
+"Det är rekommenderat att välja det här alternativet om servern ska acceptera "
+"utskriftsjobb från Windows-datorer eller Samba-servrar."
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "seriell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "uttag"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Bakändar för skrivarkommunikation:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-msgid "CUPS uses backend programs to communicate with the printer device or port."
-msgstr "CUPS använder bakändesprogram för att kommunicera med skrivarenheten eller porten."
+#: ../cupsys.templates:3002
+msgid ""
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr ""
+"CUPS använder bakändesprogram för att kommunicera med skrivarenheten eller "
+"porten."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-msgid "Unfortunately, some backend programs are likely to cause some trouble. For example, some PPC kernels crash with the parallel backend."
-msgstr "Tyvärr kan vissa bakändesprogram orsaka en del problem. Till exempel kan vissa PPC-kärnor krascha när den parallella bakänden används."
+#: ../cupsys.templates:3002
+msgid ""
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
+msgstr ""
+"Tyvärr kan vissa bakändesprogram orsaka en del problem. Till exempel kan "
+"vissa PPC-kärnor krascha när den parallella bakänden används."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-msgid "Please choose the backend program to be used by CUPS. The default choice should fit the most common environments."
-msgstr "Välj det bakändesprogram som ska användas av CUPS. Standardvalet bör passa de flesta vanliga miljöer."
+#: ../cupsys.templates:3002
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Välj det bakändesprogram som ska användas av CUPS. Standardvalet bör passa "
+"de flesta vanliga miljöer."
 
 #~ msgid ""
 #~ "If you will be accepting print jobs from Windows computers, you probably "
@@ -142,8 +184,10 @@
 #~ "utskriftsjobb som hanteras av en lokal drivare till MIME-typen "
 #~ "\"application/octet-stream\". Samba skickar också sina utskriftsjobb på "
 #~ "detta sätt."
+
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr "Port och/eller värdnamn som CUPS lyssnar på:"
+
 #~ msgid ""
 #~ "Please specify the port or the host name CUPS daemon will listen to. The "
 #~ "following formats are allowed:"
@@ -161,9 +205,11 @@
 #~ " - Portnummer (631);\n"
 #~ " - Värdnamn   (debian.exempel.se);\n"
 #~ " - Värd:Port   (debian.exempel.se:631)."
+
 #~ msgid ""
 #~ "You can combine any of these by delimiting in a space-separated list."
 #~ msgstr "Du kan kombinera flera av dessa genom att avgränsa med mellanslag."
+
 #~ msgid ""
 #~ "The default port 631 is reserved for the Internet Printing Protocol "
 #~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
@@ -172,50 +218,64 @@
 #~ "Standardport 631 är reserverad för Internet Printing Protocol (IPP). "
 #~ "\"localhost:631\" är rekommenderad för att ställa in en fristående miljö "
 #~ "av säkerhetsskäl."
+
 #~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
 #~ msgstr ""
 #~ "Vill du sända ut och/eller lyssna efter skrivarinformation för CUPS på "
 #~ "nätverket?"
+
 #~ msgid ""
 #~ "CUPS daemon can broadcast printer information for clients on the network, "
 #~ "and detect printers on the network automatically."
 #~ msgstr ""
 #~ "CUPS-demonen kan sända ut skrivarinformation för klienter på nätverket "
 #~ "och automatiskt identifiera skrivare på nätverket."
+
 #~ msgid ""
 #~ "If you choose this option, the CUPS daemon will periodically send UDP "
 #~ "broadcasts to detect printers."
 #~ msgstr ""
 #~ "Om du valde detta alternativ kommer CUPS-demonen att med jämna mellanrum "
 #~ "sända UDP-broadcast för att identifiera skrivare."
+
 #~ msgid "Incorrect value entered"
 #~ msgstr "Felaktigt värde angivet"
+
 #~ msgid "an error occurred while parsing the port number or the host name."
 #~ msgstr "ett fel inträffade vid tolkning av portnumret eller värdnamnet."
+
 #~ msgid "Please correct your input."
 #~ msgstr "Vänligen rätt till det."
+
 #~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
 #~ msgstr "ipp, lpd, parallell, scsi, seriell, socket, usb"
+
 #~ msgid "Select the backends you want."
 #~ msgstr "Välj det baksystem du vill använda."
+
 #~ msgid "Specify the port or/and host name that wants to be listened."
 #~ msgstr "Ange port och/eller värdnamn som ska lyssnas på."
+
 #~ msgid "- Port number (631)"
 #~ msgstr "- Portnummer (631)"
+
 #~ msgid "- Host name   (debian.example.com)"
 #~ msgstr "- Värdnamn   (debian.exempel.se)"
+
 #~ msgid "- Host:Port   (debian.example.com:631)"
 #~ msgstr "- Värd:Port   (debian.exempel.se:631)"
+
 #~ msgid "It is possible to combine by delimiting two or more values in space."
 #~ msgstr ""
 #~ "Det är möjligt att kombinera genom att avgränsa två eller fler värden med "
 #~ "mellanslag."
+
 #~ msgid ""
 #~ "When this option is accepted, CUPS daemon will broadcast and detect by "
 #~ "using UDP periodically."
 #~ msgstr ""
 #~ "När denna funktion accepteras kommer CUPS-demonen att sända ut och "
 #~ "identifiera genom att använda UDP med jämna mellanrum."
+
 #~ msgid "The wrong value is found in the input."
 #~ msgstr "Fel värde matades in."
-

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/templates.pot
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/templates.pot	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/templates.pot	Wed Jan  2 12:39:01 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
@@ -34,13 +34,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -50,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
@@ -58,7 +58,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -66,68 +66,74 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr ""
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr ""
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
@@ -135,7 +141,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/tr.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/tr.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/tr.po	Wed Jan  2 12:39:01 2008
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2004-04-25 10:34+0300\n"
 "Last-Translator: GÃ¼rkan Aslan <gurkan at iaslan.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -17,13 +17,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "BSD lpd uyumlu sunucuyu ayarlamak ister misiniz?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 #, fuzzy
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
@@ -39,13 +39,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "CUPS'Ä±n bilinmeyen ham (raw) gÃ¶revleri yazdÄ±rmasÄ±nÄ± istiyor musunuz?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 #, fuzzy
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
@@ -62,7 +62,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 #, fuzzy
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
@@ -74,7 +74,7 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
@@ -82,61 +82,67 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 #, fuzzy
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
@@ -146,7 +152,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 #, fuzzy
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
@@ -157,7 +163,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po	Wed Jan  2 12:39:01 2008
@@ -3,10 +3,10 @@
 # Clytie Siddall <clytie at riverland.net.au>, 2007.
 # 
 msgid ""
-""
-msgstr "Project-Id-Version: cupsys_1.2.11-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-25 04:32+0200\n"
+msgstr ""
+"Project-Id-Version: cupsys_1.2.11-2\n"
+"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"POT-Creation-Date: 2007-12-16 15:35+0900\n"
 "PO-Revision-Date: 2007-05-31 15:31+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -16,137 +16,163 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6.3b1\n"
 
-#.Type: boolean
-#.Description
+#. Type: boolean
+#. Description
 #: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Báº¡n cÃ³ muá»‘n thiáº¿t láºp trÃ¬nh phá»¥c vá»¥ tÆ°Æ¡ng thÃch vá»›i lpd BSD khÃ´ng?"
 
-#.Type: boolean
-#.Description
+#. Type: boolean
+#. Description
 #: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr "GÃ³i CUPS chá»©a má»™t trÃ¬nh phá»¥c vá»¥ cÃ³ kháº£ nÄƒng cháº¥p nháºn viá»‡c in kiá»ƒu BSD, cÅ©ng Ä‘á»‡ trÃ¬nh nÃ³ vÃ o CUPS. Chá»‰ nÃªn Ä‘áº·t gÃ³i nÃ y náº¿u mÃ¡y khÃ¡c sáº½ Ä‘á»‡ trÃ¬nh viá»‡c in qua máº¡ng báº±ng dá»‹ch vá»¥ Â« BSD Â» hay Â« LPR Â», vÃ  mÃ¡y khÃ¡c nÃ y khÃ´ng thá»ƒ Ä‘Æ°á»£c chuyá»ƒn Ä‘á»•i Ä‘á»ƒ sá» dá»¥ng giao thá»©c IPP mÃ  CUPS dÃ¹ng."
+msgstr ""
+"GÃ³i CUPS chá»©a má»™t trÃ¬nh phá»¥c vá»¥ cÃ³ kháº£ nÄƒng cháº¥p nháºn viá»‡c in kiá»ƒu BSD, cÅ©ng "
+"Ä‘á»‡ trÃ¬nh nÃ³ vÃ o CUPS. Chá»‰ nÃªn Ä‘áº·t gÃ³i nÃ y náº¿u mÃ¡y khÃ¡c sáº½ Ä‘á»‡ trÃ¬nh viá»‡c in "
+"qua máº¡ng báº±ng dá»‹ch vá»¥ Â« BSD Â» hay Â« LPR Â», vÃ  mÃ¡y khÃ¡c nÃ y khÃ´ng thá»ƒ Ä‘Æ°á»£c "
+"chuyá»ƒn Ä‘á»•i Ä‘á»ƒ sá» dá»¥ng giao thá»©c IPP mÃ  CUPS dÃ¹ng."
 
-#.Type: boolean
-#.Description
+#. Type: boolean
+#. Description
 #: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Báº¡n cÃ³ muá»‘n CUPS in viá»‡c in láº¡ nhÆ° lÃ  viá»‡c thÃ´ khÃ´ng?"
 
-#.Type: boolean
-#.Description
+#. Type: boolean
+#. Description
 #: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
-msgstr "Giao thá»©c In Máº¡ng (Internet Printing Protocol: IPP) Ã©p buá»™c kiá»ƒu MIME cho má»i viá»‡c in. VÃ¬ khÃ´ng pháº£i táº¥t cáº£ cÃ¡c nguá»“n viá»‡c in cÃ³ kháº£ nÄƒng Ä‘Ãnh kÃ¨m kiá»ƒu thÃch há»£p, nhiá»u viá»‡c Ä‘Æ°á»£c Ä‘á»‡ trÃ¬nh nhÆ° kiá»ƒu MIME Â« application/octet-stream Â» vÃ  cÃ³ thá»ƒ bá»‹ tá»« chá»‘i náº¿u CUPS khÃ´ng thá»ƒ Ä‘oÃ¡n Ä‘Æ°á»£c Ä‘á»‹nh dáº¡ng cá»§a viá»‡c in Ä‘Ã³."
+msgstr ""
+"Giao thá»©c In Máº¡ng (Internet Printing Protocol: IPP) Ã©p buá»™c kiá»ƒu MIME cho "
+"má»i viá»‡c in. VÃ¬ khÃ´ng pháº£i táº¥t cáº£ cÃ¡c nguá»“n viá»‡c in cÃ³ kháº£ nÄƒng Ä‘Ãnh kÃ¨m "
+"kiá»ƒu thÃch há»£p, nhiá»u viá»‡c Ä‘Æ°á»£c Ä‘á»‡ trÃ¬nh nhÆ° kiá»ƒu MIME Â« application/octet-"
+"stream Â» vÃ  cÃ³ thá»ƒ bá»‹ tá»« chá»‘i náº¿u CUPS khÃ´ng thá»ƒ Ä‘oÃ¡n Ä‘Æ°á»£c Ä‘á»‹nh dáº¡ng cá»§a "
+"viá»‡c in Ä‘Ã³."
 
-#.Type: boolean
-#.Description
+#. Type: boolean
+#. Description
 #: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
-msgstr "CUPS cÃ³ kháº£ nÄƒng quáº£n lÃ½ cÃ¡c viá»‡c nhÆ° váºy nhÆ° lÃ  viá»‡c Â« thÃ´ Â», mÃ  gÃ¢y ra chÃºng Ä‘Æ°á»£c gá»i trá»±c tiáº¿p cho mÃ¡y in, khÃ´ng xá» lÃ½ gÃ¬."
+msgstr ""
+"CUPS cÃ³ kháº£ nÄƒng quáº£n lÃ½ cÃ¡c viá»‡c nhÆ° váºy nhÆ° lÃ  viá»‡c Â« thÃ´ Â», mÃ  gÃ¢y ra "
+"chÃºng Ä‘Æ°á»£c gá»i trá»±c tiáº¿p cho mÃ¡y in, khÃ´ng xá» lÃ½ gÃ¬."
 
-#.Type: boolean
-#.Description
+#. Type: boolean
+#. Description
 #: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
-msgstr "KhuyÃªn báº¡n báºt tÃ¹y chá»n nÃ y náº¿u trÃ¬nh phá»¥c vá»¥ sáº½ cháº¥p nháºn viá»‡c in tá»« mÃ¡y Windows hay trÃ¬nh phá»¥c vá»¥ Samba."
+msgstr ""
+"KhuyÃªn báº¡n báºt tÃ¹y chá»n nÃ y náº¿u trÃ¬nh phá»¥c vá»¥ sáº½ cháº¥p nháºn viá»‡c in tá»« mÃ¡y "
+"Windows hay trÃ¬nh phá»¥c vá»¥ Samba."
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "song song"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "serial"
 msgstr "ná»‘i tiáº¿p"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "socket"
 msgstr "á»• cáº¯m"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
-#.Type: multiselect
-#.Choices
+#. Type: multiselect
+#. Choices
 #: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
-#.Type: multiselect
-#.Description
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:3001
+msgid "dnssd"
+msgstr "dnssd"
+
+#. Type: multiselect
+#. Description
 #: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Háºu phÆ°Æ¡ng liÃªn láº¡c vá»›i mÃ¡y in:"
 
-#.Type: multiselect
-#.Description
+#. Type: multiselect
+#. Description
 #: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
-msgstr "Pháº§n má»m CUPS dÃ¹ng má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng Ä‘á»ƒ liÃªn láº¡c vá»›i thiáº¿t bá»‹/cá»•ng mÃ¡y in."
+msgstr ""
+"Pháº§n má»m CUPS dÃ¹ng má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng Ä‘á»ƒ liÃªn láº¡c vá»›i thiáº¿t bá»‹/"
+"cá»•ng mÃ¡y in."
 
-#.Type: multiselect
-#.Description
+#. Type: multiselect
+#. Description
 #: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
-msgstr "Ráº¥t tiáº¿c lÃ  má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng cÃ³ thá»ƒ gÃ¢y ra lá»—i. Cháº³ng háº¡n, má»™t sá»‘ háº¡t nhÃ¢n PPC sáº½ sá»¥p Ä‘á»• khi cháº¡y cÃ¹ng vá»›i háºu phÆ°Æ¡ng song song."
+msgstr ""
+"Ráº¥t tiáº¿c lÃ  má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng cÃ³ thá»ƒ gÃ¢y ra lá»—i. Cháº³ng háº¡n, má»™t "
+"sá»‘ háº¡t nhÃ¢n PPC sáº½ sá»¥p Ä‘á»• khi cháº¡y cÃ¹ng vá»›i háºu phÆ°Æ¡ng song song."
 
-#.Type: multiselect
-#.Description
+#. Type: multiselect
+#. Description
 #: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
-msgstr "HÃ£y chá»n chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng CUPS cáº§n dÃ¹ng. Sá»± chá»n máº·c Ä‘á»‹nh nÃªn thÃch há»£p vá»›i pháº§n lá»›n mÃ´i trÆ°á»ng thÆ°á»ng dÃ¹ng."
+msgstr ""
+"HÃ£y chá»n chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng CUPS cáº§n dÃ¹ng. Sá»± chá»n máº·c Ä‘á»‹nh nÃªn thÃch "
+"há»£p vá»›i pháº§n lá»›n mÃ´i trÆ°á»ng thÆ°á»ng dÃ¹ng."
 
 #~ msgid ""
 #~ "If you will be accepting print jobs from Windows computers, you probably "
 #~ "want this option set, as Windows gives all IPP print jobs processed by a "
 #~ "local driver the MIME type application/octet-stream. Samba also submits "
 #~ "its print jobs this way."
-#~ msgstr "Náº¿u báº¡n sáº½ cáº§n pháº£i nháºn viá»‡c in tá»« mÃ¡y tÃnh cháº¡y há»‡ Ä‘iá»u hÃ nh Windows "
+#~ msgstr ""
+#~ "Náº¿u báº¡n sáº½ cáº§n pháº£i nháºn viá»‡c in tá»« mÃ¡y tÃnh cháº¡y há»‡ Ä‘iá»u hÃ nh Windows "
 #~ "thÃ¬ ráº¥t cÃ³ thá»ƒ lÃ  báº¡n muá»‘n láºp tÃ¹y chá»n nÃ y, vÃ¬ pháº§n má»m Windows gÃ¡n má»i "
 #~ "viá»‡c in IPP Ä‘Æ°á»£c xá» lÃ½ bá»Ÿi trÃ¬nh Ä‘iá»u khiá»ƒn Ä‘á»‹a phÆ°Æ¡ng, kiá»ƒu MIME Â« "
 #~ "application/octet-stream Â». Pháº§n má»m Samba cÅ©ng Ä‘á»‡ trÃ¬nh cÃ¡c viá»‡c in báº±ng "
@@ -158,7 +184,8 @@
 #~ msgid ""
 #~ "Please specify the port or the host name CUPS daemon will listen to. The "
 #~ "following formats are allowed:"
-#~ msgstr "HÃ£y gÃµ cá»•ng hay tÃªn mÃ¡y trÃªn mÃ  trÃ¬nh ná»n CUPS sáº½ láº¯ng nghe. Cho phÃ©p "
+#~ msgstr ""
+#~ "HÃ£y gÃµ cá»•ng hay tÃªn mÃ¡y trÃªn mÃ  trÃ¬nh ná»n CUPS sáº½ láº¯ng nghe. Cho phÃ©p "
 #~ "nhá»¯ng khuÃ´n dáº¡ng theo Ä‘Ã¢y:"
 
 #~ msgid ""
@@ -166,21 +193,24 @@
 #~ " - Host name   (debian.example.com);\n"
 #~ " - Host:Port   (debian.example.com:631);\n"
 #~ " - File domain socket (/var/run/cups/cups.sock)."
-#~ msgstr " â€¢ sá»• cá»•ng (v.d. 631)\n"
+#~ msgstr ""
+#~ " â€¢ sá»• cá»•ng (v.d. 631)\n"
 #~ " â€¢ tÃªn mÃ¡y (v.d. vÃ_dá»¥.vnoss.org)\n"
-#~ " â€¢ mÃ¡y:cá»•ng (v.d. vÃ_dá»¥.vnoss.org:631)"
-#~ " â€¢ á»• cáº¯m miá»n táºp tin (v.d. /var/run/cups/cups.sock)"
+#~ " â€¢ mÃ¡y:cá»•ng (v.d. vÃ_dá»¥.vnoss.org:631) â€¢ á»• cáº¯m miá»n táºp tin (v.d. /var/"
+#~ "run/cups/cups.sock)"
 
 #~ msgid ""
 #~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr "Báº¡n cÃ³ thá»ƒ káº¿t há»£p vÃ i khuÃ´n dáº¡ng phÃ¢n cÃ¡ch bá»Ÿi khoáº£ng tráº¯ng trong danh "
+#~ msgstr ""
+#~ "Báº¡n cÃ³ thá»ƒ káº¿t há»£p vÃ i khuÃ´n dáº¡ng phÃ¢n cÃ¡ch bá»Ÿi khoáº£ng tráº¯ng trong danh "
 #~ "sÃ¡ch."
 
 #~ msgid ""
 #~ "The default port 631 is reserved for the Internet Printing Protocol "
 #~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
 #~ "for security reasons."
-#~ msgstr "Cá»•ng máº·c Ä‘á»‹nh 631 dÃ nh cho Giao thá»©c In Máº¡ng (Internet Printing Protocol: "
+#~ msgstr ""
+#~ "Cá»•ng máº·c Ä‘á»‹nh 631 dÃ nh cho Giao thá»©c In Máº¡ng (Internet Printing Protocol: "
 #~ "IPP). KhuyÃªn báº¡n dÃ¹ng Â« localhost:631 Â» Ä‘á»ƒ thiáº¿t láºp mÃ´i trÆ°á»ng Ä‘á»™c láºp "
 #~ "vÃ¬ lÃ½ do báº£o máºt. "
 
@@ -190,13 +220,15 @@
 #~ msgid ""
 #~ "CUPS daemon can broadcast printer information for clients on the network, "
 #~ "and detect printers on the network automatically."
-#~ msgstr "TrÃ¬nh ná»n CUPS cÃ³ thá»ƒ phÃ¡t thanh thÃ´ng tin vá» mÃ¡y in cho trÃ¬nh khÃ¡ch trÃªn "
+#~ msgstr ""
+#~ "TrÃ¬nh ná»n CUPS cÃ³ thá»ƒ phÃ¡t thanh thÃ´ng tin vá» mÃ¡y in cho trÃ¬nh khÃ¡ch trÃªn "
 #~ "máº¡ng nghe, vÃ  tá»± Ä‘á»™ng phÃ¡t hiá»‡n mÃ¡y in nÃ o trÃªn máº¡ng."
 
 #~ msgid ""
 #~ "If you choose this option, the CUPS daemon will periodically send UDP "
 #~ "broadcasts to detect printers."
-#~ msgstr "Náº¿u báº¡n láºp tÃ¹y chá»n nÃ y, trÃ¬nh ná»n CUPS sáº½ gá»Ÿi Ä‘á»‹nh ká»³ viá»‡c phÃ¡t thanh "
+#~ msgstr ""
+#~ "Náº¿u báº¡n láºp tÃ¹y chá»n nÃ y, trÃ¬nh ná»n CUPS sáº½ gá»Ÿi Ä‘á»‹nh ká»³ viá»‡c phÃ¡t thanh "
 #~ "UDP Ä‘á»ƒ phÃ¡t hiá»‡n mÃ¡y in."
 
 #~ msgid "Incorrect value entered"

