[Pkg-cups-devel] r76 - in cupsys/branches/cups-1.2/debian: . po

[Kenshi Muto]

Author: kmuto
Date: Sat Dec 17 04:25:58 2005
New Revision: 76

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.templates
   cupsys/branches/cups-1.2/debian/po/cs.po
   cupsys/branches/cups-1.2/debian/po/da.po
   cupsys/branches/cups-1.2/debian/po/de.po
   cupsys/branches/cups-1.2/debian/po/es.po
   cupsys/branches/cups-1.2/debian/po/fr.po
   cupsys/branches/cups-1.2/debian/po/ja.po
   cupsys/branches/cups-1.2/debian/po/nl.po
   cupsys/branches/cups-1.2/debian/po/pt_BR.po
   cupsys/branches/cups-1.2/debian/po/ru.po
   cupsys/branches/cups-1.2/debian/po/sv.po
   cupsys/branches/cups-1.2/debian/po/templates.pot
   cupsys/branches/cups-1.2/debian/po/tr.po
   cupsys/branches/cups-1.2/debian/po/vi.po
Log:
improve cupsys.templates

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sat Dec 17 04:25:58 2005
@@ -11,6 +11,7 @@
   * Set seen false flag when ports configuration is failed.
   * Allow '*' for hostname in ports.conf.
   * Use /bin/echo instead of shell built-in echo.
+  * Improve cupsys.templates.
 
  -- Kenshi Muto <kmuto at debian.org>  Thu, 15 Dec 2005 07:15:54 +0900
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.templates
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.templates	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.templates	Sat Dec 17 04:25:58 2005
@@ -19,9 +19,9 @@
 
 Template: cupsys/backend
 Type: multiselect
-_Choices: ipp, lpd, parallel, scsi, serial, socket, usb
+__Choices: ipp, lpd, parallel, scsi, serial, socket, usb
 Default: ipp, lpd, parallel, socket, usb
-_Description: Select the backends you want.
+_Description: Printer communication backends:
  CUPS uses backend programs for communication with printer device or port.
  .
  Unfortunately, some backend programs cause some trouble.
@@ -33,40 +33,37 @@
 Template: cupsys/ports
 Type: string
 Default: localhost:631 /var/run/cups/cups.sock
-_Description: Specify the port or/and host name that wants to be listened.
- Please specify the port or the host name CUPS daemon listens.
- You can use following formats.
+_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).
  .
- - Port number (631)
- .
- - Host name   (debian.example.com)
- .
- - Host:Port   (debian.example.com:631)
- .
- - File domain socket (/var/run/cups/cups.sock)
- .
- It is possible to combine by delimiting two or more values in space.
+ 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 the standalone environment by security
- reason.
+ "localhost:631" is recommended to setup a standalone environment for security
+ reasons.
 
 Template: cupsys/browse
 Type: boolean
 Default: true
-_Description: Do you want to broadcast and/or listen for CUPS printer information on the network?
+_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.
  .
- When this option is accepted, CUPS daemon will broadcast and detect by
- using UDP periodically.
+ If you choose this option, the CUPS daemon will periodically send UDP
+ broadcasts to detect printers.
 
 Template: cupsys/portserror
 Type: note
-_Description: The wrong value is found in the input.
- The error occurred while parsing the port number or the host name.
+_Description: Incorrect value entered
+ an error occurred while parsing the port number or the host name.
  .
- Please correct it.
+ Please correct your input.
 
 Template: cupsys/adminpassword
 Type: password

Modified: cupsys/branches/cups-1.2/debian/po/cs.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/cs.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/cs.po	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2004-07-22 18:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <provoz at debian.cz>\n"
@@ -94,14 +94,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, paralelní, scsi, sériový, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Vyberte po¾adovaný ovladaè."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -133,45 +169,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -179,21 +201,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -201,44 +221,50 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, paralelní, scsi, sériový, socket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Vyberte po¾adovaný ovladaè."

Modified: cupsys/branches/cups-1.2/debian/po/da.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/da.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/da.po	Sat Dec 17 04:25:58 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2004-03-26 10:44+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -89,14 +89,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Vælg det bagvedliggende program, du ønsker."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -130,45 +166,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -176,21 +198,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -198,44 +218,50 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ 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/debian/po/de.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/de.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/de.po	Sat Dec 17 04:25:58 2005
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: cupsys_1.1.20final+rc1-7_de\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2004-10-04 10:56+0200\n"
 "Last-Translator: Jens Nachtigall <nachtigall at web.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -97,14 +97,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Wählen Sie das Backend."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -137,45 +173,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -183,21 +205,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -205,44 +225,50 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Wählen Sie das Backend."

Modified: cupsys/branches/cups-1.2/debian/po/es.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/es.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/es.po	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+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."
@@ -103,13 +103,49 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
+msgid "Printer communication backends:"
 msgstr ""
 
 #. Type: multiselect
@@ -138,45 +174,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -184,21 +206,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -206,44 +226,44 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""

Modified: cupsys/branches/cups-1.2/debian/po/fr.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/fr.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/fr.po	Sat Dec 17 04:25:58 2005
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: cupsys\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2004-09-21 11:57+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -101,16 +101,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
 msgstr ""
-"IPP (Protocole d'impression Internet), LPD (« Line Printer Daemon »), "
-"Parallèle, SCSI, Série, Socket, USB"
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Méthode de communication avec l'imprimante :"
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -143,45 +177,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -189,21 +209,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -211,44 +229,52 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr ""
+#~ "IPP (Protocole d'impression Internet), LPD (« Line Printer Daemon »), "
+#~ "Parallèle, SCSI, Série, Socket, USB"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Méthode de communication avec l'imprimante :"

Modified: cupsys/branches/cups-1.2/debian/po/ja.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/ja.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/ja.po	Sat Dec 17 04:25:58 2005
@@ -13,21 +13,21 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 1.2.0\n"
+"Project-Id-Version: cupsys 1.2\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-10-07 00:07+0000\n"
-"PO-Revision-Date: 2005-10-07 09:08+0900\n"
+"POT-Creation-Date: 2005-12-17 13:23+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
 #: ../cupsys-bsd.templates:4
 msgid "Do you want to set up the BSD lpd compatibility server?"
-msgstr "BSD lpd ¸ß´¹¥µ¡¼¥Ð¤ò¥»¥Ã¥È¥¢¥Ã¥×¤·¤Þ¤¹¤«?"
+msgstr "BSD lpd 互換サーバをセットアップしますか?"
 
 #. Type: boolean
 #. Description
@@ -38,17 +38,17 @@
 "that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
 "computers cannot be converted to use the IPP protocol that CUPS uses."
 msgstr ""
-"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï BSD ¥¹¥¿¥¤¥ë¤Î°õºþ¥¸¥ç¥Ö¤ò¼õ¤±ÉÕ¤±¡¢CUPS ¤Ë¤½¤ì¤òÁ÷¤ë¥µ¡¼¥Ð"
-"¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\"BSD\" ¤Þ¤¿¤Ï \"LPR\" ¥µ¡¼¥Ó¥¹·Ðͳ¤Ç¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Ë¥¸¥ç¥Ö"
-"¤òÁ÷¤ë¤Û¤«¤Î¥³¥ó¥Ô¥å¡¼¥¿¤¬¤¢¤ê¡¢¤«¤Ä¤½¤ì¤é¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ï CUPS ¤Î»È¤Ã¤Æ¤¤¤ë "
-"IPP ¥×¥í¥È¥³¥ë¤ò»È¤¦¤è¤¦Êѹ¹¤Ç¤­¤Ê¤¤¡¢¤È¤¤¤¦¾ì¹ç¤Ë¤Î¤ß¥»¥Ã¥È¥¢¥Ã¥×¤¹¤Ù¤­¤Ç"
-"¤¹¡£"
+"このパッケージは BSD スタイルの印刷ジョブを受け付け、CUPS にそれを送るサーバ"
+"を含んでいます。\"BSD\" または \"LPR\" サービス経由でネットワーク越しにジョブ"
+"を送るほかのコンピュータがあり、かつそれらのコンピュータは CUPS の使っている "
+"IPP ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã‚’ä½¿ã†ã‚ˆã†å¤‰æ›´ã§ããªã„ã€ã¨ã„ã†å ´åˆã«ã®ã¿ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã™ã¹ãã§"
+"す。"
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:4
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "̤ÃΤΥ¸¥ç¥Ö¤òÀ¸¥Ç¡¼¥¿ (raw) ¥¸¥ç¥Ö¤È¤·¤Æ CUPS ¤Ë°õºþ¤µ¤»¤Þ¤¹¤«?"
+msgstr "未知のジョブを生データ (raw) ジョブとして CUPS に印刷させますか?"
 
 #. Type: boolean
 #. Description
@@ -60,11 +60,11 @@
 "that MIME type, it attempts to guess what the format is. By default, if it "
 "cannot guess the proper type, it rejects the job."
 msgstr ""
-"IPP ¤Ç¤Î¤¹¤Ù¤Æ¤Î°õºþ¥¸¥ç¥Ö¤Ï MIME ·Á¼°¤ò»ý¤Á¤Þ¤¹¡£°õºþ¥¸¥ç¥Ö¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹"
-"¤ËŬÀڤʷÁ¼°¤¬ÉÕ¤¤¤Æ¤¤¤ë¤È¤Ï¸Â¤é¤º¡¢Â¿¤¯¤Î¥¸¥ç¥Ö¤Ï MIME ·Á¼° application/"
-"octet-stream ¤È¤·¤ÆÁ÷¤é¤ì¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢CUPS ¤Ï¤³¤Î¤è¤¦¤Ê MIME ·Á¼°ÉÕ¤­¤Î"
-"¥¸¥ç¥Ö¤ò¼õ¤±¼è¤ë¤È¡¢¤½¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï²¿¤«¤ò¿ä¬¤·¤è¤¦¤È¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç"
-"¤Ï¡¢¤â¤·Å¬Åö¤Ê·Á¼°¤ò¿ä¬¤Ç¤­¤Ê¤¤¾ì¹ç¡¢¤½¤Î¥¸¥ç¥Ö¤òµñÈݤ·¤Þ¤¹¡£"
+"IPP でのすべての印刷ジョブは MIME 形式を持ちます。印刷ジョブのすべてのソース"
+"に適切な形式が付いているとは限らず、多くのジョブは MIME 形式 application/"
+"octet-stream として送られます。このため、CUPS はこのような MIME 形式付きの"
+"ジョブを受け取ると、そのフォーマットは何かを推測しようとします。デフォルトで"
+"ã¯ã€ã‚‚ã—é©å½“ãªå½¢å¼ã‚’æŽ¨æ¸¬ã§ããªã„å ´åˆã€ãã®ã‚¸ãƒ§ãƒ–ã‚’æ‹’å¦ã—ã¾ã™ã€‚"
 
 #. Type: boolean
 #. Description
@@ -74,8 +74,8 @@
 "type as \"raw\" jobs, which causes them to be sent directly to the printer "
 "without processing."
 msgstr ""
-"¤³¤Î MIME ·Á¼°¤Î¤¹¤Ù¤Æ¤Î̤ÃΤΥ¸¥ç¥Ö¤ò¡¢²Ã¹©¤¹¤ë¤³¤È¤Ê¤¯¥×¥ê¥ó¥¿¤ËľÀÜÁ÷¤ë¤è"
-"¤¦À¸¥Ç¡¼¥¿¡Ê\"raw\"¡Ë¥¸¥ç¥Ö¤È¤·¤Æ°·¤¦¤è¤¦¤Ë CUPS ¤òÀßÄê¤Ç¤­¤Þ¤¹¡£"
+"この MIME å½¢å¼ã®ã™ã¹ã¦ã®æœªçŸ¥ã®ã‚¸ãƒ§ãƒ–ã‚’ã€åŠ å·¥ã™ã‚‹ã“ã¨ãªããƒ—ãƒªãƒ³ã‚¿ã«ç›´æŽ¥é€ã‚‹ã‚ˆ"
+"う生データ（\"raw\"）ジョブとして扱うように CUPS を設定できます。"
 
 #. Type: boolean
 #. Description
@@ -86,22 +86,58 @@
 "local driver the MIME type application/octet-stream. Samba also submits its "
 "print jobs this way."
 msgstr ""
-"¤â¤· Windows ¥³¥ó¥Ô¥å¡¼¥¿¤«¤é¤Î°õºþ¥¸¥ç¥Ö¤ò¼õ¤±ÉÕ¤±¤ë¾ì¹ç¡¢¤ª¤½¤é¤¯¤³¤Î¥ª¥×"
-"¥·¥ç¥ó¤òÀßÄꤹ¤Ù¤­¤Ç¤¹¡£¤È¤¤¤¦¤Î¤â¡¢Windows ¤Ï¤¹¤Ù¤Æ¤Î IPP °õºþ¥¸¥ç¥Ö¤ò¥í¡¼¥«"
-"¥ë¥É¥é¥¤¥Ð¤Ë¤è¤Ã¤Æ MIME ·Á¼° application/octet-stream ¤Ë²Ã¹©¤¹¤ë¤«¤é¤Ç¤¹¡£"
-"Samba ¤âƱÍͤˤ½¤Î°õºþ¥¸¥ç¥Ö¤ò¤³¤Î¤ä¤êÊý¤ÇÁ÷¤ê¤Þ¤¹¡£"
+"もし Windows ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‹ã‚‰ã®å°åˆ·ã‚¸ãƒ§ãƒ–ã‚’å—ã‘ä»˜ã‘ã‚‹å ´åˆã€ãŠãã‚‰ãã“ã®ã‚ªãƒ—"
+"ションを設定すべきです。というのも、Windows はすべての IPP 印刷ジョブをローカ"
+"ルドライバによって MIME 形式 application/octet-stream ã«åŠ å·¥ã™ã‚‹ã‹ã‚‰ã§ã™ã€‚"
+"Samba も同様にその印刷ジョブをこのやり方で送ります。"
 
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "IPP, LPD, ¥Ñ¥é¥ì¥ë, SCSI, ¥·¥ê¥¢¥ë, ¥½¥±¥Ã¥È, USB"
+msgid "ipp"
+msgstr "IPP"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "LPD"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "パラレル"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "SCSI"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "シリアル"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "ソケット"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "USB"
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "ÍøÍѤ·¤¿¤¤¥Ð¥Ã¥¯¥¨¥ó¥É¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£"
+msgid "Printer communication backends:"
+msgstr "プリンタ通信バックエンド:"
 
 #. Type: multiselect
 #. Description
@@ -109,8 +145,8 @@
 msgid ""
 "CUPS uses backend programs for communication with printer device or port."
 msgstr ""
-"CUPS ¤Ï¥×¥ê¥ó¥¿¥Ç¥Ð¥¤¥¹¤Þ¤¿¤Ï¥Ý¡¼¥È¤È²ñÏ乤ë¤Î¤Ë¥Ð¥Ã¥¯¥¨¥ó¥É¥×¥í¥°¥é¥à¤ò»È¤¤"
-"¤Þ¤¹¡£"
+"CUPS はプリンタデバイスまたはポートと会話するのにバックエンドプログラムを使い"
+"ます。"
 
 #. Type: multiselect
 #. Description
@@ -119,8 +155,8 @@
 "Unfortunately, some backend programs cause some trouble. (For example, some "
 "PPC kernel crashes with the parallel backend)"
 msgstr ""
-"º¤¤Ã¤¿¤³¤È¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¥Ð¥Ã¥¯¥¨¥ó¥É¥×¥í¥°¥é¥à¤ÏÌäÂê¤ò°ú¤­µ¯¤³¤·¤Þ¤¹¡£(¤¿¤È¤¨"
-"¤Ð¡¢¤¢¤ë¼ï¤Î PPC ¥«¡¼¥Í¥ë¤Ï parallel ¥Ð¥Ã¥¯¥¨¥ó¥É¤Ç¥¯¥é¥Ã¥·¥å¤·¤Þ¤¹)"
+"困ったことに、いくつかのバックエンドプログラムは問題を引き起こします。(たとえ"
+"ば、ある種の PPC カーネルは parallel バックエンドでクラッシュします)"
 
 #. Type: multiselect
 #. Description
@@ -129,127 +165,116 @@
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"CUPS ¤ÇÍøÍѤ·¤¿¤¤¥Ð¥Ã¥¯¥¨¥ó¥É¥×¥í¥°¥é¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¥Õ¥©¥ë¥È¤ÎÁªÂò¤Ï"
-"¤¿¤¤¤Æ¤¤¤Î°ìÈÌŪ¤Ê´Ä¶­¤Ë¹ç¤Ã¤Æ¤¤¤Þ¤¹¡£"
+"CUPS で利用したいバックエンドプログラムを選択してください。デフォルトの選択は"
+"たいていの一般的な環境に合っています。"
 
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
-msgstr "´Æ»ë¤·¤¿¤¤¥Ý¡¼¥È¤¢¤ë¤¤¤Ï¥Û¥¹¥È̾¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£"
+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 listens. You can use "
-"following formats."
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
 msgstr ""
-"CUPS ¥Ç¡¼¥â¥ó¤Ë´Æ»ë¤µ¤»¤¿¤¤¥Ý¡¼¥È¤Þ¤¿¤Ï¥Û¥¹¥È̾¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£¼¡¤Î¤è¤¦¤Ê"
-"½ñ¼°¤òÍøÍѤǤ­¤Þ¤¹¡£"
+"CUPS デーモンに監視させるポートまたはホスト名を指定してください。次のような書"
+"式を利用できます:"
 
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "- Port number (631)"
-msgstr "- ¥Ý¡¼¥ÈÈÖ¹æ (631)"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr "- ¥Û¥¹¥È̾  (debian.example.com)"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr "- ¥Û¥¹¥È:¥Ý¡¼¥È  (debian.example.com:631)"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
-msgstr "¥Õ¥¡¥¤¥ë¥É¥á¥¤¥ó¥½¥±¥Ã¥È (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
-msgstr "¥¹¥Ú¡¼¥¹¤Ç¶èÀڤäÆÊ£¿ô¤ÎÃͤòÁȤ߹ç¤ï¤»¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£"
+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 the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
-"¥Ç¥Õ¥©¥ë¥È¥Ý¡¼¥È 631 ¤Ï Internet Printing Protocol (IPP) ¤ËͽÌ󤵤ì¤Æ¤¤¤Þ¤¹¡£"
-"\"localhost:631\" ¤Ï¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤«¤éñÆÈ¥Þ¥·¥ó¤Î´Ä¶­¤Ç¿ä¾©¤µ¤ì¤Þ¤¹¡£"
+"デフォルトポート 631 は Internet Printing Protocol (IPP) に予約されています。"
+"\"localhost:631\" はセキュリティ上の理由からスタンドアロンな環境にセットアッ"
+"プするのに推奨されます。"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
-"¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î CUPS ¥×¥ê¥ó¥¿¾ðÊó¤Î¥Ö¥í¡¼¥É¥­¥ã¥¹¥È¤ª¤è¤Ó´Æ»ë¤ò¹Ô¤¤¤Þ¤¹¤«?"
+"ネットワーク上の CUPS ãƒ—ãƒªãƒ³ã‚¿æƒ…å ±ã®ãƒ–ãƒ­ãƒ¼ãƒ‰ã‚­ãƒ£ã‚¹ãƒˆãŠã‚ˆã³ç›£è¦–ã‚’è¡Œã„ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
 msgstr ""
-"CUPS ¥Ç¡¼¥â¥ó¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ë¥×¥ê¥ó¥¿¾ðÊó¤ò¥Ö¥í¡¼¥É¥­¥ã¥¹¥È¤·"
-"¤¿¤ê¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥×¥ê¥ó¥¿¤ò¼«Æ°Åª¤Ë¸¡½Ð¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£"
+"CUPS ãƒ‡ãƒ¼ãƒ¢ãƒ³ã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸Šã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«ãƒ—ãƒªãƒ³ã‚¿æƒ…å ±ã‚’ãƒ–ãƒ­ãƒ¼ãƒ‰ã‚­ãƒ£ã‚¹ãƒˆã—"
+"たり、ネットワーク上のプリンタを自動的に検出したりできます。"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
-"¤³¤ÎÁªÂò»è¤Ç¡Ö¤Ï¤¤¡×¤È¤¹¤ë¤È¡¢CUPS ¥Ç¡¼¥â¥ó¤Ï UDP ¤ò»È¤Ã¤ÆÄê´üŪ¤Ë¥Ö¥í¡¼¥É"
-"¥­¥ã¥¹¥È¤ª¤è¤Ó¸¡½Ð¤ò¹Ô¤¤¤Þ¤¹¡£"
+"この選択肢を選ぶと、CUPS デーモンはプリンタを検出するために UDP ブロードキャ"
+"ストを定期的に送ります。"
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
-msgstr "ÆþÎϤ˸í¤Ã¤¿Ãͤ¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£"
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "不正な値が入力されました"
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
-msgstr "¥Ý¡¼¥ÈÈÖ¹æ¤Þ¤¿¤Ï¥Û¥¹¥È̾¤Î²ò¼áÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "ポート番号またはホスト名の解釈中にエラーが発生しました。"
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
-msgstr "½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£"
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "入力値を修正してください。"
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
-msgstr "´ÉÍý¼Ô¥Ñ¥¹¥ï¡¼¥É:"
+msgstr "管理者パスワード:"
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
-msgstr "CUPS ´ÉÍý¼Ô (¥æ¡¼¥¶Ì¾ 'root') ÍѤΥѥ¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
+msgstr "CUPS 管理者 (ユーザ名 'root') 用のパスワードを入力してください。"
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
-msgstr "lpadmin ¤ò»È¤Ã¤Æ CUPS ¥Ñ¥¹¥ï¡¼¥É¾ðÊó¤òÄɲÃ/Êѹ¹/ºï½ü¤Ç¤­¤Þ¤¹¡£"
+msgstr "lpadmin を使って CUPS ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰æƒ…å ±ã‚’è¿½åŠ /変更/削除できます。"

Modified: cupsys/branches/cups-1.2/debian/po/nl.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/nl.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/nl.po	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2004-03-30 12:28+0100\n"
 "Last-Translator: Tim Dijkstra <tim at famdijkstra.org>\n"
 "Language-Team: Debian Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -98,14 +98,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Selecteer het backend dat u wilt."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -139,45 +175,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Port number (631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
+"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 "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -185,21 +207,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -207,44 +227,47 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Selecteer het backend dat u wilt."

Modified: cupsys/branches/cups-1.2/debian/po/pt_BR.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/pt_BR.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/pt_BR.po	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+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"
@@ -97,14 +97,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Selecione o backend desejado."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -138,45 +174,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -184,21 +206,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -206,44 +226,50 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Selecione o backend desejado."

Modified: cupsys/branches/cups-1.2/debian/po/ru.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/ru.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/ru.po	Sat Dec 17 04:25:58 2005
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys_1.1.23-12_ru.po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-04 23:07+0900\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2005-11-24 20:39+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -41,17 +41,18 @@
 "that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
 "computers cannot be converted to use the IPP protocol that CUPS uses."
 msgstr ""
-"Этот пакет содержит сервер, который может принимать задания печати в "
-"стиле BSD и посылать их в CUPS. Его рекомендуется устанавливать только "
-"в том случае, если в сети есть другие компьютеры, которые отправляют задания "
-"по сети с помощью \"BSD\" или \"LPR\" сервисов, и эти компьютеры не могут "
+"Этот пакет содержит сервер, который может принимать задания печати в стиле "
+"BSD и посылать их в CUPS. Его рекомендуется устанавливать только в том "
+"случае, если в сети есть другие компьютеры, которые отправляют задания по "
+"сети с помощью \"BSD\" или \"LPR\" сервисов, и эти компьютеры не могут "
 "работать с протоколом IPP, который используется в CUPS."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:4
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "Хотите чтобы CUPS печатал неизвестные задания как необработанные задания?"
+msgstr ""
+"Хотите чтобы CUPS печатал неизвестные задания как необработанные задания?"
 
 #. Type: boolean
 #. Description
@@ -63,11 +64,12 @@
 "that MIME type, it attempts to guess what the format is. By default, if it "
 "cannot guess the proper type, it rejects the job."
 msgstr ""
-"Все задания печати с помощью IPP имеют тип MIME. Так как не все источники заданий "
-"печати могут присоединять соответствующий тип, многие задания посылаются с "
-"MIME типом application/octet-stream. Из-за этого, когда CUPS принимает "
-"задание с таким MIME типом, он пытается определить формат полученных данных. "
-"По умолчанию, если тип определить не удаётся, задание отбрасывается."
+"Все задания печати с помощью IPP имеют тип MIME. Так как не все источники "
+"заданий печати могут присоединять соответствующий тип, многие задания "
+"посылаются с MIME типом application/octet-stream. Из-за этого, когда CUPS "
+"принимает задание с таким MIME типом, он пытается определить формат "
+"полученных данных. По умолчанию, если тип определить не удаётся, задание "
+"отбрасывается."
 
 #. Type: boolean
 #. Description
@@ -90,27 +92,64 @@
 "local driver the MIME type application/octet-stream. Samba also submits its "
 "print jobs this way."
 msgstr ""
-"Если вы получаете задания печати с компьютеров с Windows, то, вероятно, лучше "
-"установить этот параметр, так как Windows присваивает всем заданиям печати "
-"IPP, обработанным локальным драйверов MIME тип application/octet-stream. "
-"Samba также отправляет свои задания печати в таком виде."
+"Если вы получаете задания печати с компьютеров с Windows, то, вероятно, "
+"лучше установить этот параметр, так как Windows присваивает всем заданиям "
+"печати IPP, обработанным локальным драйверов MIME тип application/octet-"
+"stream. Samba также отправляет свои задания печати в таком виде."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
 
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Выберите нужные интерфейсы."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "CUPS uses backend programs for communication with printer device or port."
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
 msgstr ""
 "CUPS использует интерфейсные программы для связи с устройством печати или "
 "портом."
@@ -132,6 +171,108 @@
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Выберите интерфейсные программу, которая будет использоваться CUPS. Выбор "
-"по умолчанию должен работать с большинством оборудования."
+"Выберите интерфейсные программу, которая будет использоваться CUPS. Выбор по "
+"умолчанию должен работать с большинством оборудования."
+
+#. 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 ""
+
+#. Type: password
+#. Description
+#: ../cupsys.templates:70
+msgid "Admin password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cupsys.templates:70
+msgid "Please enter the password for the admin (username 'root') of CUPS."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cupsys.templates:70
+msgid "You can add/replace/delete CUPS password information by using lpadmin."
+msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
 
+#~ msgid "Select the backends you want."
+#~ msgstr "Выберите нужные интерфейсы."

Modified: cupsys/branches/cups-1.2/debian/po/sv.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/sv.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/sv.po	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-04 23:10+0900\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2005-12-14 23:49+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -32,8 +32,17 @@
 #. Type: boolean
 #. Description
 #: ../cupsys-bsd.templates:4
-msgid "This package contains a server that can accept BSD-style print jobs and submit them to CUPS. It should only be set up if you have other computers that submit jobs over the network via \"BSD\" or \"LPR\" services, and these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr "Detta paket innehåller en server som kan acceptera utskriftsjobb av BSD-stil och skicka dom till CUPS. Den bör endast sättas upp om du har andra datorer som skickar jobb över nätverket via \"BSD\" eller \"LPR\"-tjänster och dessa datorer inte kan konverteras för att använda IPP-protokollet som CUPS använder."
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Detta paket innehåller en server som kan acceptera utskriftsjobb av BSD-stil "
+"och skicka dom till CUPS. Den bör endast sättas upp om du har andra datorer "
+"som skickar jobb över nätverket via \"BSD\" eller \"LPR\"-tjänster och dessa "
+"datorer inte kan konverteras för att använda IPP-protokollet som CUPS "
+"använder."
 
 #. Type: boolean
 #. Description
@@ -44,126 +53,261 @@
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:4
-msgid "All print jobs in IPP get a MIME type. Since not all sources of print jobs can attach an appropriate type, many jobs get submitted as the MIME type application/octet-stream. Because of this, when CUPS receives a job with that MIME type, it attempts to guess what the format is. By default, if it cannot guess the proper type, it rejects the job."
-msgstr "Alla utskriftjobb i IPP får en MIME-typ. Eftersom inte alla källor för utskriftsjobb kan skicka med en lämplig typ blir många jobb skickade som MIME-typen \"application/octet-stream\". Av denna anledning försöker CUPS gissa vilket format det är när den tar emot ett jobb av den MIME-typen. Som standard nekar den att ta emot jobb om den inte kan gissa den korrekta typen."
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Alla utskriftjobb i IPP får en MIME-typ. Eftersom inte alla källor för "
+"utskriftsjobb kan skicka med en lämplig typ blir många jobb skickade som "
+"MIME-typen \"application/octet-stream\". Av denna anledning försöker CUPS "
+"gissa vilket format det är när den tar emot ett jobb av den MIME-typen. Som "
+"standard nekar den att ta emot jobb om den inte kan gissa den korrekta typen."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:4
-msgid "It is possible to cause CUPS to treat all unrecognized jobs with this MIME type as \"raw\" jobs, which causes them to be sent directly to the printer without processing."
-msgstr "Det är möjligt att ställ in så att CUPS behandlar alla okända jobb med denna MIME-typ som \"raw\"-jobb vilket orsakar att de skickas direkt till skrivaren utan att behandlas först."
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Det är möjligt att ställ in så att CUPS behandlar alla okända jobb med denna "
+"MIME-typ som \"raw\"-jobb vilket orsakar att de skickas direkt till "
+"skrivaren utan att behandlas först."
 
 #. Type: boolean
 #. Description
 #: ../cupsys.templates:4
-msgid "If you will be accepting print jobs from Windows computers, you probably want this option set, as Windows gives all IPP print jobs processed by a local driver the MIME type application/octet-stream. Samba also submits its print jobs this way."
-msgstr "Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du antagligen välja denna funktion eftersom Windows sätter alla IPP-utskriftsjobb som hanteras av en lokal drivare till MIME-typen \"application/octet-stream\". Samba skickar också sina utskriftsjobb på detta sätt."
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du "
+"antagligen välja denna funktion eftersom Windows sätter alla IPP-"
+"utskriftsjobb som hanteras av en lokal drivare till MIME-typen \"application/"
+"octet-stream\". Samba skickar också sina utskriftsjobb på detta sätt."
 
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, parallell, scsi, seriell, socket, usb"
+msgid "ipp"
+msgstr ""
 
 #. Type: multiselect
-#. Description
-#: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Välj det baksystem du vill använda."
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
 
 #. Type: multiselect
-#. Description
-#: ../cupsys.templates:24
-msgid "CUPS uses backend programs for communication with printer device or port."
-msgstr "CUPS använder ett baksystemprogram för att kommunicera med skrivarenhet eller port."
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Unfortunately, some backend programs cause some trouble. (For example, some PPC kernel crashes with the parallel backend)"
-msgstr "Tyvärr kan några baksystemprogram skapa problem. (Till exempel kan vissa PPC-kärnor krascha med parallella baksystem)"
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Please choose the backend program to be used by CUPS. The default choice should fit the most common environments."
-msgstr "Vänligen välj det baksystemprogram som ska användas av CUPS. Det förvalda valet bör passa den flesta vanliga miljöer."
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS använder ett baksystemprogram för att kommunicera med skrivarenhet "
+"eller port."
 
-#. Type: string
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
-msgstr "Ange port och/eller värdnamn som ska lyssnas på."
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Tyvärr kan några baksystemprogram skapa problem. (Till exempel kan vissa PPC-"
+"kärnor krascha med parallella baksystem)"
 
-#. Type: string
+#. Type: multiselect
 #. Description
-#: ../cupsys.templates:36
-msgid "Please specify the port or the host name CUPS daemon listens. You can use following formats."
-msgstr "Vänligen ange porten eller värdnamnet som CUPS-demonen ska lyssna på. Du kan använda följande format."
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Vänligen välj det baksystemprogram som ska användas av CUPS. Det förvalda "
+"valet bör passa den flesta vanliga miljöer."
 
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "- Port number (631)"
-msgstr "- Portnummer (631)"
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
 
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr "- Värdnamn   (debian.exempel.se)"
+#, fuzzy
+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å. Du kan "
+"använda följande format."
 
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr "- 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 ""
 
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "It is possible to combine by delimiting two or more values in space."
-msgstr "Det är möjligt att kombinera genom att avgränsa två eller fler värden med mellanslag."
+msgid "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 the standalone environment by security reason."
-msgstr "Standardport 631 är reserverad för Internet Printing Protocol (IPP). \"localhost:631\" är rekommenderat för fristående miljöer av säkerhetsskäl."
+#, fuzzy
+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 rekommenderat för fristående miljöer av säkerhetsskäl."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:55
-msgid "Do you want to 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?"
+#: ../cupsys.templates:54
+#, fuzzy
+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:55
-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."
+#: ../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."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:55
-msgid "When this option is accepted, CUPS daemon will broadcast and detect by using UDP periodically."
-msgstr "När denna funktion accepteras kommer CUPS-demonen att sända ut och identifiera genom att använda UDP med jämna mellanrum."
+#: ../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:64
-msgid "The wrong value is found in the input."
-msgstr "Fel värde matades in."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:64
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+#, fuzzy
+msgid "an error occurred while parsing the port number or the host name."
 msgstr "Felet inträffade vid tolkning av portnumret eller värdnamnet."
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:64
-msgid "Please correct it."
+#: ../cupsys.templates:63
+#, fuzzy
+msgid "Please correct your input."
 msgstr "Vänligen rätt till det."
 
+#. Type: password
+#. Description
+#: ../cupsys.templates:70
+msgid "Admin password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cupsys.templates:70
+msgid "Please enter the password for the admin (username 'root') of CUPS."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../cupsys.templates:70
+msgid "You can add/replace/delete CUPS password information by using lpadmin."
+msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallell, scsi, seriell, socket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Välj det baksystem du vill använda."
+
+#~ msgid "Specify the port or/and host name that wants to be listened."
+#~ msgstr "Ange port och/eller värdnamn som ska lyssnas på."
+
+#~ msgid "- Port number (631)"
+#~ msgstr "- Portnummer (631)"
+
+#~ msgid "- Host name   (debian.example.com)"
+#~ msgstr "- Värdnamn   (debian.exempel.se)"
+
+#~ msgid "- Host:Port   (debian.example.com:631)"
+#~ msgstr "- Värd:Port   (debian.exempel.se:631)"
+
+#~ msgid "It is possible to combine by delimiting two or more values in space."
+#~ msgstr ""
+#~ "Det är möjligt att kombinera genom att avgränsa två eller fler värden med "
+#~ "mellanslag."
+
+#~ msgid ""
+#~ "When this option is accepted, CUPS daemon will broadcast and detect by "
+#~ "using UDP periodically."
+#~ msgstr ""
+#~ "När denna funktion accepteras kommer CUPS-demonen att sända ut och "
+#~ "identifiera genom att använda UDP med jämna mellanrum."
+
+#~ msgid "The wrong value is found in the input."
+#~ msgstr "Fel värde matades in."

Modified: cupsys/branches/cups-1.2/debian/po/templates.pot
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/templates.pot	(original)
+++ cupsys/branches/cups-1.2/debian/po/templates.pot	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+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"
@@ -71,13 +71,49 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
 msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
+msgid "Printer communication backends:"
 msgstr ""
 
 #. Type: multiselect
@@ -106,45 +142,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -152,21 +174,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -174,44 +194,44 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""

Modified: cupsys/branches/cups-1.2/debian/po/tr.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/tr.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/tr.po	Sat Dec 17 04:25:58 2005
@@ -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: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+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"
@@ -88,14 +88,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, paralel, scsi, seri, soket, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "İstediğiniz arkayüzü seçin."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -129,45 +165,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -175,21 +197,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -197,44 +217,50 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, paralel, scsi, seri, soket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "İstediğiniz arkayüzü seçin."

Modified: cupsys/branches/cups-1.2/debian/po/vi.po
==============================================================================
--- cupsys/branches/cups-1.2/debian/po/vi.po	(original)
+++ cupsys/branches/cups-1.2/debian/po/vi.po	Sat Dec 17 04:25:58 2005
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: cupsys 1.1.23-10\n"
 "Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2005-10-07 00:07+0000\n"
+"POT-Creation-Date: 2005-12-17 13:23+0900\n"
 "PO-Revision-Date: 2005-05-22 12:57+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -86,14 +86,50 @@
 #. Type: multiselect
 #. Choices
 #: ../cupsys.templates:22
-msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-msgstr "ipp, lpd, song song, scsi, nối tiếp, ổ cắm, usb"
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../cupsys.templates:24
-msgid "Select the backends you want."
-msgstr "Hãy chọn hậu phương nà o bạn muốn."
+msgid "Printer communication backends:"
+msgstr ""
 
 #. Type: multiselect
 #. Description
@@ -127,45 +163,31 @@
 #. Type: string
 #. Description
 #: ../cupsys.templates:36
-msgid "Specify the port or/and host name that wants to be listened."
+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 listens. You can use "
-"following formats."
+"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)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host name   (debian.example.com)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- Host:Port   (debian.example.com:631)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "- File domain socket (/var/run/cups/cups.sock)"
+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 "It is possible to combine by delimiting two or more values in space."
+msgid "You can combine any of these by delimiting in a space-separated list."
 msgstr ""
 
 #. Type: string
@@ -173,21 +195,19 @@
 #: ../cupsys.templates:36
 msgid ""
 "The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to the standalone environment by security "
-"reason."
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
-msgid ""
-"Do you want to broadcast and/or listen for CUPS printer information on the "
-"network?"
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
 "CUPS daemon can broadcast printer information for clients on the network, "
 "and detect printers on the network automatically."
@@ -195,44 +215,50 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:57
+#: ../cupsys.templates:54
 msgid ""
-"When this option is accepted, CUPS daemon will broadcast and detect by using "
-"UDP periodically."
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The wrong value is found in the input."
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "The error occurred while parsing the port number or the host name."
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../cupsys.templates:66
-msgid "Please correct it."
+#: ../cupsys.templates:63
+msgid "Please correct your input."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Admin password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "Please enter the password for the admin (username 'root') of CUPS."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../cupsys.templates:73
+#: ../cupsys.templates:70
 msgid "You can add/replace/delete CUPS password information by using lpadmin."
 msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, song song, scsi, nối tiếp, ổ cắm, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Hãy chọn hậu phương nà o bạn muốn."