[Pkg-cups-devel] r307 - in cupsys/branches/cups-1.2-ubuntu/debian:
. patches
Martin Pitt
mpitt at costa.debian.org
Fri Jul 21 16:50:15 UTC 2006
Author: mpitt
Date: Fri Jul 21 16:50:08 2006
New Revision: 307
Added:
cupsys/branches/cups-1.2-ubuntu/debian/client.conf
- copied unchanged from r303, /cupsys/branches/cups-1.2/debian/client.conf
cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.files
- copied unchanged from r303, /cupsys/branches/cups-1.2/debian/cupsys-common.files
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.examples
- copied unchanged from r303, /cupsys/branches/cups-1.2/debian/libcupsys2.examples
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_r5673.dpatch
- copied unchanged from r277, /cupsys/branches/cups-1.2/debian/patches/00_r5673.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/60_device_uri.dpatch
- copied unchanged from r303, /cupsys/branches/cups-1.2/debian/patches/60_device_uri.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.config
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.default
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.files
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.prerm
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.templates
cupsys/branches/cups-1.2-ubuntu/debian/docs
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.dirs
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/03_clean.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch (contents, props changed)
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/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/nl.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
Log:
merge to Debian branch
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 Fri Jul 21 16:50:08 2006
@@ -1,3 +1,18 @@
+cupsys (1.2.1-3) unstable; urgency=low
+
+ * The USB backend no longer supports the usb:/dev/foo
+ format on systems that support device ID queries since 1.2.1-1.
+ Because Linux supports device ID queries, you have to
+ replace your printer configuration uses usb:/dev/foo style
+ with device ID style. usb backend will show device IDs of
+ active USB printers.
+ * Port/Listen and Browsing parameters are merged again to
+ /etc/cups/cupsd.conf. Therefore debconf configuration interface
+ for them is removed. For your information, CUPS Web interface
+ (http://localhost:631) provides a server configuration interface.
+
+ -- Kenshi Muto <kmuto at debian.org> Mon, 19 Jun 2006 15:25:48 +0000
+
cupsys (1.2.1-1) unstable; urgency=low
* New upstream release 1.2.1.
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 Fri Jul 21 16:50:08 2006
@@ -1,3 +1,83 @@
+cupsys (1.2.2-0ubuntu1) edgy; urgency=low
+
+ * Merge to Debian unstable:
+ - This gets rid of /etc/cups/conf.d/ again and re-merges the separate
+ browsing and ports settings to /etc/cups/cupsd.conf again. Separating
+ was nice for preserving an unchanged conffile for the most important
+ settings, but it broke KDE and the web interface and generated way too
+ many bugs.
+ * Update to new upstream version 1.2.2 (UVF exception granted by by Matt
+ Zimmerman):
+ - Fixes printing to 1.1.x servers. Closes: LP#42513, #42802
+ - Fixes parsing of some PostScript files which previously generated empty
+ pages. Closes: LP#51432
+ - Fixes parsing of network masks. Closes: LP#52390
+ - Lots of more fixes, see upstream changelog.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 21 Jul 2006 18:27:40 +0200
+
+ -- Kenshi Muto <kmuto at debian.org> Fri, 21 Jul 2006 18:43:59 +0200
+
+cupsys (1.2.1-4) unstable; urgency=medium
+
+ [Kenshi Muto]
+ * Include changelogs during 1.1.23-13 - 1.1.23-15. (closes: #374494)
+ * Apply upstream svn change r5754.
+ - Fix negotiation problem between unstable clients and sarge servers.
+ (closes: #375359)
+ * 58_fixdestc: avoid build failure of r5754 (add ipp-private.h include).
+ * 59_de_docroot: install German translation/images. Although upstream
+ SVN has, Debian diff structure can't handle a binary diff. This patch
+ will be removed when 1.2.2 is released.
+ * Add snmp to backend choices. Because I don't make sure this backend
+ is stable, the default is disabled. Use dpkg-reconfigure cupsys to
+ enable. (closes: #376496)
+ * Don't remove backend symlinks during reconfigure/upgrade process.
+ (closes: #376499)
+ * Check Include directive with case insensitive. (closes: #376883)
+ * libcupsys2 has /etc/cups directory to allow admin put own
+ client.conf. (closes: #370788)
+ * Include sample client.conf in libcupsys2. You can copy /usr/share/
+ doc/libcupsys2/examples/client.conf to /etc/cups or ~/.cups and modify
+ for your environment. (closes: #376840)
+ * Split locale files to new package "cupsys-common". (closes: #378659)
+ This package is used by cupsys and cupsys-client/cupsys-bsd.
+ * removed 26_modprobe: because parallel backend executes with user 'lp'
+ permission, modprobe can't work. We CUPS team believe it's better
+ that lp module is loaded by discover or any other hardware detection
+ programs instead of CUPS. We provide a module loader by init script
+ for user's convenience at this time.
+ * 60_device_uri: preserve old URI during the printer configuration on
+ Web interface.
+
+ -- Kenshi Muto <kmuto at debian.org> Wed, 21 Jun 2006 15:06:02 +0000
+
+cupsys (1.2.1-3) unstable; urgency=low
+
+ [Kenshi Muto]
+ * Apply upstream svn change r5673.
+ - Remove unnecessary %s from dirsvc.c and will solve a mysterious
+ cupsd crash. Thanks Neil. (closes: #372696, #370611)
+ - Support again * character as IP address. (closes: #372291)
+ - Fixes wrong command line arguments to backend. (closes: #372586, #373839)
+ * Improve the wording of NEWS file, thanks Tomas (closes: #372256)
+ * 53_usr_share_ppd_support: Use /usr/share/ppd as PPD path.
+ (closes: #365300, #373722)
+ Make symlink /usr/share/ppd/cups-transitional-dir -> /usr/share/cups/ppd
+ for keeping a compatibility. We'll migrate all of PPD files to
+ /usr/share/ppd in the future.
+ * Revert to use single /etc/cups/cupsd.conf file for the configuration
+ instead of using separate files in /etc/cups/cups.d. The migration will
+ be done automatically. (closes: #345973, #372727)
+ * Apply correct permission modes to the files under /etc/cups at postinst
+ stage.
+ * Update debconf translations:
+ - Danish (closes: #371170)
+ - French (closes: #372714)
+ - Italian (closes: #372198)
+
+ -- Kenshi Muto <kmuto at debian.org> Sun, 11 Jun 2006 11:51:01 +0000
+
cupsys (1.2.1-2ubuntu4) edgy; urgency=low
* Add forgotten versioned-dependency on sysv-rc to get new update-rc.d
@@ -36,20 +116,6 @@
-- Martin Pitt <martin.pitt at ubuntu.com> Thu, 15 Jun 2006 20:54:51 +0200
-cupsys (1.2.1-3) UNRELEASED-unstable; urgency=low
-
- [Kenshi Muto]
- * Apply upstream svn change r5643.
- * Remove unnecessary %s from dirsvc.c and will solve a mysterious
- cupsd crash. Thanks Neil. (closes: #372696)
- * Improve the wording of NEWS file, thanks Tomas (closes: #372256)
- * Update debconf translations:
- - Danish (closes: #371170)
- - French (closes: #372714)
- - Italian (closes: #372198)
-
- -- Kenshi Muto <kmuto at debian.org> Sun, 11 Jun 2006 11:51:01 +0000
-
cupsys (1.2.1-2) unstable; urgency=low
[Kenshi Muto]
@@ -695,12 +761,52 @@
-- Kenshi Muto <kmuto at debian.org> Wed, 5 Oct 2005 12:54:27 +0000
-cupsys (1.1.23-13) UNRELEASED; urgency=low
+cupsys (1.1.23-15) unstable; urgency=high
+
+ [Kenshi Muto]
+ * Allow '*' for hostname in ports.conf. (closes: #340975)
+ * Fix IPv4 address validation.
+ * Use /bin/echo instead of shell built-in echo. (closes: #343566)
+ * Improve cupsys.templates. (closes: #343498)
+ * Updated Swedish debconf translation.
+ * Updated Russian debconf translation.
+ * Updated German debconf translation.
+ * Updated Czech debconf translation. (closes: #343716)
+ * Updated French debconf translation. (closes: #344116)
+ * Updated Vietnamese debconf translation.
+ * Removed example descriptions from init.d script. (closes: #334842)
+ * Apply kFreeBSD patch. (closes: 338266)
+
+ -- Kenshi Muto <kmuto at debian.org> Fri, 16 Dec 2005 21:05:47 +0900
+
+cupsys (1.1.23-14) unstable; urgency=high
+
+ [Kenshi Muto]
+ * Downgrade port and browse question to low. (closes: #343341)
+ * debian/patches/08_cupsd.conf.conf.d.dpatch:
+ - Commented out Port/Listen/Browsing in cupsd.conf.in because
+ CUPS crashes when there is a duplicate definition!
+ (closes: #343251, #343279, ##343285, #343292)
+ * Added NEWS to explain how to fix this for 1.1.23-13 users:
+ Tweaking cupsd.conf via postinst is a bad idea, so I gave up
+ trying to correct this automatically. Instead, comment out the
+ Port/Listen/Browsing lines in /etc/cups/cupsd.conf if you had
+ already replaced this file by the one from 1.1.23-13.
+ * Updated Swedish debconf translation. (closes: #343397)
+ * Set seen false flag when ports configuration is failed.
+ (closes: #343400)
+
+ [Martin-Éric Racine]
+ * Added debian/watch file.
+
+ -- Kenshi Muto <kmuto at debian.org> Thu, 15 Dec 2005 06:00:09 +0900
+
+cupsys (1.1.23-13) unstable; urgency=high
* 38_pdftopscan.dpatch: Apply CAN-2005-0064, CAN-2004-0888,
and CAN-2005-2097 patches. (closes: #324459, #324460, #324464)
Because Debian cupsys uses xpdf wrapper instead of forked pdftops,
- users aren't affected these security problems.
+ so users aren't affected these security problems.
This patch is just for users who want to create own pdftops from
source.
* Move Port/Listen and Browsing configurations from /etc/cups/
@@ -709,10 +815,20 @@
/etc/cups/cups.d/ports.conf: Port/Listen configuration.
/etc/cups/cups.d/browse.conf: Browsing configuration
- Migration will be done automatically.
You can configure these values by using "dpkg-reconfigure cupsys".
(closes: #235906, #297695, #178838, #288838)
+ * Added Swedish debconf translation (closes: #338545). Thanks Daniel.
+ * Updated Russian debconf translation (closes: #340626). Thanks Yuri.
+
+ * Applied xpdf patch to fix buffer overflows [pdftops/Stream.cxx,
+ pdftops/Stream.h, CAN-2005-3191, CAN-2005-3192,
+ 48_security_CAN-2005-3191.dpatch]
+ Because Debian cupsys uses xpdf wrapper instead of forked pdftops,
+ so users aren't affected these security problems.
+ This patch is just for users who want to create own pdftops from
+ source.
+
-- Kenshi Muto <kmuto at debian.org> Mon, 22 Aug 2005 18:50:26 +0900
cupsys (1.1.23-12) unstable; urgency=medium
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 Fri Jul 21 16:50:08 2006
@@ -11,6 +11,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
+Suggests: cupsys-common
Provides: libcupsys2-gnutls10
Replaces: cupsys-client (<= 1.1.10-2), libcupsys2-gnutls10 (<= 1.1.23-11)
Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11)
@@ -49,7 +50,7 @@
Priority: optional
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), ssl-cert (>= 1.0.11), sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), sysv-rc (>= 2.86.ds1-14.1ubuntu2)
Replaces: cupsys-pstoraster
Conflicts: cupsys-pstoraster (<< 2)
Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters
@@ -70,7 +71,7 @@
Priority: optional
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, adduser
+Depends: ${shlibs:Depends}, adduser, cupsys-common
Conflicts: lprng
Recommends: cupsys-bsd
Suggests: cupsys, kdeprint, gtklp, cupsys-pt, xpp
@@ -133,7 +134,7 @@
Priority: extra
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, cupsys-client (= ${Source-Version}), debconf, netbase
+Depends: ${shlibs:Depends}, cupsys-client (= ${Source-Version}), debconf, netbase, cupsys-common
Conflicts: lpr, lprng, manpages-fr (<< 0.9.5-1)
Provides: lpr
Replaces: lpr, cupsys (<= 1.1.15-2), manpages-fr (<< 0.9.5-1)
@@ -150,3 +151,21 @@
The terms "Common UNIX Printing System" and "CUPS" are trademarks of
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
+
+Package: cupsys-common
+Priority: optional
+Section: net
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: 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
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides common files for CUPS server and client packages.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config Fri Jul 21 16:50:08 2006
@@ -6,13 +6,6 @@
PORTS=/etc/cups/cups.d/ports.conf
BROWSE=/etc/cups/cups.d/browse.conf
-# Move cupsd-browsing.conf to new location and name
-if [ -f /etc/cups/cupsd-browsing.conf -a ! -e /etc/cups/cups.d/browse.conf ]; then
- echo "Moving /etc/cups/cupsd-browsing.conf to new location /etc/cups/cups.d/browse.conf..." >&2
- mkdir -p /etc/cups/cups.d
- mv /etc/cups/cupsd-browsing.conf /etc/cups/cups.d/browse.conf
-fi
-
# Debconf library
. /usr/share/debconf/confmodule
@@ -80,64 +73,62 @@
db_input low cupsys/backend || true
db_go
-RET=
-if [ -f "$CONF" ]; then
- if [ "$(grep -h "Include[[:space:]]\+$PORTS" $CONF)" -a -f "$PORTS" ]; then
- RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF $PORTS | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
- else
- RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
- fi
- if [ "$RET" ]; then
- db_set cupsys/ports $RET
- fi
- db_input low cupsys/ports || true
- db_go
- db_get cupsys/ports
- STATE=0
- while ! is_ports "$RET"; do
- db_input critical cupsys/portserror || true
- db_go
- db_fset cupsys/ports seen false
- STATE=$(expr $STATE + 1)
- if [ "$STATE" = "5" ]; then
- echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
- exit 1
- fi
- db_input high cupsys/ports || true
- db_go
- db_get cupsys/ports
- done
-
- if [ "$(grep -h "Include[[:space:]]\+\($BROWSE\|cupsd-browsing.conf\)" $CONF)" -a -f "$BROWSE" ]; then
- RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF $BROWSE | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
- else
- RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
- fi
- if [ "$RET" = "off" ]; then
- db_set cupsys/browse false
- elif [ "$RET" = "on" ]; then
- db_set cupsys/browse true
- fi
- db_input low cupsys/browse || true
- db_go
-else
- db_input low cupsys/ports || true
- db_go
- db_get cupsys/ports
- STATE=0
- while ! is_ports "$RET"; do
- db_input critical cupsys/portserror || true
- db_go
- db_fset cupsys/ports seen false
- STATE=$(expr $STATE + 1)
- if [ "$STATE" = "5" ]; then
- echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
- exit 1
- fi
- db_input low cupsys/ports || true
- db_go
- db_get cupsys/ports
- done
- db_input low cupsys/browse || true
- db_go
-fi
+#RET=
+#if [ -f "$CONF" ]; then
+# if [ "$(grep -h "Include[[:space:]]\+$PORTS" $CONF)" -a -f "$PORTS" ]; then
+# RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF $PORTS | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
+# else
+# RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
+# fi
+# if [ "$RET" ]; then
+# db_set cupsys/ports $RET
+# fi
+# db_input low cupsys/ports || true
+# db_go
+# db_get cupsys/ports
+# STATE=0
+# while ! is_ports "$RET"; do
+# db_input critical cupsys/portserror || true
+# db_go
+# db_fset cupsys/ports seen false
+# STATE=$(expr $STATE + 1)
+# if [ "$STATE" = "5" ]; then
+# echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
+# exit 1
+# fi
+# db_input high cupsys/ports || true
+# db_go
+# db_get cupsys/ports
+# done
+
+# if [ "$(grep -h "Include[[:space:]]\+$BROWSE" $CONF)" -a -f "$BROWSE" ]; then
+# RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF $BROWSE | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
+# else
+# RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
+# fi
+# if [ "$RET" = "off" ]; then
+# db_set cupsys/browse false
+# fi
+# db_input low cupsys/browse || true
+# db_go
+#else
+# db_input low cupsys/ports || true
+# db_go
+# db_get cupsys/ports
+# STATE=0
+# while ! is_ports "$RET"; do
+# db_input critical cupsys/portserror || true
+# db_go
+# db_fset cupsys/ports seen false
+# STATE=$(expr $STATE + 1)
+# if [ "$STATE" = "5" ]; then
+# echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
+# exit 1
+# fi
+# db_input low cupsys/ports || true
+# db_go
+# db_get cupsys/ports
+# done
+# db_input low cupsys/browse || true
+# db_go
+#fi
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.default
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.default (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.default Fri Jul 21 16:50:08 2006
@@ -1 +1,4 @@
# Cups configure options
+
+# LOAD_LP_MODULE: enable/disable to load "lp" parallel printer driver module
+LOAD_LP_MODULE=yes
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 Fri Jul 21 16:50:08 2006
@@ -1,7 +1,6 @@
var/run/cups
usr/share/doc/cupsys
etc/default
-etc/cups/cups.d
etc/cups/ssl
usr/lib/cups/backend-available
var/cache/cups/ppd
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs Fri Jul 21 16:50:08 2006
@@ -1,4 +1,3 @@
-CHANGES.txt
CREDITS.txt
README.txt
debian/HOWTO_BUGREPORT.txt
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.files
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.files (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.files Fri Jul 21 16:50:08 2006
@@ -22,14 +22,11 @@
usr/lib/cups/notifier
usr/sbin/cupsd
usr/share/cups/banners
-usr/share/cups/charsets
-usr/share/cups/charmaps
usr/share/cups/data
usr/share/cups/doc-root
usr/share/cups/fonts
usr/share/cups/model
usr/share/cups/templates
-usr/share/locale
usr/share/man/man7/backend.7.gz
usr/share/man/man7/filter.7.gz
usr/share/man/man5/classes.conf.5.gz
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 Fri Jul 21 16:50:08 2006
@@ -12,6 +12,10 @@
set -e
+if [ -r /etc/default/cupsys ]; then
+ . /etc/default/cupsys
+fi
+
. /lib/lsb/init-functions
# Get the timezone set.
@@ -37,10 +41,11 @@
fi
done
- # load modules for parallel printer support which are not covered by
- # udev
- modprobe lp 2>/dev/null || true
- modprobe ppdev 2>/dev/null || true # for ISO-1284 device name detection
+ if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
+ -a -f /proc/devices -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; 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
log_end_msg $?
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 Fri Jul 21 16:50:08 2006
@@ -70,6 +70,9 @@
mv /var/spool/cups/certs/* /var/run/cups/certs || true
rm -rf /var/spool/cups/certs
fi
+ if [ -d /var/lib/cups/certs ]; then
+ rm -rf /va/lib/cups/certs
+ fi
[ -f /etc/cups/ppds.dat ] && mv /etc/cups/ppds.dat /var/cache/cups/ppd
@@ -114,11 +117,11 @@
db_fset cupsys/raw-print changed false
fi
# Set up backends
- (cd /usr/lib/cups/backend && rm -f http ipp lpd parallel scsi serial socket usb)
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 -s ../backend-available/$module /usr/lib/cups/backend/$module
if [ "$module" = "ipp" ]; then
@@ -143,59 +146,71 @@
# chmod 600 /etc/cups/passwd.md5
#fi
- # Create /etc/cups/cups.d/ports.conf and /etc/cups/cups.d/browse.conf
- db_get cupsys/ports
- VAL=$(echo "$RET" | perl -e '$ret = ""; while (<STDIN>) { chomp;
- @values = split(/\s+/);
- foreach(@values) {
- if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
- # PORT
- $ret .= "Port $_\\n";
- } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
- # IP
- $ret .= "Listen $_\\n";
- } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
- my($tmp) = $_;
- if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
- if ($1 < 0 || $1 > 65535) {
- # ERROR
- $ret = "";
- last;
- }
- }
- # HOSTNAME
- $ret .= "Listen $_\\n";
- } elsif (/^\//) {
- # domain socket
- $ret .= "Listen $_\\n";
- } else {
- # ERROR
- $ret = "";
- last;
- }
- }
- print $ret;
- }')
-
- if [ -z "$VAL" ]; then
- echo "Error: debconf has an invalid value. Run 'dpkg-reconfigure cupsys' again."
- return 1
- else
- /bin/echo -e -n "$VAL" > /etc/cups/cups.d/ports.conf
+ # 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
fi
+ #
+ # Create /etc/cups/cups.d/ports.conf and /etc/cups/cups.d/browse.conf
+ #db_get cupsys/ports
+ #VAL=$(echo "$RET" | perl -e '$ret = ""; while (<STDIN>) { chomp;
+ # @values = split(/\s+/);
+ # foreach(@values) {
+ # if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
+ # # PORT
+ # $ret .= "Port $_\\n";
+ # } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
+ # # IP
+ # $ret .= "Listen $_\\n";
+ # } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
+ # my($tmp) = $_;
+ # if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
+ # if ($1 < 0 || $1 > 65535) {
+ # # ERROR
+ # $ret = "";
+ # last;
+ # }
+ # }
+ # # HOSTNAME
+ # $ret .= "Listen $_\\n";
+ # } elsif (/^\//) {
+ # # domain socket
+ # $ret .= "Listen $_\\n";
+ # } else {
+ # # ERROR
+ # $ret = "";
+ # last;
+ # }
+ # }
+ # print $ret;
+ # }')
+
+ #if [ -z "$VAL" ]; then
+ # echo "Error: debconf has an invalid value. Run 'dpkg-reconfigure cupsys' again."
+ # return 1
+ #else
+ # /bin/echo -e -n "$VAL" > /etc/cups/cups.d/ports.conf
+ #fi
- db_get cupsys/browse
- if [ "$RET" = "true" ]; then
- /bin/echo "Browsing on" > /etc/cups/cups.d/browse.conf
- else
- /bin/echo "Browsing off" > /etc/cups/cups.d/browse.conf
- fi
+ #db_get cupsys/browse
+ #if [ "$RET" = "true" ]; then
+ # /bin/echo "Browsing on" > /etc/cups/cups.d/browse.conf
+ #else
+ # /bin/echo "Browsing off" > /etc/cups/cups.d/browse.conf
+ #fi
- # fix browse.conf Include directive for upgrades
- if dpkg --compare-versions "$2" le-nl "1.1.23-10ubuntu4" &&
- test -e /etc/cups/cupsd.conf &&
- grep -q '^Include cupsd-browsing.conf\>' /etc/cups/cupsd.conf; then
- sed -i 's_^Include cupsd-browsing.conf_Include /etc/cups/cups.d/browse.conf_' /etc/cups/cupsd.conf
+ # permission configuration
+ chown root:lp /etc/cups ; chmod 3755 /etc/cups
+ chown root:lp /etc/cups/cupsd.conf ; chmod 640 /etc/cups/cupsd.conf
+ chown root:lp /etc/cups/ppd ; chmod 755 /etc/cups/ppd
+ if [ -f /etc/cups/classes.conf ]; then
+ chown root:lp /etc/cups/classes.conf ; chmod 600 /etc/cups/classes.conf
+ fi
+ if [ -f /etc/cups/printers.conf ]; then
+ chown root:lp /etc/cups/printers.conf ; chmod 600 /etc/cups/printers.conf
fi
# fix permissions for upgrades which might have written cache files as
@@ -221,7 +236,6 @@
if dpkg --compare-versions "$2" lt "1.2.1-2ubuntu3"; then
rm -f /etc/rc0.d/K19cupsys /etc/rc6.d/K19cupsys
fi
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
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 Fri Jul 21 16:50:08 2006
@@ -25,11 +25,13 @@
purge)
rm -rf /var/lib/cups
rm -rf /var/log/cups
+ rm -rf /var/run/cups
+ rm -rf /var/cache/cups
rm -rf /var/spool/cups
rm -rf /etc/cups/interfaces
rm -rf /etc/cups/ppd
rm -rf /etc/cups/passwd.md5
- rm -f /etc/cups/cups.d/*
+ rm -rf /etc/cups/cups.d
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
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.prerm
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.prerm (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.prerm Fri Jul 21 16:50:08 2006
@@ -16,13 +16,15 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-if [ -L /usr/lib/cups/backend/smb ]; then
- rm -f /usr/lib/cups/backend/smb 2>/dev/null || true
-fi
case "$1" in
- remove|upgrade|deconfigure)
- (cd /usr/lib/cups/backend && rm -f http ipp lpd parallel scsi serial socket usb)
+ remove)
+ (cd /usr/lib/cups/backend && rm -f http ipp lpd parallel scsi serial socket usb snmp)
+ if [ -L /usr/lib/cups/backend/smb ]; then
+ rm -f /usr/lib/cups/backend/smb 2>/dev/null || true
+ fi
+ ;;
+ upgrade|deconfigure)
;;
failed-upgrade)
;;
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 Fri Jul 21 16:50:08 2006
@@ -19,7 +19,7 @@
Template: cupsys/backend
Type: multiselect
-__Choices: ipp, lpd, parallel, scsi, serial, socket, usb
+__Choices: ipp, lpd, parallel, scsi, serial, socket, usb, snmp
Default: ipp, lpd, parallel, socket, usb
_Description: Printer communication backends:
CUPS uses backend programs for communication with printer device or port.
@@ -29,38 +29,3 @@
.
Please choose the backend program to be used by CUPS. The default choice
should fit the most common environments.
-
-Template: cupsys/ports
-Type: string
-Default: localhost:631 /var/run/cups/cups.sock
-_Description: Port or/and host name where CUPS will listen to:
- Please specify the port or the host name CUPS daemon will listen to.
- The following formats are allowed:
- .
- - Port number (631);
- - Host name (debian.example.com);
- - Host:Port (debian.example.com:631);
- - File domain socket (/var/run/cups/cups.sock).
- .
- You can combine any of these by delimiting in a space-separated list.
- .
- The default port 631 is reserved for the Internet Printing Protocol (IPP).
- "localhost:631" is recommended to setup a standalone environment for security
- reasons.
-
-Template: cupsys/browse
-Type: boolean
-Default: false
-_Description: Broadcast and/or listen for CUPS printer information on the network?
- CUPS daemon can broadcast printer information for clients on the network,
- and detect printers on the network automatically.
- .
- If you choose this option, the CUPS daemon will periodically send UDP
- broadcasts to detect printers.
-
-Template: cupsys/portserror
-Type: note
-_Description: Incorrect value entered
- an error occurred while parsing the port number or the host name.
- .
- Please correct your input.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/docs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/docs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/docs Fri Jul 21 16:50:08 2006
@@ -1,4 +1,3 @@
-CHANGES.txt
CREDITS.txt
LICENSE.txt
README.txt
Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.dirs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.dirs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.dirs Fri Jul 21 16:50:08 2006
@@ -1 +1,2 @@
-/var/spool/cups/tmp
+var/spool/cups/tmp
+etc/cups
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 Fri Jul 21 16:50:08 2006
@@ -1,4 +1,4 @@
-00_r5643.dpatch
+#00_r5754.dpatch
02_configure.dpatch
#03_manext.dpatch
03_clean.dpatch
@@ -6,7 +6,7 @@
#05_avoidunknowngroup.dpatch
06_disable_backend_setuid.dpatch
07_removecvstag.dpatch
-08_cupsd.conf.conf.d.dpatch
+#08_cupsd.conf.conf.d.dpatch
09_runasuser.dpatch
09_runasuser_autoconf.dpatch
11_pam.dpatch
@@ -14,11 +14,16 @@
13_default_log_warn.dpatch
14_dont_force_ssl.dpatch
19_cupsaccept.dpatch
-26_modprobe.dpatch
+#26_modprobe.dpatch
44_fixconfdirperms.dpatch
47_pid.dpatch
#48_stdlib.dpatch
+53_usr_share_ppd_support.dpatch
55_ppd_okidata_name.dpatch
-56_dirsvc.dpatch
+#56_dirsvc.dpatch
+#57_cupsaddsmb.dpatch
+#58_fixdestc.dpatch
+#59_de_docroot.dpatch
+60_device_uri.dpatch
58_cupsd.conf-AllowLocal.dpatch
ubuntu-nowebadmin.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch Fri Jul 21 16:50:08 2006
@@ -5,23 +5,50 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
---- cupsys-1.2.1~/configure 2006-05-22 20:01:55.000000000 +0000
-+++ cupsys-1.2.1/configure 2006-05-28 13:11:46.000000000 +0000
-@@ -7856,11 +7856,11 @@
- IRIX | Linux | GNU)
- # IRIX, Linux, and HURD...
- if test $exec_prefix != /usr; then
-- DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
-- DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
-- DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
-- LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-- EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
-+ DSOFLAGS="$DSOFLAGS"
-+ DSO32FLAGS="$DSO32FLAGS"
-+ DSO64FLAGS="$DSO64FLAGS"
-+ LDFLAGS="$LDFLAGS"
-+ EXPORT_LDFLAGS=""
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure 2006-07-21 18:42:52.000000000 +0200
++++ cups-1.2/configure 2006-07-21 18:45:59.000000000 +0200
+@@ -7857,14 +7857,6 @@
fi
;;
+ IRIX | Linux | GNU)
+- # IRIX, Linux, and HURD...
+- if test $exec_prefix != /usr; then
+- DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+- DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS"
+- DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS"
+- LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+- EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
+- fi
+ ;;
esac
+ else
+diff -urNad cups-1.2~/configure.rej cups-1.2/configure.rej
+--- cups-1.2~/configure.rej 1970-01-01 01:00:00.000000000 +0100
++++ cups-1.2/configure.rej 2006-07-21 18:45:32.000000000 +0200
+@@ -0,0 +1,25 @@
++***************
++*** 7856,7866 ****
++ IRIX | Linux | GNU)
++ # IRIX, Linux, and HURD...
++ if test $exec_prefix != /usr; then
++- DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
++- DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
++- DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
++- LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
++- EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
++ fi
++ ;;
++ esac
++--- 7856,7866 ----
++ IRIX | Linux | GNU)
++ # IRIX, Linux, and HURD...
++ if test $exec_prefix != /usr; then
+++ DSOFLAGS="$DSOFLAGS"
+++ DSO32FLAGS="$DSO32FLAGS"
+++ DSO64FLAGS="$DSO64FLAGS"
+++ LDFLAGS="$LDFLAGS"
+++ EXPORT_LDFLAGS=""
++ fi
++ ;;
++ esac
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/03_clean.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/03_clean.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/03_clean.dpatch Fri Jul 21 16:50:08 2006
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.1.99.r5357~/Makefile cupsys-1.1.99.r5357/Makefile
---- cupsys-1.1.99.r5357~/Makefile 2006-03-20 19:06:50.000000000 +0000
-+++ cupsys-1.1.99.r5357/Makefile 2006-03-30 15:18:54.000000000 +0000
+diff -urNad cupsys-1.2.1~/Makefile cupsys-1.2.1/Makefile
+--- cupsys-1.2.1~/Makefile 2006-06-11 12:01:59.000000000 +0000
++++ cupsys-1.2.1/Makefile 2006-06-11 12:02:53.000000000 +0000
@@ -55,6 +55,7 @@
echo Cleaning in $$dir... ;\
(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
@@ -16,22 +16,24 @@
#
-diff -urNad cupsys-1.1.99.r5357~/doc/Makefile cupsys-1.1.99.r5357/doc/Makefile
---- cupsys-1.1.99.r5357~/doc/Makefile 2006-03-23 20:23:19.000000000 +0000
-+++ cupsys-1.1.99.r5357/doc/Makefile 2006-03-30 15:15:07.000000000 +0000
-@@ -187,6 +187,8 @@
+diff -urNad cupsys-1.2.1~/doc/Makefile cupsys-1.2.1/doc/Makefile
+--- cupsys-1.2.1~/doc/Makefile 2006-06-11 12:02:53.000000000 +0000
++++ cupsys-1.2.1/doc/Makefile 2006-06-11 12:03:09.000000000 +0000
+@@ -187,6 +187,10 @@
#
clean:
+ $(RM) doc/es/index.html
+ $(RM) doc/ja/index.html
++ $(RM) doc/pl/index.html
++ $(RM) doc/sv/index.html
#
-diff -urNad cupsys-1.1.99.r5357~/man/Makefile cupsys-1.1.99.r5357/man/Makefile
---- cupsys-1.1.99.r5357~/man/Makefile 2006-03-21 02:35:37.000000000 +0000
-+++ cupsys-1.1.99.r5357/man/Makefile 2006-03-30 15:17:26.000000000 +0000
-@@ -88,6 +88,7 @@
+diff -urNad cupsys-1.2.1~/man/Makefile cupsys-1.2.1/man/Makefile
+--- cupsys-1.2.1~/man/Makefile 2006-06-11 12:01:59.000000000 +0000
++++ cupsys-1.2.1/man/Makefile 2006-06-11 12:02:53.000000000 +0000
+@@ -90,6 +90,7 @@
for file in $(MAN8); do \
$(RM) ../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \
done
@@ -39,9 +41,9 @@
#
-diff -urNad cupsys-1.1.99.r5357~/templates/Makefile cupsys-1.1.99.r5357/templates/Makefile
---- cupsys-1.1.99.r5357~/templates/Makefile 2006-03-18 13:18:18.000000000 +0000
-+++ cupsys-1.1.99.r5357/templates/Makefile 2006-03-30 15:18:07.000000000 +0000
+diff -urNad cupsys-1.2.1~/templates/Makefile cupsys-1.2.1/templates/Makefile
+--- cupsys-1.2.1~/templates/Makefile 2006-06-11 12:02:53.000000000 +0000
++++ cupsys-1.2.1/templates/Makefile 2006-06-11 12:02:53.000000000 +0000
@@ -105,6 +105,7 @@
#
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch Fri Jul 21 16:50:08 2006
@@ -5,15 +5,15 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
---- cupsys-1.2.1~/configure 2006-05-28 13:12:28.000000000 +0000
-+++ cupsys-1.2.1/configure 2006-05-28 13:13:47.000000000 +0000
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure 2006-07-21 18:43:01.000000000 +0200
++++ cups-1.2/configure 2006-07-21 18:43:41.000000000 +0200
@@ -309,7 +309,7 @@
#endif"
ac_default_prefix=/
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -25,7 +25,7 @@
--enable-pdftops build pdftops filter, default=auto
Optional Packages:
-@@ -13147,6 +13148,26 @@
+@@ -13297,6 +13298,26 @@
_ACEOF
@@ -52,7 +52,7 @@
# Check whether --with-printcap or --without-printcap was given.
if test "${with_printcap+set}" = set; then
-@@ -14415,6 +14436,7 @@
+@@ -14584,6 +14605,7 @@
s, at CUPS_GROUP@,$CUPS_GROUP,;t t
s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch Fri Jul 21 16:50:08 2006
@@ -5,10 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.1.99.b1.r4929~/scheduler/cups-driverd.c cupsys-1.1.99.b1.r4929/scheduler/cups-driverd.c
---- cupsys-1.1.99.b1.r4929~/scheduler/cups-driverd.c 2005-10-25 20:23:10.000000000 +0200
-+++ cupsys-1.1.99.b1.r4929/scheduler/cups-driverd.c 2006-04-07 15:43:44.000000000 +0200
-@@ -289,10 +289,7 @@
+diff -urNad cupsys-1.2.1~/scheduler/cups-driverd.c cupsys-1.2.1/scheduler/cups-driverd.c
+--- cupsys-1.2.1~/scheduler/cups-driverd.c 2006-04-18 15:16:00.000000000 +0000
++++ cupsys-1.2.1/scheduler/cups-driverd.c 2006-06-18 07:13:15.000000000 +0000
+@@ -302,10 +302,7 @@
* Try opening the file...
*/
@@ -16,11 +16,11 @@
- datadir = CUPS_DATADIR;
-
- snprintf(line, sizeof(line), "%s/model/%s", datadir, name);
-+ snprintf(line, sizeof(line), "/usr/share/ppd/%s", datadir, name);
++ snprintf(line, sizeof(line), "/usr/share/ppd/%s", name);
if ((fp = cupsFileOpen(line, "r")) == NULL)
{
fprintf(stderr, "ERROR: [cups-driverd] Unable to open \"%s\" - %s\n",
-@@ -443,11 +440,7 @@
+@@ -459,11 +456,7 @@
SortedPPDs = NumPPDs;
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 Fri Jul 21 16:50:08 2006
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: cupsys\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2005-12-17 16:00+0100\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Chcete spustit server kompatibilnàs BSD lpd?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -45,13 +45,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Chcete, aby CUPS tisknul neznámé úlohy jako typ \"raw\"?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -67,7 +67,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -79,7 +79,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -93,62 +93,68 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "paralelnÃ"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "sériový"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "OvladaÄe pro komunikaci s tiskárnou:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
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."
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -158,7 +164,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -166,94 +172,62 @@
"Vyberte ovladaÄ, který má CUPS použÃt. Implicitnà volba se hodà do vÄ›tÅ¡iny "
"běžných prostÅ™edÃ."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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:"
+#~ 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:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"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:"
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "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:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
#, 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 ""
-" - ÄŒÃslo portu (631);\n"
-" - Jméno poÄÃtaÄe (debian.priklad.cz);\n"
-" - PoÄÃtaÄ:Port (debian.priklad.cz:631)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr "Můžete jich zadat libovolný poÄet, staÄà je oddÄ›lit mezerami."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-"Výchozà port 631 je rezervovaný právě pro Internet Printing Protocol (IPP). "
-"Pro samostatný poÄÃtaÄ se z bezpeÄnostnÃch důvodů doporuÄuje nastavenà "
-"\"localhost:631\"."
+#~ 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 ""
+#~ " - ÄŒÃslo portu (631);\n"
+#~ " - Jméno poÄÃtaÄe (debian.priklad.cz);\n"
+#~ " - PoÄÃtaÄ:Port (debian.priklad.cz:631)."
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr "Můžete jich zadat libovolný poÄet, staÄà je oddÄ›lit mezerami."
+
+#~ 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 ""
+#~ "Výchozà port 631 je rezervovaný právě pro Internet Printing Protocol "
+#~ "(IPP). Pro samostatný poÄÃtaÄ se z bezpeÄnostnÃch důvodů doporuÄuje "
+#~ "nastavenà \"localhost:631\"."
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr "VysÃlat a/nebo poslouchat na sÃti informace o CUPS tiskárnách?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "Daemon CUPS může do sÃtÄ› vysÃlat své informace o tiskárnách a také umà na "
+#~ "sÃti zjiÅ¡Å¥ovat tiskárny nové."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "PovolÃte-li tuto volbu, daemon CUPS bude periodicky vysÃlat celoploÅ¡né "
+#~ "UDP dotazy, kterými bude zjišťovat nové tiskárny."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "VysÃlat a/nebo poslouchat na sÃti informace o CUPS tiskárnách?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"Daemon CUPS může do sÃtÄ› vysÃlat své informace o tiskárnách a také umà na "
-"sÃti zjiÅ¡Å¥ovat tiskárny nové."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"PovolÃte-li tuto volbu, daemon CUPS bude periodicky vysÃlat celoploÅ¡né UDP "
-"dotazy, kterými bude zjišťovat nové tiskárny."
+#~ msgid "Incorrect value entered"
+#~ msgstr "Zadána chybná hodnota"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Zadána chybná hodnota"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "PÅ™i zpracovávánà ÄÃsla portu nebo názvu poÄÃtaÄe se vyskytla chyba."
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "PÅ™i zpracovávánà ÄÃsla portu nebo názvu poÄÃtaÄe se vyskytla chyba."
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Opravte prosÃm svou odpovÄ›Ä."
+#~ msgid "Please correct your input."
+#~ msgstr "Opravte prosÃm svou odpovÄ›Ä."
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 Fri Jul 21 16:50:08 2006
@@ -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-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+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"
@@ -20,13 +20,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Ønsker du at sætte BSD lpd-kompatibilitetsserveren op?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -41,13 +41,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Ønsker du at CUPS skal udskrive ukendte jobs som rå jobs?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -63,7 +63,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -75,7 +75,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -89,63 +89,70 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "seriel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "sokkel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Printer-kommunikationsveje:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
-msgid "CUPS uses backend programs for communication with printer device or port."
+#: ../cupsys.templates:2010
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
msgstr ""
"CUPS bruger bagvedliggende programmer til at kommunikere med printerenheden "
"eller -porten."
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -155,7 +162,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -163,101 +170,68 @@
"Vælg det bagvedliggende program, CUPS skal bruge. Det forvalgte burde være "
"passende under de mest almindelige forhold."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater er "
-"gyldige:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-" - Port number (631);\n"
-" - Host name (debian.example.com);\n"
-" - Host:Port (debian.example.com:631);\n"
-" - File domain socket (/var/run/cups/cups.sock)."
-msgstr ""
-" - Portnummer (631);\n"
-" - værtsnavn (debian.eksempel.dk);\n"
-" - Vært:Port (debian.eksempel.dk:631);\n"
-" - Fildomænesokkel (/var/run/cups/cups.sock)."
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater "
+#~ "er gyldige:"
+
+#~ msgid ""
+#~ " - Port number (631);\n"
+#~ " - Host name (debian.example.com);\n"
+#~ " - Host:Port (debian.example.com:631);\n"
+#~ " - File domain socket (/var/run/cups/cups.sock)."
+#~ msgstr ""
+#~ " - Portnummer (631);\n"
+#~ " - værtsnavn (debian.eksempel.dk);\n"
+#~ " - Vært:Port (debian.eksempel.dk:631);\n"
+#~ " - Fildomænesokkel (/var/run/cups/cups.sock)."
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
+
+#~ msgid ""
+#~ "The default port 631 is reserved for the Internet Printing Protocol "
+#~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
+#~ "for security reasons."
+#~ msgstr ""
+#~ "Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
+#~ "\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et "
+#~ "selvstændigt miljø op."
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket "
+#~ "og detektere printere på netværket automatisk."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
+#~ "rundsendinger for at detektere printere."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
+#~ msgid "Incorrect value entered"
+#~ msgstr "Ugyldig værdi indtastet"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to setup a standalone environment for "
-"security reasons."
-msgstr ""
-"Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
-"\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et selvstændigt "
-"miljø op."
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket og "
-"detektere printere på netværket automatisk."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
-"rundsendinger for at detektere printere."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Ugyldig værdi indtastet"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Ret venligst din indtastning."
+#~ msgid "Please correct your input."
+#~ msgstr "Ret venligst din indtastning."
#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
#~ msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
#~ msgid "Select the backends you want."
#~ msgstr "Vælg det bagvedliggende program, du ønsker."
-
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/de.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/de.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/de.po Fri Jul 21 16:50:08 2006
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\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"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -27,13 +27,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -48,13 +48,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -83,7 +83,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -97,62 +97,68 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "serial"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Backends für die Kommunikation mit dem Drucker:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr "CUPS verwendet Backend-Programme zur Kommunikation mit dem Drucker."
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -162,7 +168,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -171,100 +177,68 @@
"Die Voreinstellung sollte normalerweise den meisten Umgebungen gerecht "
"werden."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Port oder/und Host-Name auf dem CUPS lauschen soll:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Port oder/und Host-Name auf dem CUPS lauschen soll:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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:"
+#~ 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:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
#, 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 ""
+#~ " - 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."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-"CUPS-Drucker-Informationen im Netzwerk aussenden und/oder diese empfangen?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Sie haben einen falschen Wert eingegeben"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-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."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Bitte korrigieren Sie Ihre Eingabe."
+#~ msgid "Please correct your input."
+#~ msgstr "Bitte korrigieren Sie Ihre Eingabe."
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 Fri Jul 21 16:50:08 2006
@@ -22,7 +22,7 @@
msgstr ""
"Project-Id-Version: cupsys 1.1.20final-15\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2004-02-28 16:35+0100\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."
@@ -33,13 +33,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "¿Desea configurar el servidor de compatibilidad lpd de BSD?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -54,13 +54,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "¿Quiere que CUPS imprima en bruto los trabajos desconocidos?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -76,7 +76,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -88,7 +88,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -102,62 +102,68 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr ""
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -165,87 +171,8 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr ""
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 Fri Jul 21 16:50:08 2006
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2006-06-07 11:50+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -28,13 +28,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 ?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -49,13 +49,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 ?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -73,7 +73,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -84,7 +84,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -99,55 +99,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "IPP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallèle"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "SCSI"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "série"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "USB"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "SNMP"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Mode de communication avec les imprimantes :"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -156,7 +162,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -167,104 +173,74 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
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."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Port ou nom d'hôte où CUPS sera à l'écoute :"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Port ou nom d'hôte où CUPS sera à l'écoute :"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
+#~ "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."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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 ?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Valeur saisie incorrecte"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-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."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Veuillez corriger votre saisie."
+#~ msgid "Please correct your input."
+#~ msgstr "Veuillez corriger votre saisie."
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 Fri Jul 21 16:50:08 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: cupsys\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2006-04-07 15:38+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
"Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -38,14 +38,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"¿Quere que CUPS imprima os traballos descoñecidos coma traballos en cru?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -73,7 +73,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -88,55 +88,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "paralelo"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "serie"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Sistemas de comunicación coa impresora:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -145,7 +151,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -155,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -163,94 +169,63 @@
"Escolla o programa que debe empregar CUPS. A opción por defecto deberÃa "
"axustarse aos ambientes máis habituais."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Porto e/ou nome de servidor no que CUPS ha escoitar:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Porto e/ou nome de servidor no que CUPS ha escoitar:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Especifique o porto ou nome de servidor no que ha escoitar o servizo de "
-"CUPS. AdmÃtense os seguintes formatos:"
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Especifique o porto ou nome de servidor no que ha escoitar o servizo de "
+#~ "CUPS. AdmÃtense os seguintes formatos:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
#, 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 ""
-" - Número de porto (631);\n"
-" - Nome de servidor (debian.exemplo.com);\n"
-" - Servidor:Porto (debian.exemplo.com:631)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr "Pode combinalos facendo unha lista de elementos separados por comas."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-"O porto por defecto, 631, está reservado para o Protocolo de Impresión de "
-"Internet (IPP). Recoméndase que empregue \"localhost:631\" para crear un "
-"sistema aillado por motivos de seguridade."
+#~ 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 ""
+#~ " - Número de porto (631);\n"
+#~ " - Nome de servidor (debian.exemplo.com);\n"
+#~ " - Servidor:Porto (debian.exemplo.com:631)."
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr ""
+#~ "Pode combinalos facendo unha lista de elementos separados por comas."
+
+#~ 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 ""
+#~ "O porto por defecto, 631, está reservado para o Protocolo de Impresión de "
+#~ "Internet (IPP). Recoméndase que empregue \"localhost:631\" para crear un "
+#~ "sistema aillado por motivos de seguridade."
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr "¿Emitir e/ou escoitar información de impresoras de CUPS na rede?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "O servizo CUPS pode emitir información de impresoras para os clientes da "
+#~ "rede, e pode detectar automaticamente as impresoras da rede."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "Se escolle esta opción, o servizo CUPS ha enviar paquetes \"broadcast\" "
+#~ "UDP para detectar as impresoras."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "¿Emitir e/ou escoitar información de impresoras de CUPS na rede?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"O servizo CUPS pode emitir información de impresoras para os clientes da "
-"rede, e pode detectar automaticamente as impresoras da rede."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"Se escolle esta opción, o servizo CUPS ha enviar paquetes \"broadcast\" UDP "
-"para detectar as impresoras."
+#~ msgid "Incorrect value entered"
+#~ msgstr "Introduciuse un valor incorrecto"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Introduciuse un valor incorrecto"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "houbo un erro ao analizar o número de porto ou o nome do servidor."
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "houbo un erro ao analizar o número de porto ou o nome do servidor."
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Corrixa o que introduciu."
+#~ msgid "Please correct your input."
+#~ msgstr "Corrixa o que introduciu."
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 Fri Jul 21 16:50:08 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: cupsys 1.1.23 italian debconf templates\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2006-06-11 17:44+0200\n"
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Si vuole configurare il server di compatibilità con lpd di BSD?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -38,13 +38,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Si vuole che CUPS stampi i job sconosciuti come job \"raw\"?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -73,7 +73,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -87,55 +87,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallela"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "seriale"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Backend di comunicazione con la stampante:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -144,7 +150,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -155,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -163,97 +169,65 @@
"Scegliere quale programma di backend deve usare CUPS. La scelta predefinita "
"dovrebbe essere adatta per la maggioranza dei casi."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Porta e/o nome host su cui CUPS sarà in ascolto:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Porta e/o nome host su cui CUPS sarà in ascolto:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
+#~ "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."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "Diffondere e/o ascoltare informazioni sulle stampanti CUPS in rete?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Inserito un valore non corretto"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-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."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Correggere il valore inserito."
+#~ 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 Fri Jul 21 16:50:08 2006
@@ -15,7 +15,7 @@
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-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2005-12-17 13:24+0900\n"
"Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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:4
+#: ../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 "
@@ -46,13 +46,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "未知ã®ã‚¸ãƒ§ãƒ–を生データ (raw) ジョブã¨ã—㦠CUPS ã«å°åˆ·ã•ã›ã¾ã™ã‹?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -68,7 +68,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -79,7 +79,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -93,55 +93,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "IPP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "LPD"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "パラレル"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "SCSI"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "シリアル"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "ソケット"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "USB"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "SNMP"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "プリンタ通信ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -150,7 +156,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -160,7 +166,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -168,98 +174,67 @@
"CUPS ã§åˆ©ç”¨ã—ãŸã„ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’é¸æŠžã—ã¦ãã ã•ã„。デフォルトã®é¸æŠžã¯"
"ãŸã„ã¦ã„ã®ä¸€èˆ¬çš„ãªç’°å¢ƒã«åˆã£ã¦ã„ã¾ã™ã€‚"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "CUPS ãŒç›£è¦–ã™ã‚‹ãƒãƒ¼ãƒˆã¾ãŸã¯ãƒ›ã‚¹ãƒˆå:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "CUPS ãŒç›£è¦–ã™ã‚‹ãƒãƒ¼ãƒˆã¾ãŸã¯ãƒ›ã‚¹ãƒˆå:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"CUPS デーモンã«ç›£è¦–ã•ã›ã‚‹ãƒãƒ¼ãƒˆã¾ãŸã¯ãƒ›ã‚¹ãƒˆåを指定ã—ã¦ãã ã•ã„。次ã®ã‚ˆã†ãªæ›¸"
-"å¼ã‚’利用ã§ãã¾ã™:"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "CUPS デーモンã«ç›£è¦–ã•ã›ã‚‹ãƒãƒ¼ãƒˆã¾ãŸã¯ãƒ›ã‚¹ãƒˆåを指定ã—ã¦ãã ã•ã„。次ã®ã‚ˆã†"
+#~ "ãªæ›¸å¼ã‚’利用ã§ãã¾ã™:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr "スペースã§åŒºåˆ‡ã£ãŸãƒªã‚¹ãƒˆã§ã“れらを組ã¿åˆã‚ã›ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚"
+#~ 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)。"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr "スペースã§åŒºåˆ‡ã£ãŸãƒªã‚¹ãƒˆã§ã“れらを組ã¿åˆã‚ã›ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚"
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸Šã® CUPS ãƒ—ãƒªãƒ³ã‚¿æƒ…å ±ã®ãƒ–ãƒãƒ¼ãƒ‰ã‚ャストãŠã‚ˆã³ç›£è¦–ã‚’è¡Œã„ã¾ã™ã‹?"
+#~ 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 ãƒ—ãƒªãƒ³ã‚¿æƒ…å ±ã®ãƒ–ãƒãƒ¼ãƒ‰ã‚ャストãŠã‚ˆã³ç›£è¦–ã‚’è¡Œã„ã¾ã™"
+#~ "ã‹?"
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"CUPS デーモンã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸Šã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«ãƒ—ãƒªãƒ³ã‚¿æƒ…å ±ã‚’ãƒ–ãƒãƒ¼ãƒ‰ã‚ャストã—"
-"ãŸã‚Šã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸Šã®ãƒ—リンタを自動的ã«æ¤œå‡ºã—ãŸã‚Šã§ãã¾ã™ã€‚"
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "CUPS デーモンã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸Šã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«ãƒ—ãƒªãƒ³ã‚¿æƒ…å ±ã‚’ãƒ–ãƒãƒ¼ãƒ‰ã‚ャス"
+#~ "トã—ãŸã‚Šã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸Šã®ãƒ—リンタを自動的ã«æ¤œå‡ºã—ãŸã‚Šã§ãã¾ã™ã€‚"
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"ã“ã®é¸æŠžè‚¢ã‚’é¸ã¶ã¨ã€CUPS デーモンã¯ãƒ—リンタを検出ã™ã‚‹ãŸã‚ã« UDP ブãƒãƒ¼ãƒ‰ã‚ャ"
-"ストを定期的ã«é€ã‚Šã¾ã™ã€‚"
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "ã“ã®é¸æŠžè‚¢ã‚’é¸ã¶ã¨ã€CUPS デーモンã¯ãƒ—リンタを検出ã™ã‚‹ãŸã‚ã« UDP ブãƒãƒ¼ãƒ‰"
+#~ "ã‚ャストを定期的ã«é€ã‚Šã¾ã™ã€‚"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "ä¸æ£ãªå€¤ãŒå…¥åŠ›ã•ã‚Œã¾ã—ãŸ"
+#~ msgid "Incorrect value entered"
+#~ msgstr "ä¸æ£ãªå€¤ãŒå…¥åŠ›ã•ã‚Œã¾ã—ãŸ"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "ãƒãƒ¼ãƒˆç•ªå·ã¾ãŸã¯ãƒ›ã‚¹ãƒˆåã®è§£é‡ˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "ãƒãƒ¼ãƒˆç•ªå·ã¾ãŸã¯ãƒ›ã‚¹ãƒˆåã®è§£é‡ˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "入力値を修æ£ã—ã¦ãã ã•ã„。"
+#~ msgid "Please correct your input."
+#~ msgstr "入力値を修æ£ã—ã¦ãã ã•ã„。"
#~ msgid "Admin password:"
#~ msgstr "管ç†è€…パスワード:"
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 Fri Jul 21 16:50:08 2006
@@ -15,7 +15,7 @@
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-03-29 14:05+0000\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"
"Language-Team: Debian Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -25,14 +25,14 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr ""
"Wilt u de server die zorgt voor compatibiliteit met de BSD-lpd instellen?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -47,13 +47,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Wilt u dat CUPS onbekende opdrachten onbewerkt naar de printer stuurt?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -70,7 +70,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -83,7 +83,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -97,55 +97,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "serieel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Backends voor printercommunicatie:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -154,7 +160,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -164,7 +170,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -172,100 +178,69 @@
"Kies een backend-programma dat door CUPS moet worden gebruikt. De "
"standaardkeuze zou voor de meest voorkomende omgevingen moeten voldoen."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Poort en/of domeinnaam waarnaar CUPS moet luisteren:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Poort en/of domeinnaam waarnaar CUPS moet luisteren:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Gelieve de poort of domeinnaam te specificeren waarnaar de CUPS-"
-"achtergronddienst moet luisteren. Volgende formaten zijn toegestaan:"
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Gelieve de poort of domeinnaam te specificeren waarnaar de CUPS-"
+#~ "achtergronddienst moet luisteren. Volgende formaten zijn toegestaan:"
+
+#~ 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 ""
+#~ " - Poortnummer (631);\n"
+#~ " - Domeinnaam (debian.example.com);\n"
+#~ " - Domeinnaam:Poort (debian.example.com:631)."
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr ""
+#~ "U kunt om het even welk hiervan combineren door deze met een spatie te "
+#~ "scheiden."
+
+#~ 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 ""
+#~ "Standaardpoort 631 is gereserveerd voor het Internet Printing Protocol "
+#~ "(IPP). Om veiligheidsredenen is \"localhost:631\" aangewezen om in een "
+#~ "afzonderlijke omgeving te installeren."
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr ""
+#~ "Uitzenden en/of luisteren naar CUPS-printerinformatie op het netwerk?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "De CUPS-achtergronddienst kan voor clients op het netwerk automatisch, "
+#~ "printerinformatie uitzenden en printers detecteren."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "Indien u deze optie kiest, zal de CUPS-achtergronddienst periodiek UDP-"
+#~ "uitzendingen verzenden om printers te detecteren."
+
+#~ msgid "Incorrect value entered"
+#~ msgstr "Ongeldige waarde ingevoerd"
+
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr ""
+#~ "Er is een fout voorgekomen tijdens het inlezen van het poortnummer of de "
+#~ "domeinnaam"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-" - Poortnummer (631);\n"
-" - Domeinnaam (debian.example.com);\n"
-" - Domeinnaam:Poort (debian.example.com:631)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-"U kunt om het even welk hiervan combineren door deze met een spatie te "
-"scheiden."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-"Standaardpoort 631 is gereserveerd voor het Internet Printing Protocol "
-"(IPP). Om veiligheidsredenen is \"localhost:631\" aangewezen om in een "
-"afzonderlijke omgeving te installeren."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "Uitzenden en/of luisteren naar CUPS-printerinformatie op het netwerk?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"De CUPS-achtergronddienst kan voor clients op het netwerk automatisch, "
-"printerinformatie uitzenden en printers detecteren."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"Indien u deze optie kiest, zal de CUPS-achtergronddienst periodiek UDP-"
-"uitzendingen verzenden om printers te detecteren."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Ongeldige waarde ingevoerd"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr ""
-"Er is een fout voorgekomen tijdens het inlezen van het poortnummer of de "
-"domeinnaam"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "U dient uw ingevoerde gegevens te verbeteren."
+#~ msgid "Please correct your input."
+#~ msgstr "U dient uw ingevoerde gegevens te verbeteren."
#~ msgid "Select the backends you want."
#~ msgstr "Selecteer de backends die u wilt."
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 Fri Jul 21 16:50:08 2006
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: cupsys\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2004-08-06 22:07-0300\n"
"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Você quer configurar o servidor de compatibilidade lpd BSD ?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -46,13 +46,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Você deseja que o CUPS imprima jobs desconhecidos como jobs raw ?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -69,7 +69,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -81,7 +81,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -96,55 +96,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr ""
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -153,7 +159,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -163,7 +169,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -171,85 +177,6 @@
"Por favor, selecione o programa backend a ser usado pelo CUPS. A escolha "
"padrão deve se encaixar na maiorias dos ambientes."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr ""
-
#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
#~ msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
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 Fri Jul 21 16:50:08 2006
@@ -18,7 +18,7 @@
msgstr ""
"Project-Id-Version: cupsys_1.1.23-12_ru.po\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\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"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -29,13 +29,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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:4
+#: ../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 "
@@ -50,14 +50,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"Хотите чтобы CUPS печатал неизвеÑтные Ð·Ð°Ð´Ð°Ð½Ð¸Ñ ÐºÐ°Ðº необработанные заданиÑ?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -74,7 +74,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -86,7 +86,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -100,55 +100,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "serial"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "ИнтерфейÑные программы Ð´Ð»Ñ ÑвÑзи Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð¼:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -157,7 +163,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -167,7 +173,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -175,95 +181,64 @@
"Выберите интерфейÑные программу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ иÑпользоватьÑÑ CUPS. Выбор по "
"умолчанию должен работать Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½Ñтвом оборудованиÑ."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr ""
-"Порт или/и Ð¸Ð¼Ñ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ через который будет оÑущеÑтвлÑÑ‚ÑŒÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ к CUPS:"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-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. "
+#~ "ДопуÑтимы Ñледующие форматы:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
#, 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 ""
-" - Ðомер порта (631);\n"
-" - Ð˜Ð¼Ñ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ (debian.example.com);\n"
-" - Машина:Порт (debian.example.com:631)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr "Можно иÑпользовать неÑколько любых типов, разделÑÑ Ð¸Ñ… пробелом."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
+#~ " - 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)."
+
+#~ 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 пакеты Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð²."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "ÐнонÑировать и/или Ñлушать CUPS информацию о принтере в Ñети?"
+#~ msgid "Incorrect value entered"
+#~ msgstr "Введено недопуÑтимое значение"
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"Демон CUPS может анонÑировать информацию о принтере Ð´Ð»Ñ Ñетевых клиентов, и "
-"обнаруживать другие принтеры в Ñети автоматичеÑки."
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "при разборе номера порта или имени машины произошла ошибка."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"При выборе Ñтого параметра демон CUPS будет периодичеÑки поÑылать "
-"широковещательные UDP пакеты Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð²."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Введено недопуÑтимое значение"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "при разборе номера порта или имени машины произошла ошибка."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "ПожалуйÑта иÑправьте вводимые данные."
+#~ msgid "Please correct your input."
+#~ 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 Fri Jul 21 16:50:08 2006
@@ -15,7 +15,7 @@
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-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2005-12-17 08:14+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Vill du konfigurera den BSD-kompatibla lpd-servern?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -46,13 +46,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -68,7 +68,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -80,7 +80,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -94,55 +94,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "parallell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "seriell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr "Baksystem för skrivarkommunikation:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -151,7 +157,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -161,7 +167,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -169,99 +175,67 @@
"Vänligen välj det baksystemprogram som ska användas av CUPS. Det förvalda "
"valet bör passa den flesta vanliga miljöer."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Port och/eller värdnamn som CUPS lyssnar på:"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Port och/eller värdnamn som CUPS lyssnar på:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Vänligen ange porten eller värdnamnet som CUPS-demonen ska lyssna på. "
-"Följande format är tillåtna:"
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Vänligen ange porten eller värdnamnet som CUPS-demonen ska lyssna på. "
+#~ "Följande format är tillåtna:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
#, 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 ""
-" - Portnummer (631);\n"
-" - Värdnamn (debian.exempel.se);\n"
-" - Värd:Port (debian.exempel.se:631)."
+#~ msgid ""
+#~ " - Port number (631);\n"
+#~ " - Host name (debian.example.com);\n"
+#~ " - Host:Port (debian.example.com:631);\n"
+#~ " - File domain socket (/var/run/cups/cups.sock)."
+#~ msgstr ""
+#~ " - Portnummer (631);\n"
+#~ " - Värdnamn (debian.exempel.se);\n"
+#~ " - Värd:Port (debian.exempel.se:631)."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
+#~ "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."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-"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 ""
+#~ "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 ""
+#~ "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."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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 "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?"
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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 ""
+#~ "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."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-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 ""
+#~ "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."
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Felaktigt värde angivet"
+#~ msgid "Incorrect value entered"
+#~ msgstr "Felaktigt värde angivet"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-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 "an error occurred while parsing the port number or the host name."
+#~ msgstr "ett fel inträffade vid tolkning av portnumret eller värdnamnet."
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Vänligen rätt till det."
+#~ 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"
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 Fri Jul 21 16:50:08 2006
@@ -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-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr ""
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -34,13 +34,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -51,7 +51,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -60,7 +60,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -70,62 +70,68 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr ""
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr ""
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -133,87 +139,8 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr ""
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 Fri Jul 21 16:50:08 2006
@@ -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-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2004-04-25 10:34+0300\n"
"Last-Translator: Gürkan Aslan <gurkan at iaslan.com>\n"
"Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "BSD lpd uyumlu sunucuyu ayarlamak ister misiniz?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -38,13 +38,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "CUPS'ın bilinmeyen ham (raw) görevleri yazdırmasını istiyor musunuz?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -73,7 +73,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -87,55 +87,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr ""
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
msgid "Printer communication backends:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -144,7 +150,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -154,7 +160,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -162,85 +168,6 @@
"Lütfen CUPS tarafından kullanılacak arkayüz programını seçin. Öntanımlı "
"seçim çoğu ortam için uygundur."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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 ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr ""
-
#~ 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 Fri Jul 21 16:50:08 2006
@@ -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-03-29 14:05+0000\n"
+"POT-Creation-Date: 2006-07-03 22:26+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"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Bạn có muốn thiết láºp trình phục vụ tÆ°Æ¡ng thÃch vá»›i lpd BSD không?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../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 "
@@ -38,13 +38,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Bạn có muốn CUPS in má»i việc in lạ nhÆ° là việc thô không?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -60,7 +60,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -72,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../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 "
@@ -86,55 +86,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2002
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2003
msgid "parallel"
msgstr "song song"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2004
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2005
msgid "serial"
msgstr "nối tiếp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2006
msgid "socket"
msgstr "ổ cắm"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2007
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2008
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2009
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:24
+#: ../cupsys.templates:2010
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -142,7 +148,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -152,7 +158,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -160,98 +166,67 @@
"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."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-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:"
+#~ 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:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Hãy gõ cổng hay tên máy trên mà trình ná»n CUPS sẽ lắng nghe. Cho phép những "
-"khuôn dạng theo đây:"
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Hãy gõ cổng hay tên máy trên mà trình ná»n CUPS sẽ lắng nghe. Cho phép "
+#~ "những khuôn dạng theo đây:"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
#, 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 ""
-" • sổ cổng (v.d. 631)\n"
-" • tên máy (v.d. vi_du.vnoss.org)\n"
-" • máy:cổng (v.d. vi_du.vnoss.org:631)"
+#~ 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 ""
+#~ " • sổ cổng (v.d. 631)\n"
+#~ " • tên máy (v.d. vi_du.vnoss.org)\n"
+#~ " • máy:cổng (v.d. vi_du.vnoss.org:631)"
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr ""
+#~ "Bạn có thể kết hợp và i khuôn dạng phân cách bởi khoảng trắng trong danh "
+#~ "sách."
+
+#~ msgid ""
+#~ "The default port 631 is reserved for the Internet Printing Protocol "
+#~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
+#~ "for security reasons."
+#~ msgstr ""
+#~ "Cổng mặc định 631 dà nh cho Giao thức In Mạng (Internet Printing Protocol: "
+#~ "IPP). Khuyên bạn dùng « localhost:631 » để thiết láºp môi trÆ°á»ng Ä‘á»™c láºp "
+#~ "vì lý do bảo máºt. "
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr "Phát thanh và /hay lắng nghe thông tin máy in CUPS trên mạng không?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "Trình ná»n CUPS có thể phát thanh thông tin vá» máy in cho trình khách trên "
+#~ "mạng nghe, và tự động phát hiện máy in nà o trên mạng."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "Nếu bạn láºp tùy chá»n nà y, trình ná»n CUPS sẽ gởi định kỳ việc phát thanh "
+#~ "UDP để phát hiện máy in."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-"Bạn có thể kết hợp và i khuôn dạng phân cách bởi khoảng trắng trong danh sách."
+#~ msgid "Incorrect value entered"
+#~ msgstr "Gõ sai giá trị"
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to setup a standalone environment for "
-"security reasons."
-msgstr ""
-"Cổng mặc định 631 dà nh cho Giao thức In Mạng (Internet Printing Protocol: "
-"IPP). Khuyên bạn dùng « localhost:631 » để thiết láºp môi trÆ°á»ng Ä‘á»™c láºp vì "
-"lý do bảo máºt. "
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr "gặp lỗi khi phân tách số cổng hay tên máy."
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr "Phát thanh và /hay lắng nghe thông tin máy in CUPS trên mạng không?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"Trình ná»n CUPS có thể phát thanh thông tin vá» máy in cho trình khách trên "
-"mạng nghe, và tự động phát hiện máy in nà o trên mạng."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"Nếu bạn láºp tùy chá»n nà y, trình ná»n CUPS sẽ gởi định kỳ việc phát thanh UDP "
-"để phát hiện máy in."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Gõ sai giá trị"
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr "gặp lỗi khi phân tách số cổng hay tên máy."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Hãy sá»a dữ liệu gõ."
+#~ msgid "Please correct your input."
+#~ msgstr "Hãy sá»a dữ liệu gõ."
#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
#~ msgstr "ipp, lpd, song song, scsi, nối tiếp, ổ cắm, usb"
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 Fri Jul 21 16:50:08 2006
@@ -20,6 +20,7 @@
DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --disable-pdftops --disable-launchd --with-cups-user=cupsys --with-cups-group=lp --with-system-groups=lpadmin --enable-privilege-dropping
DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
+DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
DEB_DH_INSTALLINIT_ARGS := -u'multiuser 19'
clean::
@@ -67,6 +68,8 @@
# Compatibility for programs which still look in the old location
ln -s ../../ppd/cups-included $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/cups-included
+ ln -s ../cups/model $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-transitional-dir
+
ln -s ../../ppd/custom $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/custom
binary-post-install/libcupsimage2-dev::
More information about the Pkg-cups-devel
mailing list