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

Martin Pitt mpitt at alioth.debian.org
Mon May 14 09:10:24 UTC 2007


Author: mpitt
Date: Mon May 14 09:10:23 2007
New Revision: 477

Log:
merge to Debian unstable

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch
      - copied unchanged from r476, /cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-external-pam-helper.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po
Removed:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-external-pam-helper.dpatch
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/NEWS
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys-bsd.templates
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys-client.postinst
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postrm
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.templates
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
   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/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/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
   cupsys/branches/cups-1.2-ubuntu/debian/rules

Modified: cupsys/branches/cups-1.2-ubuntu/debian/NEWS
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/NEWS	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/NEWS	Mon May 14 09:10:23 2007
@@ -1,3 +1,20 @@
+cupsys (1.2.11-1) unstable; urgency=low
+
+  * The cupsd server process now runs as a system user 'cupsys' instead of
+    root. This limits the potential impact of any vulnerability in cupsd or
+    one of its callouts to the printing configuration and jobs instead of
+    offering a wide open vector for root compromise. This change and the
+    upgrade should be transparent, thus this does not require any
+    configuration change.
+  * The groups of the cupsys system user ensures that cupsd can open parallel
+    and USB printer devices (lp), serial printers (dialout), and
+    printer/scanner combinations (scanner). For out-of-the box usage of the
+    Snakeoil SSL certificate it is also in the ssl-cert group.
+  * This version breaks the current cups-pdf package. A new version of
+    cups-pdf is prepared and will be uploaded soon.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 14 May 2007 09:18:48 +0200
+
 cupsys (1.2.1-3) unstable; urgency=low
 
   * The USB backend no longer supports the usb:/dev/foo

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	Mon May 14 09:10:23 2007
@@ -1,18 +1,140 @@
-cupsys (1.2.10-0ubuntu1) UNRELEASED; urgency=low
+cupsys (1.2.11-1ubuntu1) UNRELEASED; urgency=low
 
-  * New upstream bugfix release.
+  * Synchronize to Debian; remaining Ubuntu changes:
+    - Snakeoil SSL cert support:
+      + debian/control: Add ssl-cert dependency.
+      + debian/cupsys.postinst: Symlink snakeoil SSL certificate if present.
+      + debian/cupsys.preinst: Fix global SSL certificate owner/mode breakage
+        (see 1.2.1-2ubuntu2); this needs to be kept until the next LTS
+        release.
+    - TearDown (fast shutdown):
+      + debian/control: Add sysv-rc (>= 2.86.ds1-14.1ubuntu2) dependency.
+      + debian/cupsys.postinst: Remove obsolete rc.d links.
+      + debian/rules: Use 'multiuser' update-rc.d mode.
+    - debian/control: Drop cupsys-dbg.
+    - debian/cupsys.{config,postinst}: Transition to enable additional
+      backends on upgrades. Needs to be kept until next LTS release.
+    - 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.
   * Drop patches which are upstream now:
     - 80_brother_no_backchannel.dpatch
     - 92_texttops-prettyprint-crash.dpatch
     - 94_doc-port-in-client-conf.dpatch
     - 96_more-bug-fixes-between-cups-1.2.8-1.2.9.dpatch
     - 90_testpage-on-large-paper-sizes.dpatch
-  * Adapt debian/patches/09_runasuser_autoconf.dpatch to new upstream version.
-  * Remove debian/patches/03_clean.dpatch, update manual cleanup in
-    debian/rules: Current upstream version cleans up most build junk, except
-    for two files.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 30 Apr 2007 11:18:59 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 14 May 2007 11:07:42 +0200
+
+cupsys (1.2.11-1) unstable; urgency=low
+
+  [ Kenshi Muto ]
+  * Applied templates improvement patch contributed by
+    debian-l10n-english team. (closes: #416350)
+  * Debconf translation
+    - Japanese
+    - Galician (closes: #416357)
+    - Swedish (closes: #416356)
+    - Catalan (closes: #416367)
+    - Basque (closes: #416385)
+    - Norwegian (closes: #416401)
+    - Italian (closes: #416407)
+  * New upstream version 1.2.11:
+    - 56_dirsvc patch is merged.
+
+  [ Christian Perrier ]
+  * Debconf translation
+    - Czech (closes: #416939)
+    - German (closes: #416994)
+    - Brazilian Portuguese (closes: #417249)
+    - French
+    - Malayalam. (closes: #418030)
+    - Russian. (closes: #417874)
+    - Dutch. (closes: #418135)
+    - Portuguese (closes: #418299)
+
+  [ Martin Pitt ]
+  * New upstream bugfix release (closes: #421899).
+
+  Synchronize patches with Ubuntu and new upstream version 1.2.10:
+
+  * Drop patches which are fixed upstream:
+    00_00str2111.dpatch, 00_01str2137.dpatch, 00_02str2144.dpatch,
+    00_03str2106.dpatch, 00_04str2117.dpatch, 00_05str2133.dpatch,
+    00_06str2121.dpatch, 00_07str2123.dpatch, 00_08str2135.dpatch,
+    00_09str2198.dpatch, 03_clean.dpatch, 65_detect_http_shutdown.dpatch
+  * Remove a few obsolete patches:
+    08_cupsd.conf.conf.d.dpatch, 26_modprobe.dpatch, 48_stdlib.dpatch,
+    61_job_c_strangeloop.dpatch, 08_cupsd.conf.conf.d.dpatch,
+    64_driverfolder.dpatch.
+  * Add debian/patches/14_dont_force_ssl.dpatch: Do not require SSL for /admin
+    pages, since gnome-cups-manager (and most probably other GUI frontends)
+    does not support this.
+  * Add debian/patches/58_cupsd.conf-AllowLocal.dpatch: Allow access to local
+    ethernet by default. This just affects the ACL, for actually enabling
+    access cupsd needs to be switched to not only listen on localhost. With
+    that, this setting does not need to be configured in two different places.
+  * Add debian/patches/70_reactivate_recommended_driver.dpatch: Upstream CUPS
+    filters the "(recommended)" marking from the NickNames of the PPD files
+    when listing PPDs. These are an important orientation for the user and
+    they are also made use of by some printer setup tools. We need them at
+    least until a better solution for recommending drivers gets available.
+  * Add debian/patches/98_search_mime_files_in_usr_share.dpatch: Let CUPS also
+    search for *.types and *.convs files in /usr/share/cups/mime. This way
+    packages can provide *.types and *.convs files which do not get considered
+    as conffiles. (See https://launchpad.net/36532 for details).
+  * debian/patches/*.dpatch: Forwarded a lot of patches to upstream bug
+    tracker, add STR URLs to dpatch DP: headers.
+
+  Synchronize packaging with Ubuntu:
+
+  * debian/control: Drop transitional libcupsys2-gnutls10 package, it was only
+    required for Sarge->Etch upgrades.
+  * debian/control: Change netbase dependency to update-inetd, since that
+    lives in its own package now.
+  * debian/local/enable_sharing: Also match on 127.0.0.1 IP adresses in
+    addition to 'localhost'.
+  * debian/rules: Most of the clean:: rule is obsolete, only two files are
+    left behind now. These two have been reported upstream in
+    http://www.cups.org/str.php?L2366.
+  * debian/cupsys.templates: Activate SCSI, serial, and SNMP backends by
+    default. With these backends activated, many printers can be easily set up
+    with the printer setup tools.  Especially network printers get
+    auto-detected and the correct URI gets assigned to them (doing this
+    manually is a non-trivial task for most users).
+  * debian/cupsys.dirs: Add /usr/share/ppd/custom/, a place where lpadmins can
+    store additional PPDs (this functionality is e. g. provided in
+    gnome-cups-manager's "Custom driver..." file dialog).
+  * debian/cupsys.init.d: Give proper permissions to /usr/share/ppd/custom/:
+    root:lpadmin 3775. Drop the obsolete chmod/chowning of
+    /usr/share/cups/model.
+  * Run the backend as non-root system user to confine the impact of security
+    vulnerabilities:
+    - Add debian/patches/10_external_pam_helper.dpatch:
+      + Add a helper program 'cups-check-pam-auth' which performs PAM
+        authentication and returns the status as exit code.
+      + scheduler/auth.c, cupsdAuthorize(): Attempt to use
+        cups-check-pam-auth before trying native PAM.
+      + With this we do not need to put the cupsys user into the shadow group.
+    - debian/cupsys.files: Install PAM helper.
+    - debian/cupsys.postinst: Set permissions of PAM helper to cupsys:shadow
+      2754, alter permissions of some configuration files and directories to
+      work with non-root cupsd.
+    - debian/cupsys.postinst: Fix /var/cache/cups/ permissions for upgrades
+      which might have written cache files as root.
+    - debian/cupsys.logrotate: Save log files as cupsys:lpadmin.
+    - debian/cupsys.init.d: Disable 'reload'; change force-reload to restart,
+      since cupsd cannot reload as non-root.
+    - debian/cupsys.init.d: Set up proper permissions of log files.
+    - debian/rules: Enable --enable-privilege-dropping configure option.
+    - debian/rules: Install lpd backend suid root, so that it can bind to
+      ports < 1024 (really silly, but required for RFC compliance).
+    - debian/cupsys-client.postinst, debian/cupsys.postinst: Set up cupsys
+      system user.
+  * debian/NEWS: Describe derooting.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 14 May 2007 09:23:16 +0200
 
 cupsys (1.2.8-0ubuntu8) feisty; urgency=low
 

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	Mon May 14 09:10:23 2007
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
 Standards-Version: 3.7.2
 Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev
-Uploaders: Kenshi Muto <kmuto at debian.org>, Masayuki Hatta <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>, Martin-Éric Racine <q-funk at iki.fi>
+Uploaders: Kenshi Muto <kmuto at debian.org>, Masayuki Hatta <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>, Martin-Éric Racine <q-funk at iki.fi>, Martin Pitt <mpitt at debian.org>
 
 Package: libcupsys2
 Priority: optional
@@ -159,8 +159,8 @@
 Section: net
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: cupsys (<< 1.2.3-1)
-Replaces: cupsys (<< 1.2.3-1)
+Conflicts: cupsys (<< 1.2.1-4)
+Replaces: cupsys (<< 1.2.1-4)
 Description: Common UNIX Printing System(tm) - common files
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys-bsd.templates
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys-bsd.templates	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys-bsd.templates	Mon May 14 09:10:23 2007
@@ -1,8 +1,12 @@
+# These templates have been reviewed by debian-l10n-english
+# Please do not modify them without asking for a review
+
 Template: cupsys-bsd/setuplpd
 Type: boolean
 Default: false
 _Description: Do you want to set up the BSD lpd compatibility server?
- This package contains a server that can accept BSD-style print jobs and
- submit them to CUPS. It should only be set up if you have other computers
- that submit jobs over the network via "BSD" or "LPR" services, and these
- computers cannot be converted to use the IPP protocol that CUPS uses.
+ 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.

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys-client.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys-client.postinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys-client.postinst	Mon May 14 09:10:23 2007
@@ -30,17 +30,20 @@
 
 	# Set up cupsys user.
 	if [ -z "`getent passwd cupsys`" ]; then
-	    adduser --system --no-create-home --ingroup lpadmin --disabled-password cupsys
+	    adduser --quiet --system --no-create-home --ingroup lpadmin cupsys
 	fi
+	
 	# necessary for access to local parallel and usb printers
 	adduser --quiet cupsys lp
 	# necessary for access to local serial printers
 	adduser --quiet cupsys dialout
-	# necessary for web authentication
-	# disabled by default since lpadmin membership is sufficient
-	# adduser --quiet cupsys shadow
-	chown cupsys:lpadmin /usr/bin/lppasswd
+	# necessary for access to printer/scanner combo devices
+	if [ -z "`getent group scanner`" ]; then
+	    addgroup --system scanner
+	fi
+	adduser --quiet cupsys scanner
 
+	chown cupsys:lpadmin /usr/bin/lppasswd
 	chmod u+s /usr/bin/lppasswd
     ;;
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs	Mon May 14 09:10:23 2007
@@ -6,6 +6,6 @@
 usr/lib/cups/backend-available
 var/cache/cups/ppd
 usr/share/ppd/cups-included
-usr/lib/cups/driver
 usr/share/ppd/custom
+usr/lib/cups/driver
 usr/local/share/ppd

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	Mon May 14 09:10:23 2007
@@ -29,7 +29,14 @@
 	log_begin_msg "Starting $DESC: $NAME"
 	chown root:lpadmin /usr/share/ppd/custom 2>/dev/null || true
 	chmod 3775 /usr/share/ppd/custom 2>/dev/null || true
+
 	mkdir -p `dirname "$PIDFILE"`
+	if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
+             -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe \
+             -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
+	  modprobe -q lp || true
+	  modprobe -q ppdev || true
+	fi
 	chown cupsys:lp `dirname "$PIDFILE"`
 
 	# create the logs file since cupsd can't
@@ -39,13 +46,6 @@
 	    chown cupsys:lpadmin /var/log/cups/$l
 	done
 
-	if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
-             -a -f /proc/devices -a -f /proc/modules \
-	     -a -x /sbin/modprobe ]; then
-	  modprobe -q lp || true
-	  modprobe -q ppdev || true # for ISO-1284 device name detection
-	fi
-
 	start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec $DAEMON
 
 	# Correct the permissions after starting the CUPS daemon
@@ -53,7 +53,6 @@
 	    chmod 640 /var/log/cups/$l || true
 	    chown cupsys:lpadmin /var/log/cups/$l || true
 	done
-
 	log_end_msg $?
 	;;
   stop)

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	Mon May 14 09:10:23 2007
@@ -49,14 +49,10 @@
 	if [ -z "`getent passwd cupsys`" ]; then
 	    adduser --quiet --system --no-create-home --ingroup lpadmin cupsys
 	fi
-	
 	# necessary for access to local parallel and usb printers
 	adduser --quiet cupsys lp
 	# necessary for access to local serial printers
 	adduser --quiet cupsys dialout
-	# necessary for web authentication
-	# disabled by default since lpadmin membership is sufficient
-	# adduser --quiet cupsys shadow
 	# necessary for access to printer/scanner combo devices
 	if [ -z "`getent group scanner`" ]; then
 	    addgroup --system scanner
@@ -123,60 +119,34 @@
 	    db_fset cupsys/raw-print changed false
 	fi
 	# Set up backends
-	#db_fget cupsys/backend changed
-	#if [ "$RET" = "true" ] || [ -z "$2" ]; then
 	db_get cupsys/backend && SELECTED=$RET
 	list=`echo $SELECTED | sed -e 's/, /,/g'`
 	save_IFS=$IFS
 	IFS=,
 	(cd /usr/lib/cups/backend && rm -f http ipp lpd parallel scsi serial socket usb snmp)
 	for module in $list; do
-	    ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
-	    if [ "$module" = "ipp" ]; then
-		ln /usr/lib/cups/backend/ipp /usr/lib/cups/backend/http
-	    fi
+	  ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
+	  if [ "$module" = "ipp" ]; then
+            ln /usr/lib/cups/backend/ipp /usr/lib/cups/backend/http
+	  fi
 	done
 	IFS=$save_IFS
-	db_fset cupsys/backend changed false
-	#fi
+        db_fset cupsys/backend changed false
+
+        # In cupsys 1.2.8-0ubuntu3 the defaults for the active backends
+        # changed. snmp, scsi, and serial got added. So activate these
+        # backends.
+        if dpkg --compare-versions "$2" lt-nl "1.2.8-0ubuntu3"; then
+            for module in snmp scsi serial; do
+                [ -e /usr/lib/cups/backend/$module ] || \
+                ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
+            done
+        fi
+        
+        # Resync Debconf database with real state
+        list=`( cd /usr/lib/cups/backend && for f in ipp lpd parallel scsi serial socket usb snmp; do [ -e $f ] && echo -n "$f, "; done ) | sed -e 's/, $//'`
+        db_set cupsys/backend $list;
 
-	# Assure that the special permissions of the lpd backend are also set
-	# for the link in /usr/lib/cups/backend/
-	if [ -e /usr/lib/cups/backend/lpd ]; then
-	    chown root:lp /usr/lib/cups/backend/lpd
-	    chmod 4754 /usr/lib/cups/backend/lpd
-	fi
-
-	# In cupsys 1.2.8-0ubuntu3 the defaults for the active backends
-	# changed. snmp, scsi, and serial got added. So activate these
-	# backends.
-	if dpkg --compare-versions "$2" lt-nl "1.2.8-0ubuntu3"; then
-	    for module in snmp scsi serial; do
-		[ -e /usr/lib/cups/backend/$module ] || \
-		ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
-	    done
-	fi
-
-	# In cupsys from 1.2.8-0ubuntu3 to 1.2.8-0ubuntu6 there were bugs
-	# which messed up the backend configuration. Reset to all backends
-	# being active when updating from one of these versions. Correct also
-	# if we update from 1.2.8-0ubuntu7 as the user can have updated from
-	# one of the broken versions to 1.2.8-0ubuntu7.
-	if dpkg --compare-versions "$2" ge "1.2.8-0ubuntu3" && \
-	   dpkg --compare-versions "$2" lt-nl "1.2.8-0ubuntu8" ; then
-	    for module in ipp lpd parallel scsi serial snmp socket usb; do
-		[ -e /usr/lib/cups/backend/$module ] || \
-		ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
-		if [ "$module" = "ipp" ]; then
-		    [ -e /usr/lib/cups/backend/http ] || \
-		    ln /usr/lib/cups/backend/ipp /usr/lib/cups/backend/http
-		fi
-	    done
-	fi
-
-	# Resync Debconf database with real state
-	list=`( cd /usr/lib/cups/backend && for f in ipp lpd parallel scsi serial socket usb snmp; do [ -e $f ] && echo -n "$f, "; done ) | sed -e 's/, $//'`
-	db_set cupsys/backend $list;
 
 	# Create password file for Digest authentication
         # (removed: Debian CUPS uses PAM and basic authentication)
@@ -196,11 +166,13 @@
 	#fi
 
 	# Revert to single file
-	if [ -f /etc/cups/cups.d/ports.conf -o -f /etc/cups/cups.d/browse.conf ]; then
-	  perl -e 'sub readfile { local($_) = @_; open(F, $_); while (<F>) { print; } }; while (<STDIN>) { s#^Include\s+(/etc/cups/cups.d/(?:ports.conf|browse.conf))#&readfile($1)#ei; print;}' < /etc/cups/cupsd.conf > /etc/cups/cupsd.conf.$$
-	  mv /etc/cups/cupsd.conf.$$ /etc/cups/cupsd.conf
-	  rm -f /etc/cups/cups.d/ports.conf /etc/cups/cups.d/browse.conf
-	  rmdir /etc/cups/cups.d 2>/dev/null || /bin/true
+	if [ $(dpkg --compare-versions "$2" gt 1.1.23-12 && dpkg --compare-versions "$2" lt 1.2.1-3 && echo "yes") ]; then
+	  if [ -f /etc/cups/cups.d/ports.conf -o -f /etc/cups/cups.d/browse.conf ]; then
+	    perl -e 'sub readfile { local($_) = @_; open(F, $_); while (<F>) { print; } }; while (<STDIN>) { s#^Include\s+(/etc/cups/cups.d/(?:ports.conf|browse.conf))#&readfile($1)#ei; print;}' < /etc/cups/cupsd.conf > /etc/cups/cupsd.conf.$$
+	    mv /etc/cups/cupsd.conf.$$ /etc/cups/cupsd.conf
+	    rm -f /etc/cups/cups.d/ports.conf /etc/cups/cups.d/browse.conf
+	    rmdir /etc/cups/cups.d 2>/dev/null || /bin/true
+	  fi
 	fi
 	#
 	# Create /etc/cups/cups.d/ports.conf and /etc/cups/cups.d/browse.conf
@@ -254,7 +226,7 @@
 	# permission configuration
 	chown root:lp /etc/cups ; chmod 3755 /etc/cups
 	chown cupsys:root /etc/cups/cupsd.conf ; chmod 644 /etc/cups/cupsd.conf
-	chown root:lp /etc/cups/ppd ; chmod 755 /etc/cups/ppd
+	chown -R cupsys:lp /etc/cups/ppd ; chmod 755 /etc/cups/ppd
 	chown cupsys:shadow /usr/lib/cups/daemon/cups-check-pam-auth
 	chmod 2754 /usr/lib/cups/daemon/cups-check-pam-auth
 	if [ ! -d /var/run/cups/certs ]; then
@@ -267,44 +239,34 @@
 	if [ -f /etc/cups/printers.conf ]; then
 	  chown root:lp /etc/cups/printers.conf ; chmod 600 /etc/cups/printers.conf
 	fi
+	# Add symlink to local files required by LSB
+	if [ ! -e /usr/share/ppd/1-local-admin -a ! -L /usr/share/ppd/1-local-admin ]; then
+	  ln -s /usr/local/share/ppd /usr/share/ppd/1-local-admin
+	fi
+	if [ ! -e /usr/share/ppd/2-third-party -a ! -L /usr/share/ppd/2-third-party ]; then
+	  ln -s /opt/share/ppd /usr/share/ppd/2-third-party
+	fi
 
 	# fix permissions for upgrades which might have written cache files as
 	# root
 	if [ -d /var/cache/cups ]; then
 	    chown -R cupsys:lp /var/cache/cups || true
 	fi
-	
-	# symlink snakeoil SSL certificate if present
-	if dpkg --compare-versions "$2" le "1.2.1-2ubuntu1" && \
-	    [ -e /etc/ssl/certs/ssl-cert-snakeoil.pem -a \
-	      -e /etc/ssl/private/ssl-cert-snakeoil.key -a \
-	      -n "`getent group ssl-cert`" -a \
-	      ! -e /etc/cups/ssl/server.crt -a \
-	      ! -e /etc/cups/ssl/server.key ]; then 
-	     ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/cups/ssl/server.crt
-	     ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/cups/ssl/server.key
-	     adduser cupsys ssl-cert
-	fi
 
-
-	# Remove shutdown and reboot links; this init script does not need them.
-	if dpkg --compare-versions "$2" lt "1.2.1-2ubuntu3"; then
-	    rm -f /etc/rc0.d/K19cupsys /etc/rc6.d/K19cupsys
-	fi
-
-	# remove shadow privilege from cupsys (admins might have manually added
-	# cupsys to shadow to enable the web interface in earlier versions)
-	if dpkg --compare-versions "$2" le-nl "1.2.2-0ubuntu2"; then
-	    deluser --quiet cupsys shadow 2>/dev/null || true
-	fi
-
-	# Add symlink to local files required by LSB
-	#if [ ! -e /usr/share/ppd/1-local-admin -a ! -L /usr/share/ppd/1-local-admin ]; then
-	#  ln -s /usr/local/share/ppd /usr/share/ppd/1-local-admin
-	#fi
-	#if [ ! -e /usr/share/ppd/2-third-party -a ! -L /usr/share/ppd/2-third-party ]; then
-	#  ln -s /opt/share/ppd /usr/share/ppd/2-third-party
-	#fi
+        # symlink snakeoil SSL certificate if present
+        if [ -e /etc/ssl/certs/ssl-cert-snakeoil.pem -a \
+              -e /etc/ssl/private/ssl-cert-snakeoil.key -a \
+              -n "`getent group ssl-cert`" -a ! -e /etc/cups/ssl/server.crt -a \
+              ! -e /etc/cups/ssl/server.key ]; then 
+             ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/cups/ssl/server.crt
+             ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/cups/ssl/server.key
+             adduser cupsys ssl-cert
+        fi
+        
+        # Remove shutdown and reboot links; this init script does not need them.
+        if dpkg --compare-versions "$2" lt "1.2.1-2ubuntu3"; then
+            rm -f /etc/rc0.d/K19cupsys /etc/rc6.d/K19cupsys
+        fi
 
     ;;
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postrm
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postrm	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postrm	Mon May 14 09:10:23 2007
@@ -35,7 +35,6 @@
 	rm -f /etc/cups/printers.conf* /etc/cups/classes.conf.* \
 		/var/lib/cups/ppds.dat /etc/cups/raw.convs /etc/cups/raw.types
 	rmdir /etc/cups 2>/dev/null || true
-	deluser --system --quiet cupsys
 	;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.templates
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.templates	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.templates	Mon May 14 09:10:23 2007
@@ -1,31 +1,31 @@
+# These templates have been reviewed by debian-l10n-english
+# Please do not modify them without asking for a review
+
 Template: cupsys/raw-print
 Type: boolean
 Default: true
 _Description: Do you want CUPS to print unknown jobs as raw jobs?
- All print jobs in IPP get a MIME type. Since not all sources of print
- jobs can attach an appropriate type, many jobs get submitted as the MIME
- type application/octet-stream. Because of this, when CUPS receives a job
- with that MIME type, it attempts to guess what the format is. By default,
- if it cannot guess the proper type, it rejects the job.
+ 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.
  .
- It is possible to cause CUPS to treat all unrecognized jobs with this MIME
- type as "raw" jobs, which causes them to be sent directly to the printer
- without processing.
+ CUPS can handle all such jobs as "raw" jobs, which causes them to be
+ sent directly to the printer without processing.
  .
- 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.
+ It is recommended to choose this option if the server will be
+ accepting print jobs from Windows computers or Samba servers.
 
 Template: cupsys/backend
 Type: multiselect
 __Choices: ipp, lpd, parallel, scsi, serial, socket, usb, snmp
 Default: ipp, lpd, parallel, scsi, serial, socket, usb, snmp
 _Description: Printer communication backends:
- CUPS uses backend programs for communication with printer device or port.
+ CUPS uses backend programs to communicate with the printer device or port.
  .
- Unfortunately, some backend programs cause some trouble.
- (For example, some PPC kernel crashes with the parallel backend)
+ Unfortunately, some backend programs are likely to cause some trouble.
+ For example, some PPC kernels crash with the parallel backend.
  .
  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/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Mon May 14 09:10:23 2007
@@ -5,6 +5,7 @@
 07_removecvstag.dpatch
 09_runasuser.dpatch
 09_runasuser_autoconf.dpatch
+10_external_pam_helper.dpatch
 11_pam.dpatch
 12_quiesce_ipp_logging.dpatch
 13_default_log_warn.dpatch
@@ -15,7 +16,7 @@
 53_usr_share_ppd_support.dpatch
 54_cups-config_modeldir.dpatch
 55_ppd_okidata_name.dpatch
-56_dirsvc.dpatch
+#56_dirsvc.dpatch
 57_cupsaddsmb.dpatch
 58_cupsd.conf-AllowLocal.dpatch
 60_device_uri.dpatch
@@ -25,5 +26,4 @@
 70_reactivate_recommended_driver.dpatch
 98_search_mime_files_in_usr_share.dpatch
 ubuntu-disable-browsing.dpatch
-ubuntu-external-pam-helper.dpatch
 ubuntu-default-error-policy-retry-job.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/ca.po	Mon May 14 09:10:23 2007
@@ -0,0 +1,175 @@
+#
+# Catalan translation for cupsys package.
+# Copyright (C) 2007 Debian CUPS Maintainers.
+# This file is distributed under the same license as the cupsys package.
+#
+# Jordà Polo <jorda at ettin.org>, 2007.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:1001
+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
+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 ""
+"Aquest paquet inclou un servidor que pot acceptar tasques d'impressió de "
+"tipus BSD, i enviar-les a CUPS. Només s'hauria d'utilitzar si teniu altres "
+"ordinadors que enviïn tasques mitjançant els serveis «BSD» o «LPR», i no "
+"podeu convertir-los al protocol IPP que utilitza CUPS."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:1001
+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
+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 ""
+"El protocol d'impressió d'Internet (IPP, «Internet Printing Protocol») força "
+"l'existència d'un tipus MIME en totes les tasques d'impressió. Com no sempre "
+"s'indica un tipus adequat, moltes d'aquestes tasques s'envien amb el MIME "
+"«application/octet-stream» i poden ser rebutjades si CUPS no és capaç de "
+"trobar quin és el seu format."
+
+#. 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 pot tractar totes aquestes tasques com tasques en brut, que fa que "
+"s'enviïn directament a la impressora sense cap mena de processament."
+
+#. 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 ""
+"És recomanable que trieu aquesta opció si el servidor ha d'acceptar tasques "
+"d'impressió d'ordinadors Windows o servidors Samba."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "parallel"
+msgstr "paral·lel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "serial"
+msgstr "sèrie"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "socket"
+msgstr "sòcol"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:2002
+msgid "Printer communication backends:"
+msgstr "Mecanisme de comunicació amb la impressora:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:2002
+msgid ""
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr ""
+"CUPS utilitza programes externs per comunicar-se amb el dispositiu o port "
+"d'impressora."
+
+#. 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 ""
+"Malauradament, alguns d'aquests programes poden ser problemàtics. (Per "
+"exemple, algun nucli PPC falla si s'utilitza el port paral·lel.)"
+
+#. 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 ""
+"Si us plau, trieu el programa que CUPS hauria d'utilitzar per comunicar-se "
+"amb la impressora. L'opció predeterminada és vàlida en la majoria d'entorns."
+
+#~ 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 ""
+#~ "Si heu d'acceptar tasques d'ordinadors amb Windows, probablement us "
+#~ "interessi activar aquesta opció, ja que Windows assigna el tipus MIME "
+#~ "«application/octet-stream» a totes les tasques d'impressió IPP que són "
+#~ "processades per un controlador local. Samba també envia les impressions "
+#~ "d'aquesta manera."

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	Mon May 14 09:10:23 2007
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: cupsys\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2005-12-17 16:00+0100\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"PO-Revision-Date: 2007-03-31 17:45+0200\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"
@@ -31,17 +31,17 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Tento balík obsahuje server, který umí přijímat tiskové úlohy ve stylu BSD a "
-"přeposílat je systému CUPS. Měli byste jej povolit pouze v případě, že máte "
-"na síti počítače, které posílají úlohy přes služby \"BSD\" nebo \"LPR\" a "
-"nedají se přemluvit, aby používaly protokol IPP."
+"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 ""
+"Tento CUPS balík obsahuje server, který umí přijímat tiskové úlohy ve stylu "
+"BSD a přeposílat je systému CUPS. Měli byste jej povolit pouze v případě, že "
+"máte na síti počítače, které posílají úlohy přes služby \"BSD\" nebo \"LPR\" "
+"a nedají se přemluvit, aby používaly protokol IPP."
 
 #. Type: boolean
 #. Description
@@ -51,45 +51,39 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Všechny tiskové úlohy IPP mají přiřazen typ MIME, podle kterého CUPS pozná, "
-"v jakém formátu je úloha zaslána. Protože ne všechny zdroje tiskových úloh "
-"umí nastavit správný typ, je mnoho úloh zasíláno s MIME typem application/"
-"octet-stream a CUPS pak musí hádat, o jaký formát dat se jedná. Pokud CUPS "
-"formát neuhodne, implicitně úlohu odmítne."
+"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 ""
+"Všechny tiskové úlohy IPP (Internet Printing Protocol) mají přiřazen typ "
+"MIME, podle kterého CUPS pozná, v jakém formátu je úloha zaslána. Protože ne "
+"všechny zdroje tiskových úloh umí nastavit správný typ, je mnoho úloh "
+"zasíláno s MIME typem application/octet-stream a CUPS pak musí hádat, o jaký "
+"formát dat se jedná. Pokud CUPS formát neuhodne, implicitně úlohu odmítne."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"Zde můžete nastavit, aby CUPS považoval všechny nerozpoznané úlohy s tímto "
-"MIME typem jako úlohy typu \"raw\". Takové úlohy se nijak nezpracovávají a "
-"jsou odesílány rovnou na tiskárnu."
+"Zde můžete nastavit, aby CUPS považoval všechny nerozpoznané úlohy jako "
+"úlohy typu \"raw\". Takové úlohy se nijak nezpracovávají a jsou odesílány "
+"rovnou na tiskárnu."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Pokud budete přijímat tisky z windowsových počítačů, pravděpodobně budete "
-"chtít tuto volbu zapnout, protože Windows nastavují všem tiskům přes IPP "
-"(zpracovaných lokálním ovladačem) MIME typ application/octet-stream. Stejně "
-"pracuje i Samba."
+"Jestliže bude server akceptovat tiskové úlohy z Windows počítačů nebo ze "
+"Samba serverů, je doporučeno tuto možnost povolit."
 
 #. Type: multiselect
 #. Choices
@@ -99,72 +93,72 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "paralelní"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "sériový"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Ovladače pro komunikaci s tiskárnou:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
-msgstr "CUPS používá ovladač pro komunikaci s tiskárnou nebo jejím portem."
+"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:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Bohužel některé ovladače nejsou stabilní. (Například některá PPC jádra v "
-"kombinaci s paralelním ovladačem spadnou.)"
+"Bohužel, některé ovladače nejsou zcela stabilní. Například některá PPC jádra "
+"v kombinaci s paralelním ovladačem spadnou."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
@@ -172,6 +166,17 @@
 "Vyberte ovladač, který má CUPS  použít. Implicitní volba se hodí do většiny "
 "běžných prostředí."
 
+#~ 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 ""
+#~ "Pokud budete přijímat tisky z windowsových počítačů, pravděpodobně budete "
+#~ "chtít tuto volbu zapnout, protože Windows nastavují všem tiskům přes IPP "
+#~ "(zpracovaných lokálním ovladačem) MIME typ application/octet-stream. "
+#~ "StejnÄ› pracuje i Samba."
+
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr "Port a/nebo jméno počítače, na kterém má CUPS naslouchat:"
 
@@ -182,7 +187,6 @@
 #~ "Zadejte prosím port nebo jméno počítače, na kterém má daemon CUPS "
 #~ "naslouchat příchozím spojením. Povoleny jsou následující formáty:"
 
-#, fuzzy
 #~ msgid ""
 #~ " - Port number (631);\n"
 #~ " - Host name   (debian.example.com);\n"
@@ -191,7 +195,8 @@
 #~ msgstr ""
 #~ " - Číslo portu    (631);\n"
 #~ " - Jméno počítače (debian.priklad.cz);\n"
-#~ " - Počítač:Port   (debian.priklad.cz:631)."
+#~ " - Počítač:Port   (debian.priklad.cz:631). - Socket         (/var/run/"
+#~ "cups/cups.sock)."
 
 #~ msgid ""
 #~ "You can combine any of these by delimiting in a space-separated list."

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	Mon May 14 09:10:23 2007
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
+"POT-Creation-Date: 2007-03-27 22:18+0900\n"
 "PO-Revision-Date: 2006-06-07 18:05+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -26,12 +26,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
+#, fuzzy
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
 "Denne pakke indeholder en server, der kan modtage print-jobs på BSD-form og "
 "sende dem videre til CUPS. Du behøver kun at sætte den op, hvis du har andre "
@@ -47,13 +48,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
+"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 ""
 "Alle print-jobs i IPP får en MIME-type. Da ikke alle printjob-kilder kan "
 "medsende den relevante type, vil mange jobs blive sendt med MIME-typen "
@@ -63,11 +64,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
 "Du kan få CUPS til at behandle alle ikke-genkendte jobs med denne MIME-type "
 "som et \"råt\" job, som bliver sendt direkte til printeren uden yderligere "
@@ -75,17 +76,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
 
 #. Type: multiselect
 #. Choices
@@ -95,74 +90,76 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "seriel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "sokkel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Printer-kommunikationsveje:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 "CUPS bruger bagvedliggende programmer til at kommunikere med printerenheden "
 "eller -porten."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
 "Desværre giver nogle af disse bagvedliggende programmer visse problemer (f."
 "eks. bryder kernen sammen på nogle PPC-maskiner med parallel-programmet)"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
@@ -170,6 +167,17 @@
 "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å:"
 

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	Mon May 14 09:10:23 2007
@@ -1,4 +1,4 @@
-# translation of de.po to German
+# translation of po-debconf template to German
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -9,36 +9,37 @@
 #            /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.
-# Jens Nachtigall <nachtigall at web.de>, 2004, 2005.
 #
+# Jens Nachtigall <nachtigall at web.de>, 2004, 2005.
+# Matthias Julius <mdeb at julius-net.net>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2005-12-17 20:58+0100\n"
-"Last-Translator: Jens Nachtigall <nachtigall at web.de>\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
 #. Description
 #: ../cupsys-bsd.templates:1001
 msgid "Do you want to set up the BSD lpd compatibility server?"
-msgstr "Wollen Sie den BSD-lpd Kompatibilitäts-Server einsetzen?"
+msgstr "Möchten Sie den Kompatibilitäts-Server für BSD lpd einrichten?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
 "Dieses Paket enthält einen Server, der BSD-artige Druckaufträge "
 "entgegennimmt und diese an CUPS weiterleitet. Sie sollten diesen Server nur "
@@ -50,195 +51,122 @@
 #. Description
 #: ../cupsys.templates:1001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "Wollen Sie, dass CUPS unbekannte Druckaufträge unbearbeitet druckt?"
+msgstr ""
+"Möchten Sie, dass CUPS unbekannte Druckaufträge unbearbeitet (raw) druckt?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Bei IPP bekommen alle Druckaufträge einen MIME-Typen.  Da nicht jeder "
-"Erzeuger von Druckaufträgen den geeigneten Typen anhängen kann, werden viele "
-"Aufträge mit dem MIME-Typen »application/octet-stream« abgesendet.  Wenn "
-"CUPS einen Auftrag mit diesem MIME-Typen erhält, versucht CUPS deshalb das "
-"Datei-Format herauszufinden.  Die Standardeinstellung ist, den Auftrag "
-"abzulehnen, wenn es den richtigen Typen nicht herausfinden kann."
+"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 ""
+"Das Internet Printing Protokoll (IPP) erfordert einen MIME-Typ für alle "
+"Druckaufträge. Da nicht jeder Erzeuger von Druckaufträgen den geeigneten Typ "
+"einfügen kann, werden viele Aufträge mit dem MIME-Typ »application/octet-"
+"stream« abgesendet. Diese Druckaufträge können abgewiesen werden, falls CUPS "
+"dessen Format nicht ermitteln kann."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"Es ist möglich CUPS zu veranlassen alle unerkannten Aufträge mit diesem MIME-"
-"Typen als rohe (engl. »raw«) Aufträge zu behandeln. Das bedeutet diese "
-"Aufträge ohne Bearbeitung direkt an den Drucker zu senden."
+"CUPS kann all diese Aufträge als »rohe« (engl.: »raw«) Aufträge behandeln. "
+"Das bewirkt, dass sie ohne Bearbeitung direkt an den Drucker gesendet werden."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Sollten Sie Druckaufträge von Windows-Rechnern entgegennehmen, ist es ratsam "
-"diese Option zu setzen, da Windows allen IPP-Druckaufträgen, die von einem "
-"lokalen Treiber verarbeitet werden, den MIME-Typen »application/octet-"
-"stream« gibt. Samba übergibt seine Druckaufträge auf die gleiche Art."
+"Es wird empfohlen, diese Option zu wählen, falls der Server Druckaufträge "
+"von Windows-Rechnern oder Samba-Servern akzeptieren wird."
 
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:2001
 msgid "ipp"
-msgstr "ipp"
+msgstr "IPP"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
-msgstr "scsi"
+msgstr "SCSI"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
-msgstr "serial"
+msgstr "seriell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
-msgstr "socket"
+msgstr "Socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
-msgstr "usb"
+msgstr "USB"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
-msgstr "snmp"
+msgstr "SNMP"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Backends für die Kommunikation mit dem Drucker:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
-msgstr "CUPS verwendet Backend-Programme zur Kommunikation mit dem Drucker."
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr ""
+"CUPS verwendet Backend-Programme zur Kommunikation mit dem Drucker oder Port."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Leider verursachen manche Backend-Programme Probleme. (Zum Beispiel stürzen "
-"einige PPC-Kernel mit dem Parallel-Backend ab)"
+"Leider verursachen manche Backend-Programme Probleme. Zum Beispiel stürzen "
+"einige PPC-Kernel mit dem Parallel-Backend ab."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Bitte wählen Sie das Backend-Programm, das mit CUPS verwendet werden soll. "
-"Die Voreinstellung sollte normalerweise den meisten Umgebungen gerecht "
-"werden."
-
-#~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "Port oder/und Host-Name auf dem CUPS lauschen soll:"
-
-#~ msgid ""
-#~ "Please specify the port or the host name CUPS daemon will listen to. The "
-#~ "following formats are allowed:"
-#~ msgstr ""
-#~ "Bitte geben Sie den Port oder Host-Namen an, auf dem der CUPS-Daemon "
-#~ "lauschen soll. Die folgenden Formate sind erlaubt:"
-
-#, fuzzy
-#~ 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 ""
-#~ " - Port-Nummer (631);\n"
-#~ " - Host-Name   (debian.beispiel.de);\n"
-#~ " - Host:Port   (debian.beispiel.de:631)."
-
-#~ msgid ""
-#~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr ""
-#~ "Sie können mehrere davon angeben, indem Sie die einzelnen Werte durch "
-#~ "Leerzeichen trennen."
-
-#~ 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 ""
-#~ "Der Standard-Port 631 ist für das Internet Printing Protocol (IPP) "
-#~ "reserviert. Für einen Einzelrechner ist aus Sicherheitsgründen "
-#~ "»localhost:631« empfohlen."
-
-#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
-#~ msgstr ""
-#~ "CUPS-Drucker-Informationen im Netzwerk aussenden und/oder diese empfangen?"
-
-#~ msgid ""
-#~ "CUPS daemon can broadcast printer information for clients on the network, "
-#~ "and detect printers on the network automatically."
-#~ msgstr ""
-#~ "Der CUPS-Daemon kann für Clients im Netzwerk Drucker-Informationen "
-#~ "aussenden. Dadurch können diese automatisch die im Netzwerk verfügbaren "
-#~ "Drucker finden."
-
-#~ msgid ""
-#~ "If you choose this option, the CUPS daemon will periodically send UDP "
-#~ "broadcasts to detect printers."
-#~ msgstr ""
-#~ "Wenn Sie hier zustimmen, dann wird der CUPS-Daemon periodisch UDP-"
-#~ "Broadcasts senden um im Netzwerk Drucker zu finden."
-
-#~ msgid "Incorrect value entered"
-#~ msgstr "Sie haben einen falschen Wert eingegeben"
-
-#~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr ""
-#~ "Beim Einlesen der Port-Nummer oder des Host-Namens ist ein Fehler "
-#~ "aufgetreten."
-
-#~ msgid "Please correct your input."
-#~ msgstr "Bitte korrigieren Sie Ihre Eingabe."
+"Bitte wählen Sie das Backend-Programm zur Verwendung mit CUPS. Die "
+"Voreinstellung sollte den meisten Umgebungen gerecht werden."

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	Mon May 14 09:10:23 2007
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: cupsys 1.2.2-1\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
+"POT-Creation-Date: 2007-03-27 22:18+0900\n"
 "PO-Revision-Date: 2006-08-15 01:10+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."
@@ -39,12 +39,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
+#, fuzzy
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
 "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 "
@@ -60,13 +61,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
+"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 ""
 "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 "
@@ -76,11 +77,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"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 los trabajos no reconocidos, con este "
 "tipo MIME, como trabajos «en bruto», con lo que se mandan directamente a la "
@@ -88,17 +89,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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 ""
-"Si va a recibir trabajos de impresión desde sistemas Windows es muy probable "
-"que desee activar esta opción, ya que Windows da a los trabajos de impresión "
-"IPP que procesa localmente el tipo application/octet-stream. Samba también "
-"envía los trabajos de impresión de esta manera."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
 
 #. Type: multiselect
 #. Choices
@@ -157,21 +152,22 @@
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
-msgstr ""
-"CUPS utiliza diversos motores para comunicarse con la impresora."
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr "CUPS utiliza diversos motores para comunicarse con la impresora."
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"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."
+"con el motor del puerto paralelo se producen algunas caídas del núcleo en la "
+"arquitectura PPC."
 
 #. Type: multiselect
 #. Description
@@ -182,3 +178,14 @@
 msgstr ""
 "Por favor, elija el motor que utilizará CUPS. La opción predeterminada "
 "debería ser apta para los entornos más comunes."
+
+#~ 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 ""
+#~ "Si va a recibir trabajos de impresión desde sistemas Windows es muy "
+#~ "probable que desee activar esta opción, ya que Windows da a los trabajos "
+#~ "de impresión IPP que procesa localmente el tipo application/octet-stream. "
+#~ "Samba también envía los trabajos de impresión de esta manera."

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	Mon May 14 09:10:23 2007
@@ -1,36 +1,37 @@
-# SOME DESCRIPTIVE TITLE.
+# translation of cupsys-eu.po to librezale
+# Piarres Beobide <pi at beobide.net>, 2005, 2007.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Piarres Beobide <pi at beobide.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: cups-debconf\n"
+"Project-Id-Version: cupsys-eu\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2006-11-13 12:46+0100\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\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"
+"Language-Team: librezale <librezale at librezale.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 0.10.1\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. Type: boolean
 #. Description
 #: ../cupsys-bsd.templates:1001
 msgid "Do you want to set up the BSD lpd compatibility server?"
-msgstr "BSD lpd bateragarritasun zerbiztaria konfiguratu nahi al duzu?"
+msgstr "BSD lpd bateragarritasun zerbitzaria konfiguratu nahi al duzu?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
-"Pakete honek BSD-moduko inprimatze lanak onartu eta CUPS-era bidaltzen "
+"CUPS paketeak BSD-moduko inprimatze lanak onartu eta CUPS-era bidaltzen "
 "dituen zerbitzari bat du. Berau \"BSD\" edo \"LPR\" zerbitzuen bidez sare "
 "bidez lanak bidaltzen dituzten eta CUPS-ek erabiltzen duen IPP protokoloa "
 "erabili ezin duten ordenagailuak badituzu bakarrik konfiguratu behar da."
@@ -43,44 +44,37 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"IPP inprimatze lan guztiek MIME mota bat dute. Inprimatze lan jatorri "
-"guztiek ezin dutenez mota zuzena ezarri, lan gehienal application/octet-"
-"stream MIME mota erabiliaz bidaltzen dita. Honegatik CUP-ek MIME mota "
-"hoentako lan bat jasotzean zein formatukoa den antzematen saiatuko da. "
-"Lehenespen bezala dagokien mota antzeman ezin diren lanak ukatu egingo dira."
+"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 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."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"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 MIME mota honetako lanak lan \"gordinak\" bezala kudea "
+"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:1004
+#: ../cupsys.templates:1001
 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 ""
-"Windows ordenagailutik inprimatze lanak onartu behar badituzu, ziurrenik "
-"aukera hau gaitu beharko duzu Windows-ek kontrolagailu lokal batek "
-"prozesaturiko IPP inprimatze lan guztiei application/octet-stream MIME mota "
-"ezartzen bait die. Sama-k ere inprimatze lanak era hoentara bidaltzen ditu."
+"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."
 
 #. Type: multiselect
 #. Choices
@@ -90,77 +84,77 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lds"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "paraleloa"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "seriea"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Inprimagailu komunikazio motorea:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
-msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+#: ../cupsys.templates:2002
+msgid "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"CUPS-ek inrpimagailu gailu edo atakarekin komunikazioa lortzeko motoreak "
+"CUPS-ek inprimagailu gailu edo atakarekin komunikazioa lortzeko interfaze programak"
 "erabiltzen ditu."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Zoritxarrez, zenbait motorek arazoak zor ditzakete. (Adibidez zenbait PPC "
-"kernel hasutura motore paraleloaz)"
+"Zoritxarrez, zenbait interaze programek arazoak zor ditzakete. (Adibidez zenbait PPC "
+"kernel haustura motore paraleloaz)"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 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/fr.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po	Mon May 14 09:10:23 2007
@@ -11,91 +11,83 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-# Christian Perrier <bubulle at debian.org>, 2004, 2005, 2006.
+# 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: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2006-06-07 11:50+0200\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"PO-Revision-Date: 2007-03-27 20:37+0200\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"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. Type: boolean
 #. Description
 #: ../cupsys-bsd.templates:1001
 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 ?"
+msgstr "Faut-il installer le serveur compatible avec le démon lpd de BSD ?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Ce paquet comporte un serveur capable d'accepter des demandes d'impression "
-"au style BSD et de les donner à CUPS. Installez-le seulement si vous avez "
-"des machines qui envoient leurs demandes à travers le réseau via les "
-"services « BSD » ou « LPR » et qui ne peuvent pas accepter le protocole IPP "
-"utilisé par CUPS."
+"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 ""
+"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."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 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 ?"
+msgstr "CUPS doit-il imprimer les demandes sans type MIME sous forme brute ?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Selon le protocole IPP (« Internet Printing Protocol »), chaque demande "
-"d'impression comporte un type MIME. Comme certaines sources de demandes "
-"d'impression ne peuvent pas affecter un type MIME adapté, de nombreuses "
-"demandes sont soumises avec le type MIME application/octet-stream. Lorsque "
-"CUPS reçoit une demande d'impression avec ce type MIME, il tente d'en "
-"déterminer le format. Par défaut, si cette tentative échoue, la demande est "
-"rejetée."
+"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 ""
+"Selon le protocole IPP (« Internet Printing Protocol »), chaque demande "
+"d'impression doit comporter un type MIME. Comme certaines sources de "
+"demandes d'impression ne peuvent pas affecter un type MIME adapté, de "
+"nombreuses demandes sont soumises avec le type MIME application/octet-"
+"stream. Elles peuvent alors être rejetées si CUPS ne peut en déterminer le "
+"format."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
 "CUPS peut traiter toutes ces demandes sans type reconnu comme des demandes "
-"au format brut et les envoyer sans aucun traitement à l'imprimante."
+"au format brut et les envoyer sans aucun traitement à l'imprimante."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Si vous acceptez des demandes d'impression émises par des ordinateurs "
-"utilisant Windows, vous devriez utiliser cette option car Windows affecte le "
-"type MIME application/octet-stream à toutes les demandes émises par un "
-"pilote local d'impression. Samba soumet également ses demandes d'impression "
-"de cette manière."
+"Il est recommandé de choisir cette option si le serveur est amené à traiter "
+"des demandes d'impression d'ordinateurs Windows ou de serveurs Samba."
 
 #. Type: multiselect
 #. Choices
@@ -105,142 +97,76 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
-msgstr "parallèle"
+msgstr "parallèle"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "SCSI"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
-msgstr "série"
+msgstr "série"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "USB"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "SNMP"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
-msgstr "Mode de communication avec les imprimantes :"
+msgstr "Mode de communication avec les imprimantes :"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"Vous pouvez choisir ici la méthode de communication qui sera utilisée par "
-"CUPS dans ses échanges avec l'imprimante ou le port d'impression."
+"CUPS utilise différentes méthodes de communication pour ses échanges avec "
+"les imprimantes ou les ports d'impression."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Malheureusement, certaines de ces méthodes sont connues pour causer certains "
-"problèmes (par exemple, plantage de certains noyaux PPC avec la "
-"communication parallèle)."
+"Malheureusement, certaines de ces méthodes sont connues pour provoquer des "
+"difficultés comme le gel de certains noyaux PowerPC avec la communication "
+"parallèle."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
-msgstr "Le choix par défaut est adapté à la majorité des environnements."
-
-#~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "Port ou nom d'hôte où CUPS sera à l'écoute :"
-
-#~ msgid ""
-#~ "Please specify the port or the host name CUPS daemon will listen to. The "
-#~ "following formats are allowed:"
-#~ msgstr ""
-#~ "Veuillez indiquer le port ou le nom d'hôte où le démon CUPS sera à "
-#~ "l'écoute. Les formats suivants peuvent être utilisés :"
-
-#~ 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 ""
-#~ " - numéro de port (p. ex. 631) ;\n"
-#~ " - nom d'hôte (p. ex. debian.asso.fr) ;\n"
-#~ " - hôte:port (p. ex. debian.asso.fr:631) ;\n"
-#~ " - fichier « socket » (/var/run/cups/cups.sock)."
-
-#~ msgid ""
-#~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr ""
-#~ "Ces formats peuvent être combinés ensemble, séparés par des espaces."
-
-#~ 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 ""
-#~ "Le port par défaut (631) est le port réservé pour le protocole "
-#~ "d'impression Internet (« Internet Printing Protocol » : IPP). Pour des "
-#~ "raisons de sécurité, la valeur « localhost:631 » est recommandée pour un "
-#~ "environnement autonome."
-
-#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
-#~ msgstr ""
-#~ "Faut-il annoncer les imprimantes sur le réseau et en détecter de "
-#~ "nouvelles ?"
-
-#~ msgid ""
-#~ "CUPS daemon can broadcast printer information for clients on the network, "
-#~ "and detect printers on the network automatically."
-#~ msgstr ""
-#~ "Le démon CUPS peut faire connaître les imprimantes qu'il gère aux clients "
-#~ "sur le réseau et détecter automatiquement de nouvelles imprimantes."
-
-#~ msgid ""
-#~ "If you choose this option, the CUPS daemon will periodically send UDP "
-#~ "broadcasts to detect printers."
-#~ msgstr ""
-#~ "Si vous choisissez cette option, le démon CUPS utilisera périodiquement "
-#~ "des diffusions UDP pour détecter de nouvelles imprimantes."
-
-#~ msgid "Incorrect value entered"
-#~ msgstr "Valeur saisie incorrecte"
-
-#~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr ""
-#~ "Une erreur s'est produite lors de l'analyse du nom d'hôte ou du numéro de "
-#~ "port."
-
-#~ msgid "Please correct your input."
-#~ msgstr "Veuillez corriger votre saisie."
+msgstr "Le choix par défaut est adapté à la majorité des environnements."

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	Mon May 14 09:10:23 2007
@@ -1,16 +1,16 @@
 # Galician translation of cupsys' debconf templates.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the cupsys package.
-# Jacobo Tarrio <jtarrio at debian.org>, 2006.
+# Jacobo Tarrio <jtarrio at debian.org>, 2006, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2006-04-07 15:38+0200\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"PO-Revision-Date: 2007-03-27 08:56+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
-"Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,22 +19,24 @@
 #. Description
 #: ../cupsys-bsd.templates:1001
 msgid "Do you want to set up the BSD lpd compatibility server?"
-msgstr "¿Quere activar o servidor de compatibilidade con lpd de BSD?"
+msgstr ""
+"causan problemas (por exemplo, algúns núcleos para PPC fallan co adaptador "
+"paralelo).<"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
-"Este paquete contén un servidor que pode aceptar traballos de impresión "
+"O paquete CUPS contén un servidor que pode aceptar traballos de impresión "
 "estilo BSD e envialos a CUPS. Só se debería activar se ten outros "
-"ordenadores que envían traballos pola rede mediante servizos \"BSD\" ou \"LPR"
-"\" e eses ordenadores non se poden converter para que empreguen o protocolo "
-"IPP que emprega CUPS."
+"ordenadores que poidan enviar traballos pola rede mediante os servizos \"BSD"
+"\" ou \"LPR\", e se eses ordenadores non se poden configurar para que "
+"empreguen o protocolo IPP que emprega CUPS."
 
 #. Type: boolean
 #. Description
@@ -45,46 +47,38 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Todos os traballos de impresión en IPP teñen un tipo MIME. Como non todas as "
-"fontes de traballos de impresión poden indicar un tipo axeitado, moitos "
-"traballos envíanse co tipo MIME application/octet-stream. Debido a isto, "
-"cando CUPS recibe un traballo con ese tipo MIME trata de adiviñar o formato. "
-"Por defecto, se non pode adiviñar o tipo correcto, rexeita o traballo."
+"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 ""
+"O protocolo de impresión por Internet (IPP) obriga a que tódolos traballos "
+"de impresión teñan un tipo MIME. Como non todas as fontes de traballos de "
+"impresión poden indicar un tipo axeitado, moitos traballos envíanse co tipo "
+"MIME application/octet-stream, e poden quedar rexeitados se CUPS non pode "
+"determinar o formato do traballo."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"É posible facer que CUPS trate todos os traballos que non recoñeza con este "
-"tipo MIME coma traballos \"en cru\", o que fai que se envíen directamente á "
-"impresora sen os procesar."
+"CUPS pode tratar todos eses traballos coma traballos \"en cru\", o que fai "
+"que se envíen directamente á impresora sen os procesar."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Se vai aceptar traballos de impresión de ordenadores con Windows, "
-"probablemente sexa mellor activar esta opción, xa que Windows envía os "
-"traballos de impresión IPP procesados cun controlador local co tipo MIME "
-"application/octet-stream. Samba tamén envía os seus traballos de impresión "
-"do mesmo xeito."
+"Recoméndase que escolla esta opción se o servidor ha aceptar traballos de "
+"impresión de ordenadores Windows ou servidores Samba."
 
 #. Type: multiselect
 #. Choices
@@ -94,74 +88,74 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "paralelo"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "serie"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Sistemas de comunicación coa impresora:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"CUPS emprega varios programas para se comunicar co dispositivo ou porto da "
-"impresora."
+"CUPS emprega programas \"motor\" para se comunicar co dispositivo ou porto "
+"da impresora."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Por desgracia, algúns destes programas causan problemas (por exemplo, algúns "
-"núcleos para PPC fallan co adaptador paralelo)."
+"Por desgracia, algúns destes programas \"motor\" poden causar problemas. Por "
+"exemplo, algúns núcleos para PPC fallan co motor de porto paralelo."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
@@ -169,6 +163,18 @@
 "Escolla o programa que debe empregar CUPS. A opción por defecto debería "
 "axustarse aos ambientes máis habituais."
 
+#~ 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 ""
+#~ "Se vai aceptar traballos de impresión de ordenadores con Windows, "
+#~ "probablemente sexa mellor activar esta opción, xa que Windows envía os "
+#~ "traballos de impresión IPP procesados cun controlador local co tipo MIME "
+#~ "application/octet-stream. Samba tamén envía os seus traballos de "
+#~ "impresión do mesmo xeito."
+
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr "Porto e/ou nome de servidor no que CUPS ha escoitar:"
 

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	Mon May 14 09:10:23 2007
@@ -1,14 +1,14 @@
 # Italian (it) translation of debconf templates for cupsys
 # Copyright (C) 2006 Software in the Public Interest
 # This file is distributed under the same license as the cupsys package.
-# Luca Monducci <luca.mo at tiscali.it>, 2006.
+# Luca Monducci <luca.mo at tiscali.it>, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 1.1.23 italian debconf templates\n"
+"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: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2006-06-11 17:44+0200\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\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"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,18 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
-"Questo pacchetto contiene un server che può accettare job di stampa in "
+"Il pacchetto CUPS contiene un server che può accettare job di stampa in "
 "formato BSD per poi girarli a CUPS. Questo server dovrebbe essere attivato "
-"solo se in rete ci sono altri computer che inviano job ai servizi \"BSD\" o "
-"\"LPR\" e che non possono essere aggiornati per usare il protocollo IPP, "
-"cioè quello usato da CUPS."
+"solo se in rete ci sono altri computer che potrebbero inviare job tramite i "
+"servizi \"BSD\" o \"LPR\" e che non possono essere configurati per usare il "
+"protocollo IPP, cioè quello usato da CUPS."
 
 #. Type: boolean
 #. Description
@@ -44,46 +44,37 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Con IPP tutti i job di stampa assumono un tipo MIME. Dato che non tutte le "
-"sorgenti dichiarano il tipo corretto, molti dei job inviati hanno tipo MIME "
-"application/octect-stream. Per questo motivo, quando CUPS riceve un job con "
-"quel tipo MIME, cerca di indovinarne il formato. Il comportamento "
-"predefinito nel caso che il riconoscimento del tipo non riesca è rifiutare "
-"il job."
+"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 ""
+"Il protocollo IPP (Internet Printing Protocol) assegna un tipo MIME a tutti "
+"i job di stampa. Dato che non tutte le sorgenti dichiarano il tipo corretto, "
+"molti dei job inviati hanno tipo application/octect-stream e potrebbero "
+"essere rifiutati se CUPS non riesce a indovinarne il giusto formato del job."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"È possibile forzare CUPS a trattare tutti i job con quel tipo MIME e che non "
-"riesce a riconoscere come job \"raw\", ciò comporta l'invio diretto alla "
-"stampante, senza ulteriori elaborazioni."
+"CUPS può trattare tutti questi job come job \"raw\", ciò comporta l'invio "
+"diretto alla stampante, senza ulteriori elaborazioni."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Se si devono accettare job di stampa da computer con Windows, probabilmente "
-"si dovrebbe attivare questa opzione, infatti il driver locale di Windows "
-"assegna a tutti i job di stampa elaborati il tipo MIME application/octet-"
-"stream. Anche Samba invia i propri job di stampa in questo modo."
+"Si raccomanda di attivare questa opzione se il server deve accettare job di "
+"stampa da computer con Windows oppure da server Samba."
 
 #. Type: multiselect
 #. Choices
@@ -93,141 +84,78 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "parallela"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "seriale"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Backend di comunicazione con la stampante:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 "CUPS usa dei programmi di backend per comunicare con il device o la porta "
 "della stampante."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Sfortunatamente alcuni programmi di backend causano dei problemi (per "
-"esempio alcuni kernel per PPC si bloccano con il backend per la porta "
-"parallela)."
+"Sfortunatamente alcuni programmi di backend porebbero causare dei problemi. "
+"Per esempio alcuni kernel per PPC si bloccano con il backend per la porta "
+"parallela."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
 "Scegliere quale programma di backend deve usare CUPS. La scelta predefinita "
 "dovrebbe essere adatta per la maggioranza dei casi."
-
-#~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "Porta e/o nome host su cui CUPS sarà in ascolto:"
-
-#~ msgid ""
-#~ "Please specify the port or the host name CUPS daemon will listen to. The "
-#~ "following formats are allowed:"
-#~ msgstr ""
-#~ "Specificare la porta oppure il nome host su cui CUPS si metterà in "
-#~ "ascolto. Sono accettati i seguenti formati:"
-
-#~ 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 ""
-#~ " - Numero porta (631);\n"
-#~ " - Nome host    (debian.esempio.com);\n"
-#~ " - Host:Porta   (debian.esempio.com:631). - File socket di dominio (/var/"
-#~ "run/cups/cups.sock)."
-
-#~ msgid ""
-#~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr ""
-#~ "Si possono combinare più voci come queste delimitandole con degli spazi."
-
-#~ 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 ""
-#~ "La porta predefinita 631 è la porta riservata per l'Internet Printing "
-#~ "Protocol (IPP). Per ragioni legate alla sicurezza, \"localhost:631\" è la "
-#~ "configurazione raccomandata per un sistema stand-alone."
-
-#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
-#~ msgstr "Diffondere e/o ascoltare informazioni sulle stampanti CUPS in rete?"
-
-#~ msgid ""
-#~ "CUPS daemon can broadcast printer information for clients on the network, "
-#~ "and detect printers on the network automatically."
-#~ msgstr ""
-#~ "Il demone CUPS può diffondere informazioni sulla stampante ai client in "
-#~ "rete e può rilevare automaticamente le stampanti in rete."
-
-#~ msgid ""
-#~ "If you choose this option, the CUPS daemon will periodically send UDP "
-#~ "broadcasts to detect printers."
-#~ msgstr ""
-#~ "Se si attiva questa funzione il demone CUPS invierà periodicamente un "
-#~ "pacchetto UDP in broadcast per rilevare le stampanti."
-
-#~ msgid "Incorrect value entered"
-#~ msgstr "Inserito un valore non corretto"
-
-#~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr ""
-#~ "si è verificato un errore nell'analisi del numero della porta o del nome "
-#~ "host."
-
-#~ msgid "Please correct your input."
-#~ msgstr "Correggere il valore inserito."

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	Mon May 14 09:10:23 2007
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: cupsys 1.2\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2005-12-17 13:24+0900\n"
+"POT-Creation-Date: 2007-03-27 22:18+0900\n"
+"PO-Revision-Date: 2007-03-27 22:25+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"
@@ -31,18 +31,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"このパッケージは BSD スタイルの印刷ジョブを受け付け、CUPS にそれを送るサーバ"
-"を含んでいます。\"BSD\" または \"LPR\" サービス経由でネットワーク越しにジョブ"
-"を送るほかのコンピュータがあり、かつそれらのコンピュータは CUPS の使っている "
-"IPP プロトコルを使うよう変更できない、という場合にのみセットアップすべきで"
-"す。"
+"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 プロトコルを使うよう変更できない、という場合にのみセットアップすべきです。"
 
 #. Type: boolean
 #. Description
@@ -52,44 +47,29 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"IPP でのすべての印刷ジョブは MIME 形式を持ちます。印刷ジョブのすべてのソース"
-"に適切な形式が付いているとは限らず、多くのジョブは MIME 形式 application/"
-"octet-stream として送られます。このため、CUPS はこのような MIME 形式付きの"
-"ジョブを受け取ると、そのフォーマットは何かを推測しようとします。デフォルトで"
-"は、もし適当な形式を推測できない場合、そのジョブを拒否します。"
+"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 がそのジョブのフォーマットを推測できなかったときには拒否されます。"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
-msgstr ""
-"この MIME 形式のすべての未知のジョブを、加工することなくプリンタに直接送るよ"
-"う生データ(\"raw\")ジョブとして扱うように CUPS を設定できます。"
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
+msgstr "そのようなジョブを、すべて生データ (\"raw\") ジョブとして加工なしに直接プリンタに送るように CUPS を設定できます。"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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 ""
-"もし Windows コンピュータからの印刷ジョブを受け付ける場合、おそらくこのオプ"
-"ションを設定すべきです。というのも、Windows はすべての IPP 印刷ジョブをローカ"
-"ルドライバによって MIME 形式 application/octet-stream に加工するからです。"
-"Samba も同様にその印刷ジョブをこのやり方で送ります。"
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr "サーバが Windows コンピュータあるいは Samba サーバからの印刷ジョブを受け付ける場合は、この選択肢で「はい」と答えることをお勧めします。"
 
 #. Type: multiselect
 #. Choices
@@ -99,149 +79,73 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "LPD"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "パラレル"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "SCSI"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "シリアル"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "ソケット"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "USB"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "SNMP"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "プリンタ通信バックエンド:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
-msgstr ""
-"CUPS はプリンタデバイスまたはポートと会話するのにバックエンドプログラムを使い"
-"ます。"
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr "CUPS はプリンタデバイスまたはポートと会話するのにバックエンドプログラムを使います。"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
-msgstr ""
-"困ったことに、いくつかのバックエンドプログラムは問題を引き起こします。(たとえ"
-"ば、ある種の PPC カーネルは parallel バックエンドでクラッシュします)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
+msgstr "困ったことに、いくつかのバックエンドプログラムは種々の問題を引き起こします。たとえば、ある種の PPC カーネルは parallel バックエンドでクラッシュします。"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
 "CUPS で利用したいバックエンドプログラムを選択してください。デフォルトの選択は"
 "たいていの一般的な環境に合っています。"
-
-#~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "CUPS が監視するポートまたはホスト名:"
-
-#~ msgid ""
-#~ "Please specify the port or the host name CUPS daemon will listen to. The "
-#~ "following formats are allowed:"
-#~ msgstr ""
-#~ "CUPS デーモンに監視させるポートまたはホスト名を指定してください。次のよう"
-#~ "な書式を利用できます:"
-
-#~ 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 ""
-#~ " - ポート番号      (631);\n"
-#~ " - ホスト名        (debian.example.com);\n"
-#~ " - ホスト名:ポート (debian.example.com:631);\n"
-#~ " - ファイルドメインソケット (/var/run/cups/cups.sock)。"
-
-#~ msgid ""
-#~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr "スペースで区切ったリストでこれらを組み合わせることもできます。"
-
-#~ 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 ""
-#~ "デフォルトポート 631 は Internet Printing Protocol (IPP) に予約されていま"
-#~ "す。\"localhost:631\" はセキュリティ上の理由からスタンドアロンな環境にセッ"
-#~ "トアップするのに推奨されます。"
-
-#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
-#~ msgstr ""
-#~ "ネットワーク上の CUPS プリンタ情報のブロードキャストおよび監視を行います"
-#~ "か?"
-
-#~ msgid ""
-#~ "CUPS daemon can broadcast printer information for clients on the network, "
-#~ "and detect printers on the network automatically."
-#~ msgstr ""
-#~ "CUPS デーモンはネットワーク上のクライアントにプリンタ情報をブロードキャス"
-#~ "トしたり、ネットワーク上のプリンタを自動的に検出したりできます。"
-
-#~ msgid ""
-#~ "If you choose this option, the CUPS daemon will periodically send UDP "
-#~ "broadcasts to detect printers."
-#~ msgstr ""
-#~ "この選択肢を選ぶと、CUPS デーモンはプリンタを検出するために UDP ブロード"
-#~ "キャストを定期的に送ります。"
-
-#~ msgid "Incorrect value entered"
-#~ msgstr "不正な値が入力されました"
-
-#~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr "ポート番号またはホスト名の解釈中にエラーが発生しました。"
-
-#~ msgid "Please correct your input."
-#~ msgstr "入力値を修正してください。"
-
-#~ msgid "Admin password:"
-#~ msgstr "管理者パスワード:"
-
-#~ msgid "Please enter the password for the admin (username 'root') of CUPS."
-#~ msgstr "CUPS 管理者 (ユーザ名 'root') 用のパスワードを入力してください。"
-
-#~ msgid ""
-#~ "You can add/replace/delete CUPS password information by using lpadmin."
-#~ msgstr "lpadmin を使って CUPS パスワード情報を追加/変更/削除できます。"

Added: cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/ml.po	Mon May 14 09:10:23 2007
@@ -0,0 +1,164 @@
+# Malayalam translation of cupsys debconf template.
+# Copyright (C) 2007 THE cupsys' COPYRIGHT HOLDER
+# This file is distributed under the same license as the cupsys package.
+# Praveen|പ്രവീണ്‍ A|എ <pravi.a at gmail.com>, 2007.
+# 
+# 
+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"
+"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-"
+"discuss at googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:1001
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "BSD lpd പൊരുത്ത സേവകന്‍ സജ്ജീകരിയ്ക്കാന്‍ നിങ്ങളാഗ്രഹിയ്ക്കുന്നുണ്ടോ?"
+
+#. 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 ""
+"BSD-സ്റ്റൈലിലുള്ള അച്ചടി ജോലികള്‍ സ്വീകരിയ്ക്കാനും CUPS ന് സമര്‍പ്പിയ്ക്കാനും കഴിവുള്ള ഒരു സേവകന്‍ "
+"CUPS പാക്കേജ് ഉള്‍ക്കൊള്ളുന്നുണ്ട്. മറ്റ് കമ്പ്യൂട്ടറുകള്‍ \"BSD\" അല്ലെങ്കില്‍ \"LPR\" സേവനങ്ങള്‍ വഴി "
+"നെറ്റ്‌വര്‍ക്കിലൂടെ ജോലികള്‍ സമര്‍പ്പിയ്ക്കാനുള്ള സാധ്യതയുണ്ട് എന്ന് മാത്രമല്ല ഈ കമ്പ്യൂട്ടറുകള്‍ CUPS "
+"ഉപയോഗിയ്ക്കുന്ന IPP പെരുമാറ്റച്ചട്ടം ഉപയോഗിയ്ക്കാനായി പരിവര്‍ത്തനം ചെയ്യാന്‍ സാധ്യവുമല്ല എന്ന "
+"അവസരത്തില്‍ മാത്രമേ ഇത് സജ്ജീകരിയ്ക്കേണ്ടതുള്ളൂ."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:1001
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr ""
+"മനസിലാവാത്ത ജോലികള്‍ അസംസ്കൃത ജോലികളായി CUPS അച്ചടിയ്ക്കണമെന്ന് നിങ്ങളാഗ്രഹിയ്ക്കുന്നുണ്ടോ?"
+
+#. 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 ""
+"ഇന്റര്‍നെറ്റ് അച്ചടി പെരുമാറ്റച്ചട്ടം (IPP) എല്ലാ അച്ചടി ജോലികള്‍ക്കും ഒരു MIME തരം "
+"നിര്‍ബന്ധമാക്കുന്നു. അച്ചടി ജോലികളുടെ എല്ലാ സ്രോതസ്സുകള്‍ക്കും അത്തരമൊരു അനുയോജ്യമായ തരത്തിലുള്ളത് "
+"കൂട്ടിവയ്ക്കാന്‍ പറ്റാത്തതിനാല്‍ പല ജോലികളും application/octet-stream എന്ന തരത്തിലാണ് "
+"സമര്‍പ്പിയ്ക്കപ്പെടുന്നത് എന്നതിനാല്‍ CUPS ന് ജോലിയുടെ ഫോര്‍മാറ്റ് ഊഹിയ്ക്കാന്‍ സാധിച്ചില്ലെങ്കില്‍ "
+"തള്ളിക്കളയപ്പെട്ടേയ്ക്കാം."
+
+#. 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 ന്  \"അസംസ്കൃത\" ജോലികള്‍ എന്ന രീതിയില്‍ കൈകാര്യം ചെയ്യാം, അത് "
+"പരിശോധിയ്ക്കാതെ തന്നെ അച്ചടി യന്ത്രത്തിലേയ്ക്ക് നേരിട്ട് അയയ്ക്കാന്‍ കാരണമാകുന്നു."
+
+#. 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 ""
+"വിന്‍ഡോസ് കമ്പ്യൂട്ടറുകളില്‍ നിന്നോ സാംബ സേവകരില്‍ നിന്നോ അച്ചടി ജോലികള്‍ സ്വീകരിയ്ക്കുന്നതാണെങ്കില്‍ "
+"ഇത് തിരഞ്ഞെടുക്കാന്‍ ശുപാര്‍ശ ചെയ്തിരിയ്ക്കുന്നു."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "parallel"
+msgstr "parallel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "serial"
+msgstr "serial"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:2002
+msgid "Printer communication backends:"
+msgstr "അച്ചടി യന്ത്ര ആശയവിനിമയ ബാക്കെന്‍ഡുകള്‍:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:2002
+msgid ""
+"CUPS uses backend programs to communicate with the printer device or port."
+msgstr ""
+"അച്ചടി ഉപകരണവുമായോ അല്ലെങ്കില്‍ പോര്‍ട്ടുമായോ ആശയവിനിമയം ചെയ്യാന്‍ ബാക്കെന്‍ഡ് പ്രോഗ്രാമുകളാണ് "
+"CUPS ഉപയോഗിയ്ക്കുന്നത്."
+
+#. 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 ""
+"നിര്‍ഭാഗ്യവശാല്‍ ചില ബാക്കെന്‍ഡ് പ്രോഗ്രാമുകള്‍ ചില പ്രശ്നങ്ങളുണ്ടാക്കാന്‍ സാധ്യതയുണ്ട്. ഉദാഹരണത്തിന്, "
+"ചില PPC കെര്‍ണലുകള്‍ parallel ബാക്കെന്‍ഡുമായി ക്രാഷ് ചെയ്യും."
+
+#. 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 ""
+"ദയവായി CUPS ഉപയോഗിയ്ക്കുന്ന ബാക്കെന്‍ഡ് പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക. ഡിഫാള്‍ട്ടായി തിരഞ്ഞെടുത്ത വില "
+"സാധാരണയായുള്ള അധിക പരിസ്ഥിതികളിലും ചേരും."

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	Mon May 14 09:10:23 2007
@@ -1,20 +1,20 @@
-# translation of cupsys_1.2.7-2_templates.po to Norwegian Bokmål
+# translation of nb.po_[sQSfZa].po to Norwegian Bokmål
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Bjørn Steensrud <bjornst at powertech.no>, 2007.
+# Bjørn Steensrud <bjornst at powertech.no>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys_1.2.7-2_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-29 04:30+0100\n"
-"PO-Revision-Date: 2007-01-09 21:43+0100\n"
-"Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
+"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"
+"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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 #. Description
@@ -26,64 +26,51 @@
 #. Description
 #: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Denne 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."
+"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 "
+"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
 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?"
+msgstr "Vil du at CUPS skal skrive ut ukjente jobber som rå utskrift?"
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-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. Derfor forsøker CUPS å finne "
-"ut hva formatet er når den mottar en jobb med denne MIME-typen. Standard er "
-"at den avviser utskriftsjobben hvis den ikke kan gjette seg til den "
-"rette typen-"
+"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 ""
+"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."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
-msgstr ""
-"Det er mulig å få CUPS til å behandle alle ukjente jobber med denne MIME-typen "
-"som «rå» jobber, noe som gjør at de sendes direkte til skriveren uten behandling."
+"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."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 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 kommer til å ta imot utskriftsjobber fra Windows-maskiner, så "
-"bør du nok slå på dette, siden Windows setter MIME-typen "
-"application/octet-stream på alle IPP-jobber behandlet gjennom en lokal "
-"driver. Samba sender også sine utskriftsjobber på den måten."
+"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å."
 
 #. Type: multiselect
 #. Choices
@@ -142,18 +129,20 @@
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:2002
-msgid "CUPS uses backend programs for communication with printer device or port."
-msgstr "CUPS bruker «motor»-programmer til å kommunisere med skriverenheten eller porten."
+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
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"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
@@ -162,6 +151,6 @@
 "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."
+"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	Mon May 14 09:10:23 2007
@@ -4,24 +4,25 @@
 #    this format, e.g. by running:
 #         info -n '(gettext)PO Files'
 #         info -n '(gettext)Header Entry'
-# 
+#
 #    Some information specific to po-debconf are available at
 #            /usr/share/doc/po-debconf/README-trans
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# 
+#
 #    Developers do not need to manually edit POT or PO files.
-# 
+#
 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: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2006-05-29 17:10+0100\n"
-"Last-Translator: Tim Dijkstra <tim at famdijkstra.org>\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
 
 #. Type: boolean
 #. Description
@@ -32,18 +33,19 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Dit pakket bevat een server die BSD-stijl afdrukopdrachten kan accepteren om "
-"ze daarna naar CUPS te sturen. De server dient alleen ingesteld te worden "
-"als er andere computers zijn die afdrukopdrachten over het netwerk sturen "
-"via \"BSD\"- of \"LPR\" -services én deze computers niet kunnen worden "
-"ingesteld om het IPP-protocol (gebruikt door CUPS) te gebruiken."
+"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 ""
+"Het pakket 'cupsys-bsd' bevat een server die BSD-stijl afdrukopdrachten "
+"accepteert en naar CUPS doorstuurt. Deze server dient enkel ingesteld te "
+"worden als er andere computers zijn die afdrukopdrachten over het netwerk "
+"sturen via \"BSD\"- of \"LPR\"-diensten, EN deze computers niet kunnen "
+"worden ingesteld om het IPP-protocol te gebruiken (CUPS gebruikt dit "
+"protocol zelf ook)."
 
 #. Type: boolean
 #. Description
@@ -53,47 +55,39 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Alle afdrukopdrachten in IPP krijgen een MIME-type. Omdat niet alle bronnen "
-"van afdrukopdrachten een geschikt type aan de opdracht kunnen verbinden, "
-"worden veel opdrachten verstuurd als het MIME-type application/octet-stream. "
-"CUPS zal daarom als het een opdracht krijgt met dit MIME-type proberen te "
-"raden wat het bestandsformaat is. Standaard zal CUPS, als het niet is gelukt "
-"het formaat te raden, de opdracht afwijzen."
+"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 ""
+"Het 'Internet Printing Protocol' (IPP) vereist dat alle printtaken een MIME-"
+"type hebben. Niet alle printtaken komen van een bron die in staat is om een "
+"geschikt MIME-type aan de printtaak te hangen, in zo'n geval worden ze "
+"aangeboden met het type application/octet-stream. Als CUPS niet in staat is "
+"om het correcte formaat van de taak te raden worden deze printtaak-aanvragen "
+"afgewezen."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"Het is mogelijk om CUPS alle niet-herkende opdrachten met dit MIME-type te "
-"laten behandelen als onbewerkte opdrachten. Dit zorgt er voor dat de "
-"opdracht direct naar de printer wordt gestuurd zonder het verder te "
-"verwerken."
+"CUPS kan deze printtaken als 'raw'-taken afhandelen, wat inhoudt dat ze "
+"zonder verdere bewerking direct naar de printer gestuurd worden."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Als u printopdrachten van Windows-computers wilt accepteren, dan kunt u deze "
-"optie het beste aanzetten. Windows geeft namelijk alle afdrukopdrachten die "
-"zijn verwerkt door een lokaal stuurprogramma het MIME-type application/octet-"
-"stream. Ook Samba verstuurt afdrukopdrachten op deze manier."
+"Deze optie is aan te raden wanneer deze server printtaken dient te "
+"aanvaarden van Windows-computers of Samba-servers."
 
 #. Type: multiselect
 #. Choices
@@ -103,80 +97,92 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "serieel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Backends voor printercommunicatie:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"CUPS gebruikt een backend-programma voor de communicatie met de printer of "
-"de printerpoort."
+"CUPS gebruikt backend-programma's voor de communicatie met de printer en de "
+"printerpoort."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Helaas kunnen sommige backend-programma's problemen veroorzaken. (Bijv. "
-"sommige PPC-kernels kunnen vastlopen met de 'parallel'-backend."
+"Helaas kunnen sommige backend-programma's problemen veroorzaken. (Bv. "
+"sommige PPC-kernels kunnen vastlopen bij gebruik van het 'parallel'-backend.)"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Kies een backend-programma dat door CUPS moet worden gebruikt. De "
-"standaardkeuze zou voor de meest voorkomende omgevingen moeten voldoen."
+"Welk backend-programma wilt u CUPS laten gebruiken?. De standaardwaarde zou "
+"voor de meeste omgevingen moeten voldoen."
+
+#~ 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 ""
+#~ "Als u printopdrachten van Windows-computers wilt accepteren, dan kunt u "
+#~ "deze optie het beste aanzetten. Windows geeft namelijk alle "
+#~ "afdrukopdrachten die zijn verwerkt door een lokaal stuurprogramma het "
+#~ "MIME-type application/octet-stream. Ook Samba verstuurt afdrukopdrachten "
+#~ "op deze manier."
 
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr "Poort en/of domeinnaam waarnaar CUPS moet luisteren:"

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	Mon May 14 09:10:23 2007
@@ -2,16 +2,17 @@
 # Copyright (C) 2007 Carlos Lisboa <carloslisboa at gmail.com>
 # This file is distributed under the same license as the cupsys package.
 # Carlos Lisboa <carloslisboa at gmail.com>, 2007.
+# Miguel Figueiredo <elmig at debianpt.org>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-13 18:58+0100\n"
-"PO-Revision-Date: 2007-01-22 23:44+0000\n"
-"Last-Translator: Carlos Lisboa <carloslisboa at gmail.com>n"
-"Language-Team: Portuguese <traduz at debianpt.org>n"
-"MIME-Version: 1.0n"
+"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-04-08 23:35+0100\n"
+"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"MIME-Version: 1.0n\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
@@ -25,66 +26,58 @@
 #. Description
 #: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Este pacote contém um servidor que pode aceitar trabalhos de impressão em "
-"estilo BSD e submetê-los ao CUPS. Deve ser apenas configurado se possui outros "
-"computadores que submetam trabalhos na rede através de serviços \"BSD\" e "
-"\"LPR\", e que esses computadores não possam ser convertidos para usar o "
-"protocolo IPP que o CUPS usa."
+"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 ""
+"O pacote cupsys contém um servidor que pode aceitar trabalhos de impressão "
+"do estilo BSD e submetê-los ao CUPS. Deve ser apenas configurado se possui "
+"outros computadores que submetam trabalhos na rede através de serviços \"BSD"
+"\" ou \"LPR\", e que esses computadores não possam ser convertidos para usar "
+"o protocolo IPP que o CUPS usa."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "Deseja que o CUPS imprima trabalhos desconhecidos como trabalhos 'raw'?"
+msgstr ""
+"Deseja que o CUPS imprima trabalhos desconhecidos como trabalhos 'raw'?"
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Todos os trabalhos de impressão em IPP obtêm um tipo MIME. Como nem todas as "
-"fontes de trabalhos de impressão podem anexar o tipo apropriado, muitos são "
-"submetidos com o tipo MIME 'application/octet-stream'. Por causa disto, quando "
-"o CUPS recebe um trabalho com este tipo MIME, o mesmo tenta adivinhar qual o "
-"formato. Por omissão, se não conseguir detectar o tipo correcto, o trabalho "
-"é rejeitado."
+"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 ""
+"O Internet Printing Protocol (IPP) adopta um tipo MIME para todos os "
+"trabalhos de impressão. Como nem todas as fontes de trabalhos de impressão "
+"podem anexar o tipo apropriado, muitos trabalhos são submetidos com do tipo "
+"MIME application/octet-stream e podem ser rejeitados se o CUPS não puder "
+"adivinhar o formato do trabalho."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
-msgstr ""
-"É possível fazer com que o CUPS trate todos os trabalhos desconhecidos com "
-"este tipo MIME sendo trabalhos \"raw\", fazendo com que sejam enviados "
-"directamente para a impressora sem que sejam processados."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
+msgstr ""
+"O CUPS pode lidar com tais trabalhos como trabalhos \"raw\", o que faz com "
+"que sejam enviados directamente para a impressora sem que sejam processados."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 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 ""
-"Se for aceitar trabalhos de impressão de computadores Windows, provavelmente "
-"quererá esta opção configurada, já que o Windows anexa a todos os trabalhos "
-"de impressão processados por uma impressora local o tipo MIME "
-"'application/octet-stream'. Os trabalhos de impressão do samba também são "
-"submetidos desta forma."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
+"É recomendado escolher esta opção se o servidor irá aceitar trabalhos de "
+"impressão a partir de computodores com Windows ou de servidores Samba."
 
 #. Type: multiselect
 #. Choices
@@ -114,7 +107,7 @@
 #. Choices
 #: ../cupsys.templates:2001
 msgid "serial"
-msgstr "série"
+msgstr "série"
 
 #. Type: multiselect
 #. Choices
@@ -138,26 +131,26 @@
 #. Description
 #: ../cupsys.templates:2002
 msgid "Printer communication backends:"
-msgstr "'Backends' de comunicação com a impressora"
+msgstr "'Backends' de comunicação com a impressora"
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"O CUPS usa um programa 'backend' para comunicar com a porta ou dispositivo "
+"O CUPS usa programas de 'backend' para comunicar com a porta ou dispositivo "
 "da impressora."
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Infelizmente, alguns programas de 'backend' causam alguns problemas. (Por "
-"exemplo, alguns kernels PPC 'crasham' o 'backend' paralelo)"
+"Infelizmente, alguns programas de 'backend' podem causar alguns problemas. "
+"Por exemplo, alguns kernels PPC bloqueiam' com o 'backend' paralelo."
 
 #. Type: multiselect
 #. Description
@@ -166,5 +159,17 @@
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Escolha qual o 'backend' a ser usado pelo CUPS. A escolha por omissão deve "
+"Escolha qual o 'backend' a ser usado pelo CUPS. A escolha por omissão deve "
 "servir a maioria dos ambientes mais comuns."
+
+#~ 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 ""
+#~ "Se for aceitar trabalhos de impressão de computadores Windows, "
+#~ "provavelmente quererá esta opção configurada, já que o Windows anexa a "
+#~ "todos os trabalhos de impressão processados por uma impressora local o "
+#~ "tipo MIME 'application/octet-stream'. Os trabalhos de impressão do samba "
+#~ "também são submetidos desta forma."

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	Mon May 14 09:10:23 2007
@@ -1,23 +1,14 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
+# Brazilian Portuguese translation of cupsys
+# This file is distributed under the same license as the aiccu package.
+# André Luis Lopes (andrelop) <andrelop at debian.org>, 2005-2006.
+# Felipe Augusto van de Wiel (faw) <faw at debian.org>, 2006-2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2006-11-09 20:17-0200\n"
-"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at cathedrallabs.org>\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\n"
+"PO-Revision-Date: 2007-04-01 22:46-0300\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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,17 +23,17 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
-"Este pacote contém um servidor que pode aceitar trabalhos de impressão no "
+"O pacote CUPS contém um servidor que pode aceitar trabalhos de impressão no "
 "estilo BSD e enviá-los ao CUPS. Isto deverá ser configurado somente se você "
 "possui outros computadores enviando trabalhos de impressão pela rede via "
-"serviços \"BSD\" ou \"LPR\" e estes computadores não podem ser convertidos "
+"serviços \"BSD\" ou \"LPR\" e estes computadores não puderem ser convertidos "
 "para usar o protocolo IPP que o CUPS utiliza."
 
 #. Type: boolean
@@ -50,52 +41,44 @@
 #: ../cupsys.templates:1001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr ""
-"Você deseja que o CUPS imprima trabalhos desconhecidos como trabalhos "
-"\"raw\"?"
+"Você deseja que o CUPS imprima trabalhos desconhecidos como trabalhos \"raw"
+"\"?"
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Todos os trabalhos de impressão em IPP possuem um tipo MIME. Uma vez que nem "
-"todas as fontes de trabalhos de impressão podem anexar um tipo apropriado, "
-"muitos trabalhos são submetidos com seu tipo MIME como appliction/octet-"
-"stream. Devido a isso, quando o CUPS recebe um trabalho com esse tipo MIME, "
-"o mesmo tenta adivinhar em qual formato o trabalho está. Por padrão, caso o "
-"CUPS não consiga adivinhar o tipo correto, o trabalho é rejeitado."
+"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 ""
+"O Internet Printing Protocol (IPP - Protocolo de Impressão da Internet) "
+"força um tipo MIME para todos os trabalhos de impressão. Como nem todas as "
+"fontes de trabalhos de impressão podem anexar um tipo apropriado, muitos "
+"trabalhos são enviados como o tipo MIME application/octet-stream  e podem "
+"ser rejeitados se o CUPS não adivinhar o formato do trabalho."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"É possível fazer com que o CUPS trate todos os trabalhos não reconhecidos "
-"com esse tipo MIME como trabalhos \"raw\", o que fará com que os mesmos "
-"sejam enviados diretamente para a impressora sem processamento prévio."
+"O CUPS pode manipular todos estes trabalhos como trabalhos \"raw\", o que "
+"faz com que eles sejam enviados diretamente para a impressora sem "
+"processamento."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Caso você esteja planejando aceitar trabalhos de impressão de computadores "
-"Windows, você provavelmente irá precisar dessa opção habilitada, uma vez que "
-"o Windows atribui a todos os trabalhos de impressão IPP processados por um "
-"driver local o tipo MIME application/octet-stream. O Samba também envia seus "
-"trabalhos de impressão desta maneira."
+"É recomendado escolher esta opção se o servidor vai aceitar trabalhos de "
+"impressão de computadores Windows ou servidores Samba."
 
 #. Type: multiselect
 #. Choices
@@ -149,37 +132,51 @@
 #. Description
 #: ../cupsys.templates:2002
 msgid "Printer communication backends:"
-msgstr "Backends de comunicação com impressoras:"
+msgstr "\"Backends\" de comunicação com impressoras:"
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"O CUPS utiliza um programa backend para comunicação com o dispositivo de "
-"impressão ou com a porta de impressão."
+"O CUPS utiliza um programa \"backend\" para comunicação com o dispositivo ou "
+"porta de impressão."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Infelizmenete, alguns programas backends causam alguns problemas. (Por "
-"exemplo, alguns kernels PowerPC travam com o backend paralelo)"
+"Infelizmente, alguns programas \"backend\" causam alguns problemas. Por "
+"exemplo, alguns núcleos (\"kernels\") PPC travam com o \"backend parallel"
+"\" (paralelo)."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Por favor, selecione o programa backend a ser usado pelo CUPS. A escolha "
+"Por favor, selecione o programa \"backend\" a ser usado pelo CUPS. A escolha "
 "padrão deve se encaixar na maiorias dos ambientes."
 
+#~ 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 ""
+#~ "Caso você esteja planejando aceitar trabalhos de impressão de "
+#~ "computadores Windows, você provavelmente irá precisar dessa opção "
+#~ "habilitada, uma vez que o Windows atribui a todos os trabalhos de "
+#~ "impressão IPP processados por um driver local o tipo MIME application/"
+#~ "octet-stream. O Samba também envia seus trabalhos de impressão desta "
+#~ "maneira."
+
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr "Porta e/ou nome de host onde o CUPS irá ouvir :"
 

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	Mon May 14 09:10:23 2007
@@ -14,13 +14,14 @@
 #    Developers do not need to manually edit POT or PO files.
 # Yuri Kozlov <kozlov.y at gmail.com>, 2005.
 #
+# Translator: Yuri Kozlov <kozlov.y at gmail.com>"
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys_1.1.23-12_ru.po\n"
+"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: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2005-12-17 16:32+0300\n"
-"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,15 +36,15 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
-"Этот пакет содержит сервер, который может принимать задания печати в стиле "
-"BSD и посылать их в CUPS. Его рекомендуется устанавливать только в том "
+"Этот пакет CUPS содержит сервер, который может принимать задания печати в "
+"стиле BSD и посылать их в CUPS. Его рекомендуется устанавливать только в том "
 "случае, если в сети есть другие компьютеры, которые отправляют задания по "
 "сети с помощью \"BSD\" или \"LPR\" сервисов, и эти компьютеры не могут "
 "работать с протоколом IPP, который используется в CUPS."
@@ -57,46 +58,37 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Все задания печати с помощью IPP имеют тип MIME. Так как не все источники "
-"заданий печати могут присоединять соответствующий тип, многие задания "
-"посылаются с MIME типом application/octet-stream. Из-за этого, когда CUPS "
-"принимает задание с таким MIME типом, он пытается определить формат "
-"полученных данных. По умолчанию, если тип определить не удаётся, задание "
-"отбрасывается."
+"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 ""
+"Все задания печати с помощью интернет протокола печати (IPP) имеют тип MIME. "
+"Так как не все источники заданий печати могут назначать соответствующий тип, "
+"многие задания посылаются с MIME типом приложение/поток-октетов и могут быть "
+"отклонены, если CUPS не определит формат заданий."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
-"Данная установка заставляет CUPS воспринимать нераспознанные задания с таким "
-"MIME типом как \"сырые\" задания, которые посылаются на принтер напрямую, "
-"без обработки."
+"CUPS может обслуживать все такие задания как \"необработанные\", что ведет к "
+"их посылке напрямую к устройству печати без обработки."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
-"Если вы получаете задания печати с компьютеров с Windows, то, вероятно, "
-"лучше установить этот параметр, так как Windows присваивает всем заданиям "
-"печати IPP, обработанным локальным драйверов MIME тип application/octet-"
-"stream. Samba также отправляет свои задания печати в таком виде."
+"Рекомендуется выбрать этот параметр если сервер будет получать задания "
+"печати от компьютеров с Windows или от серверов Samba."
 
 #. Type: multiselect
 #. Choices
@@ -106,81 +98,92 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "serial"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Интерфейсные программы для связи с принтером:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 "CUPS использует интерфейсные программы для связи с устройством печати или "
 "портом."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
 "К сожалению, некоторые интерфейсные программы могут вызывать проблемы. "
-"(Например, некоторые ядра PPC падают при использовании интерфейса parallel)"
+"Например, некоторые ядра PPC рушатся при использовании интерфейса parallel."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Выберите интерфейсные программу, которая будет использоваться CUPS. Выбор по "
+"Выберите интерфейсную программу, которая будет использоваться CUPS. Выбор по "
 "умолчанию должен работать с большинством оборудования."
 
+#~ 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 ""
+#~ "Если вы получаете задания печати с компьютеров с Windows, то, вероятно, "
+#~ "лучше установить этот параметр, так как Windows присваивает всем заданиям "
+#~ "печати IPP, обработанным локальным драйверов MIME тип application/octet-"
+#~ "stream. Samba также отправляет свои задания печати в таком виде."
+
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr ""
 #~ "Порт или/и имя машины через который будет осуществляться подключение к "

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	Mon May 14 09:10:23 2007
@@ -15,8 +15,8 @@
 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: 2006-07-03 22:26+0900\n"
-"PO-Revision-Date: 2005-12-17 08:14+0100\n"
+"POT-Creation-Date: 2007-03-27 07:14+0200\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"
 "MIME-Version: 1.0\n"
@@ -31,66 +31,33 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
-msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Detta paket innehåller en server som kan acceptera utskriftsjobb av BSD-stil "
-"och skicka dom till CUPS. Den bör endast sättas upp om du har andra datorer "
-"som skickar jobb över nätverket via \"BSD\" eller \"LPR\"-tjänster och dessa "
-"datorer inte kan konverteras för att använda IPP-protokollet som CUPS "
-"använder."
+#: ../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."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:1001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "Vill du att CUPS ska skriva ut okända jobb som \"raw\"-jobb?"
+msgstr "Vill du att CUPS ska skriva ut okända jobb som råjobb?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
-msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
-msgstr ""
-"Alla utskriftjobb i IPP får en MIME-typ. 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\". Av denna anledning försöker CUPS "
-"gissa vilket format det är när den tar emot ett jobb av den MIME-typen. Som "
-"standard nekar den att ta emot jobb om den inte kan gissa den korrekta typen."
+#: ../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."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
-msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
-msgstr ""
-"Det är möjligt att ställ in så att CUPS behandlar alla okända jobb med denna "
-"MIME-typ som \"raw\"-jobb vilket orsakar att de skickas direkt till "
-"skrivaren utan att behandlas först."
+#: ../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."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
-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 ""
-"Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du "
-"antagligen välja denna funktion eftersom Windows sätter alla IPP-"
-"utskriftsjobb som hanteras av en lokal drivare till MIME-typen \"application/"
-"octet-stream\". Samba skickar också sina utskriftsjobb på detta sätt."
+#: ../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."
 
 #. Type: multiselect
 #. Choices
@@ -100,84 +67,83 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "parallell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "seriell"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
-msgstr "socket"
+msgstr "uttag"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
-msgstr "Baksystem för skrivarkommunikation:"
+msgstr "Bakändar för skrivarkommunikation:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
-msgid ""
-"CUPS uses backend programs for communication with printer device or port."
-msgstr ""
-"CUPS använder ett baksystemprogram för att kommunicera med skrivarenhet "
-"eller port."
+#: ../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."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
-msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
-msgstr ""
-"Tyvärr kan några baksystemprogram skapa problem. (Till exempel kan vissa PPC-"
-"kärnor krascha med parallella baksystem)"
+#: ../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."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
-msgid ""
-"Please choose the backend program to be used by CUPS. The default choice "
-"should fit the most common environments."
-msgstr ""
-"Vänligen välj det baksystemprogram som ska användas av CUPS. Det förvalda "
-"valet bör passa den flesta vanliga miljöer."
+#: ../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."
 
+#~ 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 ""
+#~ "Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du "
+#~ "antagligen välja denna funktion eftersom Windows sätter alla IPP-"
+#~ "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:"
@@ -195,11 +161,9 @@
 #~ " - 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 "
@@ -208,64 +172,50 @@
 #~ "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	Mon May 14 09:10:23 2007
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
+"POT-Creation-Date: 2007-03-27 22:18+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"
@@ -24,12 +24,12 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
 
 #. Type: boolean
@@ -40,32 +40,28 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
 msgstr ""
 
 #. Type: multiselect
@@ -76,70 +72,70 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 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	Mon May 14 09:10:23 2007
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: cupsys\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
+"POT-Creation-Date: 2007-03-27 22:18+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"
@@ -23,12 +23,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
+#, fuzzy
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 ""
 "Bu paket BSD tipi baskı görevlerini kabul edebilen ve onları CUPS'a gönderen "
 "bir sunucu içerir. Eğer diğer bilgisayarlar \"BSD\" veya \"LPR\" servisleri "
@@ -44,13 +45,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
+"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 ""
 "IPP içindeki tüm yazdırma görevlerine bir MIME tipi atanır.  Her yazdırma "
 "görevine uygun bir MIME tipi atanamayabileceğinden, bir çok görev "
@@ -61,11 +62,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
 "CUPS'ın bu MIME tipindeki tanınmayan bütün yazıcı görevlerine  \"raw\" "
 "görevler olarak muamele etmesini sağlamak mümkündür.  Böylece bu tip "
@@ -73,17 +74,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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 ""
-"Eğer Windows bilgisayarlardan gelen yazıcı görevlerini kabul etmek "
-"istiyorsanız, muhtemelen bu seçeneği tercih edeceksiniz.  Zira Windows yerel "
-"sürücüdeki tüm IPP yazıcı görevlerine application/octet-stream MIME tipini "
-"atar.  Samba da görevleri bu şekilde gönderir."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
 
 #. Type: multiselect
 #. Choices
@@ -93,74 +88,76 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 "CUPS, yazıcı aygıtı veya portu ile iletişim kurmak için arkayüz programını "
 "kullanır."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"Unfortunately, some backend programs are likely to cause some trouble. For "
+"example, some PPC kernels crash with the parallel backend."
 msgstr ""
 "Malesef bazı arkayüz programları sorun çıkartmaktadır. (Örneğin, paralel "
 "arkayüz ile bazı PPC çekirdek çökmeleri gibi)"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
@@ -168,6 +165,17 @@
 "Lütfen CUPS tarafından kullanılacak arkayüz programını seçin. Öntanımlı "
 "seçim çoğu ortam için uygundur."
 
+#~ 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 ""
+#~ "Eğer Windows bilgisayarlardan gelen yazıcı görevlerini kabul etmek "
+#~ "istiyorsanız, muhtemelen bu seçeneği tercih edeceksiniz.  Zira Windows "
+#~ "yerel sürücüdeki tüm IPP yazıcı görevlerine application/octet-stream MIME "
+#~ "tipini atar.  Samba da görevleri bu şekilde gönderir."
+
 #~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
 #~ msgstr "ipp, lpd, paralel, scsi, seri, soket, usb"
 

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	Mon May 14 09:10:23 2007
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: cupsys 1.1.24\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-07-03 22:26+0900\n"
+"POT-Creation-Date: 2007-03-27 22:18+0900\n"
 "PO-Revision-Date: 2005-12-19 17:24+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -24,12 +24,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1002
+#: ../cupsys-bsd.templates:1001
+#, fuzzy
 msgid ""
-"This package contains a server that can accept BSD-style print jobs and "
-"submit them to CUPS. It should only be set up if you have other computers "
-"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
-"computers cannot be converted to use the IPP protocol that CUPS uses."
+"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 này chứa một trình phục vụ có thể chấp nhận việc in kiểu BSD và đệ trình "
 "chúng vào hệ thống in CUPS. Chỉ nên thiết lập nó nếu bạn có máy tính khác đệ "
@@ -44,13 +45,13 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1002
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
-"can attach an appropriate type, many jobs get submitted as the MIME type "
-"application/octet-stream. Because of this, when CUPS receives a job with "
-"that MIME type, it attempts to guess what the format is. By default, if it "
-"cannot guess the proper type, it rejects the job."
+"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 ""
 "Trong IPP, mọi việc in được một kiểu MIME. Vì không phải tất cả các nguồn "
 "việc in có thể đính kèm kiểu thích hợp, nhiều việc in được đệ trình với kiểu "
@@ -60,11 +61,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1003
+#: ../cupsys.templates:1001
+#, fuzzy
 msgid ""
-"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
-"type as \"raw\" jobs, which causes them to be sent directly to the printer "
-"without processing."
+"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
+"directly to the printer without processing."
 msgstr ""
 "Có thể đặt CUPS phân loại mọi việc in chưa nhận ra và có kiểu MIME này như "
 "là việc in « thô ». Như thế thì, CUPS sẽ gởi chúng thẳng vào máy in, không "
@@ -72,17 +73,11 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1004
+#: ../cupsys.templates:1001
 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 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 cách đó."
+"It is recommended to choose this option if the server will be accepting "
+"print jobs from Windows computers or Samba servers."
+msgstr ""
 
 #. Type: multiselect
 #. Choices
@@ -92,73 +87,75 @@
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2003
+#: ../cupsys.templates:2001
 msgid "parallel"
 msgstr "song song"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2004
+#: ../cupsys.templates:2001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2005
+#: ../cupsys.templates:2001
 msgid "serial"
 msgstr "nối tiếp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2006
+#: ../cupsys.templates:2001
 msgid "socket"
 msgstr "ổ cắm"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2007
+#: ../cupsys.templates:2001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2008
+#: ../cupsys.templates:2001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2009
+#: ../cupsys.templates:2002
 msgid "Printer communication backends:"
 msgstr "Các hậu phương liên lạc với máy in:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2010
+#: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+"CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
 "Phần mềm CUPS dùng trình hậu phương để truyền thông với thiết bị in hay cổng."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2011
+#: ../cupsys.templates:2002
+#, fuzzy
 msgid ""
-"Unfortunately, some backend programs cause some trouble. (For example, some "
-"PPC kernel crashes with the parallel backend)"
+"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ó gây ra lỗi. (Lấy thí dụ, hậu "
 "phương song song gây ra một số hạt nhân PPC bị hỏng.)"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2012
+#: ../cupsys.templates:2002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
@@ -166,6 +163,18 @@
 "Hãy chọn chương trình hậu phương mà phần mềm CUPS sẽ dùng. Tùy chọn mặc định "
 "nên khớp với các 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 "
+#~ "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 "
+#~ "cách đó."
+
 #~ msgid "Port or/and host name where CUPS will listen to:"
 #~ msgstr "Cổng và/hay tên máy nơi CUPS se lắng nghe:"
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules	Mon May 14 09:10:23 2007
@@ -22,7 +22,7 @@
 DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
 DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
 DEB_DH_INSTALLINIT_ARGS := -u'multiuser 19'
-DEB_FIXPERMS_EXCLUDE := /usr/lib/cups/backend-available/lpd
+DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend-available
 
 clean::
 	rm -f man/client.conf.man packaging/cups.list
@@ -31,6 +31,7 @@
 	(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
 $(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
 	dh_movefiles -p$(cdbs_curpkg)
+
 binary-post-install/cupsys::
 	mv debian/cupsys/usr/lib/cups/backend/* debian/cupsys/usr/lib/cups/backend-available
 	install -o root -g root -m 644 doc/favicon.ico debian/cupsys/usr/share/cups/doc-root
@@ -42,6 +43,11 @@
 	install -o root -g root -m 644 debian/cupsys.default debian/cupsys/etc/default/cupsys
 	install -m 755 debian/local/browsing_status debian/local/enable_browsing debian/local/sharing_status debian/local/enable_sharing $(DEB_DESTDIR)/../cupsys/usr/share/cups
 
+	# install lpd backend suid root so that it can bind to port <
+	# 1024 (required for RFC compliance)
+	chown root:lp debian/cupsys/usr/lib/cups/backend-available/lpd
+	chmod 4754 debian/cupsys/usr/lib/cups/backend-available/lpd
+
 	# Install PPDs into /usr/share/ppd/cups-included/<Manufacturer>, see
 	# http://wiki.debian.org/PpdFileStructureSpecification
 	for i in $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/*.ppd; do \
@@ -55,21 +61,6 @@
 	#ln -s ../cups/model $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-transitional-dir
 	dh_usrlocal
 
-	ln -s ../../ppd/custom $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/custom
-
-	# Add PPD directories according to FHS extension for distribution-
-	# independent printer driver location
-
-	#mkdir -p debian/cupsys/usr/local/share/ppd
-	#mkdir -p debian/cupsys/opt/share/ppd
-	#ln -s ../../local/share/ppd debian/cupsys/usr/share/ppd/1-local-admin
-	#ln -s /opt/share/ppd debian/cupsys/usr/share/ppd/2-third-party
-
-	# install lpd backend suid root so that it can bind to port <
-	# 1024 (required for RFC compliance)
-	chown root:lp debian/cupsys/usr/lib/cups/backend-available/lpd
-	chmod 4754 debian/cupsys/usr/lib/cups/backend-available/lpd
-
 binary-post-install/libcupsimage2-dev::
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
 	ln -s libcupsimage2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev



More information about the Pkg-cups-devel mailing list