summaryrefslogtreecommitdiffstats
path: root/perl-install/share
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2002-02-09 14:12:42 +0000
committerPablo Saratxaga <pablo@mandriva.com>2002-02-09 14:12:42 +0000
commita235c266c656158bcc9f578b5a237067f859152b (patch)
tree5f6b178bfe9e363054e8bb99e6be9090da1f7811 /perl-install/share
parentcb296a281be343130009d5d2976a394fd8afc1c8 (diff)
downloaddrakx-a235c266c656158bcc9f578b5a237067f859152b.tar
drakx-a235c266c656158bcc9f578b5a237067f859152b.tar.gz
drakx-a235c266c656158bcc9f578b5a237067f859152b.tar.bz2
drakx-a235c266c656158bcc9f578b5a237067f859152b.tar.xz
drakx-a235c266c656158bcc9f578b5a237067f859152b.zip
merged with the manual help
Diffstat (limited to 'perl-install/share')
-rw-r--r--perl-install/share/po/DrakX.pot733
-rwxr-xr-xperl-install/share/po/help_xml2pm.pl2
2 files changed, 397 insertions, 338 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 8795c4b4e..c3666cf85 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-07 21:57+0100\n"
+"POT-Creation-Date: 2002-02-09 14:15+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -212,7 +212,7 @@ msgstr ""
msgid "XFree86 server: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:837 ../../printerdrake.pm_.c:2266
+#: ../../Xconfigurator.pm_.c:837 ../../printerdrake.pm_.c:2377
#: ../../standalone/draknet_.c:275 ../../standalone/draknet_.c:278
msgid "Expert Mode"
msgstr ""
@@ -322,7 +322,7 @@ msgstr ""
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1511 ../../printerdrake.pm_.c:2269
+#: ../../Xconfigurator.pm_.c:1511 ../../printerdrake.pm_.c:2380
#: ../../standalone/logdrake_.c:217
msgid "Quit"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#: ../../any.pm_.c:172 ../../any.pm_.c:774
#: ../../install_steps_interactive.pm_.c:1092 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:663 ../../printerdrake.pm_.c:739
+#: ../../printerdrake.pm_.c:717 ../../printerdrake.pm_.c:793
#: ../../standalone/draknet_.c:624
msgid "Password"
msgstr ""
@@ -737,12 +737,12 @@ msgid "Do you have any %s interfaces?"
msgstr ""
#: ../../any.pm_.c:639 ../../any.pm_.c:810 ../../interactive.pm_.c:123
-#: ../../my_gtk.pm_.c:999
+#: ../../my_gtk.pm_.c:1001
msgid "No"
msgstr ""
#: ../../any.pm_.c:639 ../../any.pm_.c:809 ../../interactive.pm_.c:123
-#: ../../my_gtk.pm_.c:999
+#: ../../my_gtk.pm_.c:1001
msgid "Yes"
msgstr ""
@@ -869,8 +869,8 @@ msgstr ""
msgid "Real name"
msgstr ""
-#: ../../any.pm_.c:773 ../../printerdrake.pm_.c:662
-#: ../../printerdrake.pm_.c:738
+#: ../../any.pm_.c:773 ../../printerdrake.pm_.c:716
+#: ../../printerdrake.pm_.c:792
msgid "User name"
msgstr ""
@@ -1172,9 +1172,9 @@ msgstr ""
#: ../../bootlook.pm_.c:160 ../../install_steps_gtk.pm_.c:463
#: ../../install_steps_gtk.pm_.c:521 ../../interactive.pm_.c:133
#: ../../interactive.pm_.c:307 ../../interactive.pm_.c:339
-#: ../../interactive_stdio.pm_.c:141 ../../my_gtk.pm_.c:668
-#: ../../my_gtk.pm_.c:671 ../../my_gtk.pm_.c:1000
-#: ../../printerdrake.pm_.c:1484 ../../standalone/drakautoinst_.c:204
+#: ../../interactive_stdio.pm_.c:141 ../../my_gtk.pm_.c:670
+#: ../../my_gtk.pm_.c:673 ../../my_gtk.pm_.c:1002
+#: ../../printerdrake.pm_.c:1540 ../../standalone/drakautoinst_.c:204
#: ../../standalone/drakbackup_.c:2251 ../../standalone/drakbackup_.c:2276
#: ../../standalone/drakbackup_.c:2297 ../../standalone/drakbackup_.c:2318
#: ../../standalone/drakbackup_.c:2336 ../../standalone/drakbackup_.c:2384
@@ -2208,12 +2208,16 @@ msgid ""
"to have a graphical workstation!\n"
"\n"
"Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you do not select any group when installing (and\n"
-"not upgrading), a dialog will popup asking you to choose the nature of\n"
-"minimal install. This can be \"Base system only\" for the smallest install\n"
-"possible, \"No X\" for a bit larger install but without X11 or \"With X\"\n"
-"for the the largest minimal install including X11. (this para *MUST* be\n"
-"reviewed and splitted)\n"
+"text about that group. If you do not select any group when performing a\n"
+"regular installation (by opposition to an upgrade), a dialog will popup\n"
+"proposing different kind of minimal installations:\n"
+"\n"
+" * Will install the strict minimum necessary to get a working Linux system,\n"
+"in command line only.\n"
+"\n"
+" * Installs the base system plus basic utilities\n"
+"\n"
+" * Install the fewer packages possible for having a graphical desktop\n"
"\n"
"You can check the \"Individual package selection\" box, which is useful if\n"
"you are familiar with the packages being offered or if you want to have\n"
@@ -2224,7 +2228,7 @@ msgid ""
"updating an existing system."
msgstr ""
-#: ../../help.pm_.c:120
+#: ../../help.pm_.c:124
msgid ""
"Finally, depending on your choice of whether or not to select individual\n"
"packages, you will be presented a tree containing all packages classified\n"
@@ -2262,7 +2266,7 @@ msgid ""
"a floppy."
msgstr ""
-#: ../../help.pm_.c:156
+#: ../../help.pm_.c:160
msgid ""
"If you wish to connect your computer to the Internet or to a local network,\n"
"please choose the correct option. Please turn on your device before\n"
@@ -2285,7 +2289,7 @@ msgid ""
"have finished configuring your network connection, click \"Cancel\"."
msgstr ""
-#: ../../help.pm_.c:177
+#: ../../help.pm_.c:181
msgid ""
"You may now choose which services you wish to start at boot time.\n"
"\n"
@@ -2303,13 +2307,13 @@ msgid ""
"enabled on a server. In general, select only the services you really need."
msgstr ""
-#: ../../help.pm_.c:193
+#: ../../help.pm_.c:197
msgid ""
"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
"local time according to the time zone you selected."
msgstr ""
-#: ../../help.pm_.c:197
+#: ../../help.pm_.c:201
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
@@ -2331,7 +2335,7 @@ msgid ""
"seconds, restoring the screen."
msgstr ""
-#: ../../help.pm_.c:217
+#: ../../help.pm_.c:221
msgid ""
"The first time you try the X configuration, you may not be very satisfied\n"
"with its display (screen is too small, shifted left or right...). Hence,\n"
@@ -2345,7 +2349,7 @@ msgid ""
"with any modern graphics card. Then choose \"Test again\" to be sure."
msgstr ""
-#: ../../help.pm_.c:229
+#: ../../help.pm_.c:233
msgid ""
"Finally, you will be asked whether you want to see the graphical interface\n"
"at boot. Note this question will be asked even if you chose not to test the\n"
@@ -2354,7 +2358,7 @@ msgid ""
"configured."
msgstr ""
-#: ../../help.pm_.c:236
+#: ../../help.pm_.c:240
msgid ""
"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
@@ -2382,7 +2386,7 @@ msgid ""
"the whole disk."
msgstr ""
-#: ../../help.pm_.c:260
+#: ../../help.pm_.c:264
msgid ""
"At this point you need to choose where on your hard drive to install your\n"
"Mandrake Linux operating system. If your hard drive is empty or if an\n"
@@ -2449,7 +2453,7 @@ msgid ""
"know what you are doing."
msgstr ""
-#: ../../help.pm_.c:324
+#: ../../help.pm_.c:328
msgid ""
"There you are. Installation is now complete and your GNU/Linux system is\n"
"ready to use. Just click \"OK\" to reboot the system. You can start\n"
@@ -2482,7 +2486,7 @@ msgid ""
"\"mformat a:\")"
msgstr ""
-#: ../../help.pm_.c:355
+#: ../../help.pm_.c:359
msgid ""
"Any partitions that have been newly defined must be formatted for use\n"
"(formatting means creating a file system).\n"
@@ -2510,7 +2514,7 @@ msgid ""
"for bad blocks on the disc."
msgstr ""
-#: ../../help.pm_.c:381
+#: ../../help.pm_.c:385
msgid ""
"Your new Mandrake Linux operating system is currently being installed.\n"
"Depending on the number of packages you will be installing and the speed of\n"
@@ -2520,7 +2524,7 @@ msgid ""
"Please be patient."
msgstr ""
-#: ../../help.pm_.c:389
+#: ../../help.pm_.c:393
msgid ""
"You may choose to upload updated packages that have been released after the\n"
"distribution has been made available. You will get security fixes or bug\n"
@@ -2534,7 +2538,7 @@ msgid ""
"help section, let us (DrakX team developer) known)."
msgstr ""
-#: ../../help.pm_.c:401
+#: ../../help.pm_.c:405
msgid ""
"Before continuing you should read carefully the terms of the license. It\n"
"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
@@ -2543,7 +2547,7 @@ msgid ""
"\"Accept\" button."
msgstr ""
-#: ../../help.pm_.c:408
+#: ../../help.pm_.c:412
msgid ""
"At this point, it is time to choose the security level desired for the\n"
"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
@@ -2555,7 +2559,7 @@ msgid ""
"If you do not know what to choose, keep the default option."
msgstr ""
-#: ../../help.pm_.c:418
+#: ../../help.pm_.c:422
msgid ""
"At this point, you need to choose what partition(s) will be used for the\n"
"installation of your Mandrake Linux system. If partitions have been already\n"
@@ -2617,7 +2621,7 @@ msgid ""
"emergency boot situations."
msgstr ""
-#: ../../help.pm_.c:477
+#: ../../help.pm_.c:481
msgid ""
"More than one Microsoft Windows partition has been detected on your hard\n"
"drive. Please choose the one you want to resize in order to install your\n"
@@ -2650,19 +2654,26 @@ msgid ""
"disk or partition is called \"C:\")."
msgstr ""
-#: ../../help.pm_.c:508
+#: ../../help.pm_.c:512
msgid "Please be patient. This operation can take several minutes."
msgstr ""
-#: ../../help.pm_.c:511
+#: ../../help.pm_.c:515
msgid ""
"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
"installation or if you want to have greater control (\"Expert\"). You also\n"
"have the choice of performing a new install or an upgrade of an existing\n"
-"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
-"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
-"existing system. Select \"Upgrade packages only\" if you are upgrading the\n"
-"packages of a previous distribution without any other modification.\n"
+"Mandrake Linux system:\n"
+"\n"
+" * completely wipes out the old system;\n"
+"\n"
+" *\n"
+"\n"
+" *\n"
+"\n"
+"On the other hand, \"Upgrade\" allows you to upgrade an existing system.\n"
+"Finally, Select \"Upgrade packages only\" if you wish to upgrade the\n"
+"packages of a previous installation, without any other modification.\n"
"\n"
"Please choose \"Install\" if there are no previous version of Mandrake\n"
"Linux installed or if you wish to boot between various operating systems.\n"
@@ -2685,7 +2696,7 @@ msgid ""
"this unless you know what you are doing."
msgstr ""
-#: ../../help.pm_.c:540
+#: ../../help.pm_.c:551
msgid ""
"Normally, DrakX selects the right keyboard for you (depending on the\n"
"language you have chosen) and you will not even see this step. However, you\n"
@@ -2700,7 +2711,7 @@ msgid ""
"supported keyboards."
msgstr ""
-#: ../../help.pm_.c:553
+#: ../../help.pm_.c:564
msgid ""
"Please choose your preferred language for installation and system usage.\n"
"\n"
@@ -2715,7 +2726,7 @@ msgid ""
"additional locales click the \"OK\" button to continue."
msgstr ""
-#: ../../help.pm_.c:566
+#: ../../help.pm_.c:577
msgid ""
"By default, DrakX assumes you have a two-button mouse and will set it up\n"
"for third-button emulation. DrakX will automatically know whether it is a\n"
@@ -2730,13 +2741,13 @@ msgid ""
"RETURN to \"Cancel\" and choose again."
msgstr ""
-#: ../../help.pm_.c:579
+#: ../../help.pm_.c:590
msgid ""
"Please select the correct port. For example, the COM1 port under MS Windows\n"
"is named ttyS0 under GNU/Linux."
msgstr ""
-#: ../../help.pm_.c:583
+#: ../../help.pm_.c:594
msgid ""
"This is the most crucial decision point for the security of your GNU/Linux\n"
"system: you have to enter the \"root\" password. \"root\" is the system\n"
@@ -2774,7 +2785,7 @@ msgid ""
"want to choose \"Local files\" for authentication."
msgstr ""
-#: ../../help.pm_.c:619
+#: ../../help.pm_.c:630
msgid ""
"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
@@ -2825,7 +2836,7 @@ msgid ""
"on to the next installation step."
msgstr ""
-#: ../../help.pm_.c:666
+#: ../../help.pm_.c:677
msgid ""
"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
"either GNU/Linux or any other operating system present on your computer.\n"
@@ -2838,7 +2849,7 @@ msgid ""
"you will need a boot disk in order to boot those other operating systems!"
msgstr ""
-#: ../../help.pm_.c:677
+#: ../../help.pm_.c:688
msgid ""
"You must indicate where you wish to place the information required to boot\n"
"to GNU/Linux.\n"
@@ -2847,7 +2858,7 @@ msgid ""
"(MBR)\"."
msgstr ""
-#: ../../help.pm_.c:684
+#: ../../help.pm_.c:695
msgid ""
"Here we select a printing system for your computer to use. Other OSes may\n"
"offer you one, but Mandrake offers three.\n"
@@ -2878,7 +2889,7 @@ msgid ""
"networks."
msgstr ""
-#: ../../help.pm_.c:712
+#: ../../help.pm_.c:723
msgid ""
"DrakX is now detecting any IDE devices present in your computer. It will\n"
"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
@@ -2907,7 +2918,7 @@ msgid ""
"on your system)."
msgstr ""
-#: ../../help.pm_.c:739
+#: ../../help.pm_.c:750
msgid ""
"You can add additional entries for yaboot, either for other operating\n"
"systems, alternate kernels, or for an emergency boot image.\n"
@@ -2956,7 +2967,7 @@ msgid ""
"selections."
msgstr ""
-#: ../../help.pm_.c:784
+#: ../../help.pm_.c:795
msgid ""
"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
@@ -2993,7 +3004,7 @@ msgid ""
"Firmware Delay expires."
msgstr ""
-#: ../../help.pm_.c:817
+#: ../../help.pm_.c:828
msgid ""
"Here are presented various parameters concerning your machine. Depending on\n"
"your installed hardware, you may - or not, see the following entries:\n"
@@ -3025,14 +3036,14 @@ msgid ""
"associated to it."
msgstr ""
-#: ../../help.pm_.c:846
+#: ../../help.pm_.c:857
msgid ""
"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
"partition. Be careful, all data present on it will be lost and will not be\n"
"recoverable!"
msgstr ""
-#: ../../help.pm_.c:851
+#: ../../help.pm_.c:862
msgid ""
"Click on \"OK\" if you want to delete all data and partitions present on\n"
"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
@@ -3098,7 +3109,7 @@ msgstr ""
#: ../../interactive.pm_.c:307 ../../interactive.pm_.c:339
#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
#: ../../interactive_stdio.pm_.c:141 ../../interactive_stdio.pm_.c:142
-#: ../../my_gtk.pm_.c:667 ../../my_gtk.pm_.c:1000 ../../my_gtk.pm_.c:1022
+#: ../../my_gtk.pm_.c:669 ../../my_gtk.pm_.c:1002 ../../my_gtk.pm_.c:1024
#: ../../standalone/drakbackup_.c:2285 ../../standalone/drakbackup_.c:2356
#: ../../standalone/drakbackup_.c:2372
msgid "Ok"
@@ -4043,7 +4054,7 @@ msgid "NTP Server"
msgstr ""
#: ../../install_steps_interactive.pm_.c:1009
-#: ../../install_steps_interactive.pm_.c:1017 ../../printerdrake.pm_.c:102
+#: ../../install_steps_interactive.pm_.c:1017 ../../printerdrake.pm_.c:103
msgid "Remote CUPS server"
msgstr ""
@@ -4063,8 +4074,8 @@ msgstr ""
msgid "Timezone"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1027 ../../printerdrake.pm_.c:2090
-#: ../../printerdrake.pm_.c:2161
+#: ../../install_steps_interactive.pm_.c:1027 ../../printerdrake.pm_.c:2201
+#: ../../printerdrake.pm_.c:2272
msgid "Printer"
msgstr ""
@@ -4166,7 +4177,7 @@ msgstr ""
msgid "Second floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1166 ../../printerdrake.pm_.c:1708
+#: ../../install_steps_interactive.pm_.c:1166 ../../printerdrake.pm_.c:1804
msgid "Skip"
msgstr ""
@@ -4328,19 +4339,19 @@ msgstr ""
msgid "Please wait"
msgstr ""
-#: ../../interactive_gtk.pm_.c:604 ../../services.pm_.c:222
+#: ../../interactive_gtk.pm_.c:605 ../../services.pm_.c:222
msgid "Info"
msgstr ""
-#: ../../interactive_gtk.pm_.c:714
+#: ../../interactive_gtk.pm_.c:715
msgid "Expand Tree"
msgstr ""
-#: ../../interactive_gtk.pm_.c:715
+#: ../../interactive_gtk.pm_.c:716
msgid "Collapse Tree"
msgstr ""
-#: ../../interactive_gtk.pm_.c:716
+#: ../../interactive_gtk.pm_.c:717
msgid "Toggle between flat and group sorted"
msgstr ""
@@ -4824,23 +4835,23 @@ msgstr ""
msgid "-adobe-utopia-medium-r-normal-*-12-*-*-*-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../../my_gtk.pm_.c:632
+#: ../../my_gtk.pm_.c:634
msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../../my_gtk.pm_.c:667
+#: ../../my_gtk.pm_.c:669
msgid "Finish"
msgstr ""
-#: ../../my_gtk.pm_.c:667
+#: ../../my_gtk.pm_.c:669 ../../printerdrake.pm_.c:1542
msgid "Next ->"
msgstr ""
-#: ../../my_gtk.pm_.c:668
+#: ../../my_gtk.pm_.c:670 ../../printerdrake.pm_.c:1540
msgid "<- Previous"
msgstr ""
-#: ../../my_gtk.pm_.c:1000
+#: ../../my_gtk.pm_.c:1002
msgid "Is this correct?"
msgstr ""
@@ -5313,7 +5324,7 @@ msgstr ""
msgid "Automatic IP"
msgstr ""
-#: ../../network/network.pm_.c:327 ../../printerdrake.pm_.c:667
+#: ../../network/network.pm_.c:327 ../../printerdrake.pm_.c:721
msgid "IP address should be in format 1.2.3.4"
msgstr ""
@@ -5528,7 +5539,7 @@ msgstr ""
msgid "PDQ - Print, Don't Queue"
msgstr ""
-#: ../../printer.pm_.c:32 ../../printer.pm_.c:847
+#: ../../printer.pm_.c:32 ../../printer.pm_.c:851
msgid "CUPS"
msgstr ""
@@ -5580,98 +5591,98 @@ msgstr ""
msgid "Pipe job into a command"
msgstr ""
-#: ../../printer.pm_.c:480 ../../printer.pm_.c:671 ../../printer.pm_.c:993
-#: ../../printerdrake.pm_.c:1555 ../../printerdrake.pm_.c:2448
+#: ../../printer.pm_.c:484 ../../printer.pm_.c:675 ../../printer.pm_.c:997
+#: ../../printerdrake.pm_.c:1618 ../../printerdrake.pm_.c:2598
msgid "Unknown model"
msgstr ""
-#: ../../printer.pm_.c:508
+#: ../../printer.pm_.c:512
msgid "Local Printers"
msgstr ""
-#: ../../printer.pm_.c:510 ../../printer.pm_.c:848
+#: ../../printer.pm_.c:514 ../../printer.pm_.c:852
msgid "Remote Printers"
msgstr ""
-#: ../../printer.pm_.c:517 ../../printerdrake.pm_.c:264
+#: ../../printer.pm_.c:521 ../../printerdrake.pm_.c:294
#, c-format
msgid " on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:520 ../../printerdrake.pm_.c:266
+#: ../../printer.pm_.c:524 ../../printerdrake.pm_.c:296
#, c-format
msgid ", USB printer \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:525
+#: ../../printer.pm_.c:529
#, c-format
msgid ", multi-function device on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:528
+#: ../../printer.pm_.c:532
msgid ", multi-function device on USB"
msgstr ""
-#: ../../printer.pm_.c:530
+#: ../../printer.pm_.c:534
msgid ", multi-function device on HP JetDirect"
msgstr ""
-#: ../../printer.pm_.c:532
+#: ../../printer.pm_.c:536
msgid ", multi-function device"
msgstr ""
-#: ../../printer.pm_.c:535
+#: ../../printer.pm_.c:539
#, c-format
msgid ", printing to %s"
msgstr ""
-#: ../../printer.pm_.c:537
+#: ../../printer.pm_.c:541
#, c-format
msgid "on LPD server \"%s\", printer \"%s\""
msgstr ""
-#: ../../printer.pm_.c:539
+#: ../../printer.pm_.c:543
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ""
-#: ../../printer.pm_.c:543
+#: ../../printer.pm_.c:547
#, c-format
msgid "on Windows server \"%s\", share \"%s\""
msgstr ""
-#: ../../printer.pm_.c:547
+#: ../../printer.pm_.c:551
#, c-format
msgid "on Novell server \"%s\", printer \"%s\""
msgstr ""
-#: ../../printer.pm_.c:549
+#: ../../printer.pm_.c:553
#, c-format
msgid ", using command %s"
msgstr ""
-#: ../../printer.pm_.c:668 ../../printerdrake.pm_.c:1047
+#: ../../printer.pm_.c:672 ../../printerdrake.pm_.c:1102
msgid "Raw printer (No driver)"
msgstr ""
-#: ../../printer.pm_.c:817
+#: ../../printer.pm_.c:821
#, c-format
msgid "(on %s)"
msgstr ""
-#: ../../printer.pm_.c:819
+#: ../../printer.pm_.c:823
msgid "(on this machine)"
msgstr ""
-#: ../../printer.pm_.c:844
+#: ../../printer.pm_.c:848
#, c-format
msgid "On CUPS server \"%s\""
msgstr ""
-#: ../../printer.pm_.c:850 ../../printerdrake.pm_.c:2198
-#: ../../printerdrake.pm_.c:2209 ../../printerdrake.pm_.c:2385
-#: ../../printerdrake.pm_.c:2416 ../../printerdrake.pm_.c:2564
-#: ../../printerdrake.pm_.c:2566
+#: ../../printer.pm_.c:854 ../../printerdrake.pm_.c:2309
+#: ../../printerdrake.pm_.c:2320 ../../printerdrake.pm_.c:2530
+#: ../../printerdrake.pm_.c:2566 ../../printerdrake.pm_.c:2714
+#: ../../printerdrake.pm_.c:2716
msgid " (Default)"
msgstr ""
@@ -5690,16 +5701,16 @@ msgid ""
"printers will be automatically detected."
msgstr ""
-#: ../../printerdrake.pm_.c:82 ../../printerdrake.pm_.c:86
-#: ../../printerdrake.pm_.c:87 ../../printerdrake.pm_.c:141
+#: ../../printerdrake.pm_.c:83 ../../printerdrake.pm_.c:87
+#: ../../printerdrake.pm_.c:88 ../../printerdrake.pm_.c:142
msgid "None"
msgstr ""
-#: ../../printerdrake.pm_.c:83 ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:143
msgid "Choose a default printer!"
msgstr ""
-#: ../../printerdrake.pm_.c:103
+#: ../../printerdrake.pm_.c:104
msgid ""
"With remote CUPS servers, you do not have to configure any printer here; "
"CUPS servers inform your machine automatically about their printers. All "
@@ -5713,7 +5724,7 @@ msgid ""
"blank."
msgstr ""
-#: ../../printerdrake.pm_.c:104
+#: ../../printerdrake.pm_.c:105
msgid ""
"\n"
"Normally, CUPS is automatically configured according to your network "
@@ -5723,57 +5734,75 @@ msgid ""
"forget to restart CUPS afterwards (command: \"service cups restart\")."
msgstr ""
-#: ../../printerdrake.pm_.c:106 ../../printerdrake.pm_.c:1625
-#: ../../printerdrake.pm_.c:1629 ../../printerdrake.pm_.c:1630
-#: ../../printerdrake.pm_.c:1631 ../../printerdrake.pm_.c:2435
+#: ../../printerdrake.pm_.c:107 ../../printerdrake.pm_.c:1694
+#: ../../printerdrake.pm_.c:1700 ../../printerdrake.pm_.c:1701
+#: ../../printerdrake.pm_.c:1702 ../../printerdrake.pm_.c:2585
#: ../../standalone/drakbackup_.c:753 ../../standalone/drakbackup_.c:2442
#: ../../standalone/drakfont_.c:573 ../../standalone/drakfont_.c:763
msgid "Close"
msgstr ""
-#: ../../printerdrake.pm_.c:107
+#: ../../printerdrake.pm_.c:108
msgid "Apply/Re-read printers"
msgstr ""
-#: ../../printerdrake.pm_.c:111
+#: ../../printerdrake.pm_.c:112
msgid "The IP address should look like 192.168.1.20"
msgstr ""
-#: ../../printerdrake.pm_.c:116 ../../printerdrake.pm_.c:795
+#: ../../printerdrake.pm_.c:117 ../../printerdrake.pm_.c:849
msgid "The port number should be an integer!"
msgstr ""
-#: ../../printerdrake.pm_.c:123 ../../printerdrake.pm_.c:2525
+#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:2675
msgid "Default printer"
msgstr ""
-#: ../../printerdrake.pm_.c:128
+#: ../../printerdrake.pm_.c:129
msgid "CUPS server IP"
msgstr ""
-#: ../../printerdrake.pm_.c:129 ../../printerdrake.pm_.c:788
+#: ../../printerdrake.pm_.c:130 ../../printerdrake.pm_.c:842
msgid "Port"
msgstr ""
-#: ../../printerdrake.pm_.c:131
+#: ../../printerdrake.pm_.c:132
msgid "Automatic CUPS configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:198 ../../standalone/scannerdrake_.c:42
+#: ../../printerdrake.pm_.c:199 ../../standalone/scannerdrake_.c:42
msgid "Detecting devices ..."
msgstr ""
-#: ../../printerdrake.pm_.c:198 ../../standalone/scannerdrake_.c:42
+#: ../../printerdrake.pm_.c:199 ../../standalone/scannerdrake_.c:42
msgid "Test ports"
msgstr ""
-#: ../../printerdrake.pm_.c:215 ../../printerdrake.pm_.c:232
-#: ../../printerdrake.pm_.c:388 ../../printerdrake.pm_.c:403
-#: ../../printerdrake.pm_.c:408 ../../printerdrake.pm_.c:412
+#: ../../printerdrake.pm_.c:221 ../../printerdrake.pm_.c:2353
+#: ../../printerdrake.pm_.c:2457
+msgid "Add a new printer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:222
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard allows you to install local or remote printers to be used from "
+"this machine and also from other machines in the network.\n"
+"\n"
+"It asks you for all necessary information to set up the printer and gives "
+"you access to all available printer drivers, driver options, and printer "
+"connection types."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:230 ../../printerdrake.pm_.c:257
+#: ../../printerdrake.pm_.c:421 ../../printerdrake.pm_.c:436
+#: ../../printerdrake.pm_.c:443 ../../printerdrake.pm_.c:502
msgid "Local Printer"
msgstr ""
-#: ../../printerdrake.pm_.c:216
+#: ../../printerdrake.pm_.c:231
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -5785,14 +5814,17 @@ msgid ""
"on \"Next\" when you are ready, and on \"Cancel\" when you do not want to "
"set up your printer(s) now.\n"
"\n"
-"Note that some computers can crash during the printer auto-detection, use "
-"the \"Expert Mode\" of printerdrake to do a printer installation without "
-"auto-detection. You also need the \"Expert Mode\" when you want to set up "
-"printing on a remote printer when printerdrake does not list it "
-"automatically."
+"Note that some computers can crash during the printer auto-detection, turn "
+"off \"Auto-detect printers\" to do a printer installation without auto-"
+"detection. Use the \"Expert Mode\" of printerdrake when you want to set up "
+"printing on a remote printer if printerdrake does not list it automatically."
msgstr ""
-#: ../../printerdrake.pm_.c:233
+#: ../../printerdrake.pm_.c:240
+msgid "Auto-detect printers"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:258
msgid ""
"\n"
"Congratulations, your printer is now installed and configured!\n"
@@ -5806,41 +5838,38 @@ msgid ""
"Center."
msgstr ""
-#: ../../printerdrake.pm_.c:247
+#: ../../printerdrake.pm_.c:276
msgid "Auto-Detection of Printers"
msgstr ""
-#: ../../printerdrake.pm_.c:248
+#: ../../printerdrake.pm_.c:277
msgid ""
"Printerdrake is able to auto-detect your locally connected parallel and USB "
"printers for you, but note that on some systems the auto-detection CAN "
-"FREEZE YOUR SYSTEM AND EVEN CORRUPT YOUR FILE SYSTEMS! So do it ON YOUR OWN "
-"RISK!\n"
+"FREEZE YOUR SYSTEM AND THIS CAN LEAD TO CORRUPTED FILE SYSTEMS! So do it ON "
+"YOUR OWN RISK!\n"
"\n"
-"For local printers auto-detection is not really necessary, because they are "
-"external devices where you can easily see on their labels which models you "
-"have, but if you really want to auto-detect them, connect them and turn them "
-"on now and click \"Yes\", otherwise click \"No\"."
+"Do you really want to get your printers auto-detected?"
msgstr ""
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:302
#, c-format
msgid "Detected %s"
msgstr ""
-#: ../../printerdrake.pm_.c:276 ../../printerdrake.pm_.c:303
-#: ../../printerdrake.pm_.c:319
+#: ../../printerdrake.pm_.c:306 ../../printerdrake.pm_.c:333
+#: ../../printerdrake.pm_.c:349
#, c-format
msgid "Printer on parallel port \\/*%s"
msgstr ""
-#: ../../printerdrake.pm_.c:278 ../../printerdrake.pm_.c:305
-#: ../../printerdrake.pm_.c:324
+#: ../../printerdrake.pm_.c:308 ../../printerdrake.pm_.c:335
+#: ../../printerdrake.pm_.c:354
#, c-format
msgid "USB printer \\/*%s"
msgstr ""
-#: ../../printerdrake.pm_.c:389
+#: ../../printerdrake.pm_.c:422
msgid ""
"No local printer found! To manually install a printer enter a device name/"
"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -5848,130 +5877,128 @@ msgid ""
"printer: /dev/usb/lp1, ...)."
msgstr ""
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:426
msgid "You must enter a device or file name!"
msgstr ""
-#: ../../printerdrake.pm_.c:403
+#: ../../printerdrake.pm_.c:436
msgid "No local printer found!"
msgstr ""
-#: ../../printerdrake.pm_.c:409
-#, c-format
-msgid "Detected %s, do you want to set it up?"
+#: ../../printerdrake.pm_.c:447
+msgid ""
+"The following printer was auto-detected, if it is not the one you want to "
+"configure, enter a device name/file name in the input line"
msgstr ""
-#: ../../printerdrake.pm_.c:416 ../../printerdrake.pm_.c:419
-msgid "Here is a list of all auto-detected printers. "
+#: ../../printerdrake.pm_.c:448
+msgid ""
+"Here is a list of all auto-detected printers. Please choose the printer you "
+"want to set up or enter a device name/file name in the input line"
msgstr ""
-#: ../../printerdrake.pm_.c:417
+#: ../../printerdrake.pm_.c:450
msgid ""
-"Please choose the printer you want to set up or enter a device name/file "
-"name in the input line"
+"The following printer was auto-detected. The configuration of the printer "
+"will work fully automatically. If your printer was not correctly detected or "
+"if you prefer a customized printer configuration, turn on \"Manual "
+"configuration\"."
msgstr ""
-#: ../../printerdrake.pm_.c:420
-msgid "Please choose the printer you want to set up."
+#: ../../printerdrake.pm_.c:451
+msgid ""
+"Here is a list of all auto-detected printers. Please choose the printer you "
+"want to set up. The configuration of the printer will work fully "
+"automatically. If your printer was not correctly detected or if you prefer a "
+"customized printer configuration, turn on \"Manual configuration\"."
msgstr ""
-#: ../../printerdrake.pm_.c:422
+#: ../../printerdrake.pm_.c:453
msgid ""
"Please choose the port where your printer is connected to or enter a device "
"name/file name in the input line"
msgstr ""
-#: ../../printerdrake.pm_.c:423
+#: ../../printerdrake.pm_.c:454
msgid "Please choose the port where your printer is connected to."
msgstr ""
-#: ../../printerdrake.pm_.c:425
+#: ../../printerdrake.pm_.c:456
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
msgstr ""
-#: ../../printerdrake.pm_.c:430
+#: ../../printerdrake.pm_.c:461
msgid "You must choose/enter a printer/device!"
msgstr ""
-#: ../../printerdrake.pm_.c:469
-msgid "Installing HPOJ package..."
+#: ../../printerdrake.pm_.c:481
+msgid "Manual configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:487
-msgid "Installing SANE package..."
+#: ../../printerdrake.pm_.c:503
+msgid ""
+"Is your printer a multi-function device from HP (OfficeJet, PSC, PhotoSmart "
+"LaserJet 1100/1200/1220/3200 with scanner)?"
msgstr ""
-#: ../../printerdrake.pm_.c:493 ../../printerdrake.pm_.c:499
-msgid "Scanning on your HP multi-function device"
+#: ../../printerdrake.pm_.c:517
+msgid "Installing HPOJ package..."
msgstr ""
-#: ../../printerdrake.pm_.c:494
-#, c-format
-msgid ""
-"Your HP multi-function device was configured automatically to be able to "
-"scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify "
-"the scanner when you have more than one) from the command line or with the "
-"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
-"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
-"\" menu. Call also \"man scanimage\" and \"man sane-hp\" on the command line "
-"to get more information.\n"
-"Do not use \"scannerdrake\" for this device!"
+#: ../../printerdrake.pm_.c:522
+msgid "Checking device and configuring HPOJ ..."
msgstr ""
-#: ../../printerdrake.pm_.c:500
-#, c-format
-msgid ""
-"Your HP multi-function device was configured automatically to be able to "
-"scan. Now you can scan from the command line with \"ptal-hp %s scan ...\". "
-"Scanning via a graphical interface or from the GIMP is not supported yet for "
-"your device. More information you will find in the \"/usr/share/doc/hpoj-0.8/"
-"ptal-hp-scan.html\" on your system. If you have an HP LaserJet 1100 or 1200 "
-"you can only scan when you have the scanner option installed.\n"
-"Do not use \"scannerdrake\" for this device!"
+#: ../../printerdrake.pm_.c:540
+msgid "Installing SANE package..."
msgstr ""
-#: ../../printerdrake.pm_.c:515
+#: ../../printerdrake.pm_.c:552
+msgid "Scanning on your HP multi-function device"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:569
msgid "Making printer port available for CUPS ..."
msgstr ""
-#: ../../printerdrake.pm_.c:525 ../../printerdrake.pm_.c:950
-#: ../../printerdrake.pm_.c:1043
+#: ../../printerdrake.pm_.c:579 ../../printerdrake.pm_.c:1005
+#: ../../printerdrake.pm_.c:1098
msgid "Reading printer database ..."
msgstr ""
-#: ../../printerdrake.pm_.c:579
+#: ../../printerdrake.pm_.c:633
msgid "Remote lpd Printer Options"
msgstr ""
-#: ../../printerdrake.pm_.c:580
+#: ../../printerdrake.pm_.c:634
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
"server and the printer name on that server."
msgstr ""
-#: ../../printerdrake.pm_.c:581
+#: ../../printerdrake.pm_.c:635
msgid "Remote host name"
msgstr ""
-#: ../../printerdrake.pm_.c:582
+#: ../../printerdrake.pm_.c:636
msgid "Remote printer name"
msgstr ""
-#: ../../printerdrake.pm_.c:585
+#: ../../printerdrake.pm_.c:639
msgid "Remote host name missing!"
msgstr ""
-#: ../../printerdrake.pm_.c:589
+#: ../../printerdrake.pm_.c:643
msgid "Remote printer name missing!"
msgstr ""
-#: ../../printerdrake.pm_.c:657
+#: ../../printerdrake.pm_.c:711
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr ""
-#: ../../printerdrake.pm_.c:658
+#: ../../printerdrake.pm_.c:712
msgid ""
"To print to a SMB printer, you need to provide the SMB host name (Note! It "
"may be different from its TCP/IP hostname!) and possibly the IP address of "
@@ -5979,35 +6006,35 @@ msgid ""
"access and any applicable user name, password, and workgroup information."
msgstr ""
-#: ../../printerdrake.pm_.c:659
+#: ../../printerdrake.pm_.c:713
msgid "SMB server host"
msgstr ""
-#: ../../printerdrake.pm_.c:660
+#: ../../printerdrake.pm_.c:714
msgid "SMB server IP"
msgstr ""
-#: ../../printerdrake.pm_.c:661
+#: ../../printerdrake.pm_.c:715
msgid "Share name"
msgstr ""
-#: ../../printerdrake.pm_.c:664
+#: ../../printerdrake.pm_.c:718
msgid "Workgroup"
msgstr ""
-#: ../../printerdrake.pm_.c:671
+#: ../../printerdrake.pm_.c:725
msgid "Either the server name or the server's IP must be given!"
msgstr ""
-#: ../../printerdrake.pm_.c:675
+#: ../../printerdrake.pm_.c:729
msgid "Samba share name missing!"
msgstr ""
-#: ../../printerdrake.pm_.c:734
+#: ../../printerdrake.pm_.c:788
msgid "NetWare Printer Options"
msgstr ""
-#: ../../printerdrake.pm_.c:735
+#: ../../printerdrake.pm_.c:789
msgid ""
"To print on a NetWare printer, you need to provide the NetWare print server "
"name (Note! it may be different from its TCP/IP hostname!) as well as the "
@@ -6015,27 +6042,27 @@ msgid ""
"name and password."
msgstr ""
-#: ../../printerdrake.pm_.c:736
+#: ../../printerdrake.pm_.c:790
msgid "Printer Server"
msgstr ""
-#: ../../printerdrake.pm_.c:737
+#: ../../printerdrake.pm_.c:791
msgid "Print Queue Name"
msgstr ""
-#: ../../printerdrake.pm_.c:742
+#: ../../printerdrake.pm_.c:796
msgid "NCP server name missing!"
msgstr ""
-#: ../../printerdrake.pm_.c:746
+#: ../../printerdrake.pm_.c:800
msgid "NCP queue name missing!"
msgstr ""
-#: ../../printerdrake.pm_.c:785
+#: ../../printerdrake.pm_.c:839
msgid "TCP/Socket Printer Options"
msgstr ""
-#: ../../printerdrake.pm_.c:786
+#: ../../printerdrake.pm_.c:840
msgid ""
"To print to a TCP or socket printer, you need to provide the host name of "
"the printer and optionally the port number. On HP JetDirect servers the port "
@@ -6043,60 +6070,60 @@ msgid ""
"hardware."
msgstr ""
-#: ../../printerdrake.pm_.c:787
+#: ../../printerdrake.pm_.c:841
msgid "Printer host name"
msgstr ""
-#: ../../printerdrake.pm_.c:791
+#: ../../printerdrake.pm_.c:845
msgid "Printer host name missing!"
msgstr ""
-#: ../../printerdrake.pm_.c:820 ../../printerdrake.pm_.c:822
+#: ../../printerdrake.pm_.c:874 ../../printerdrake.pm_.c:876
msgid "Printer Device URI"
msgstr ""
-#: ../../printerdrake.pm_.c:821
+#: ../../printerdrake.pm_.c:875
msgid ""
"You can specify directly the URI to access the printer. The URI must fulfill "
"either the CUPS or the Foomatic specifications. Note that not all URI types "
"are supported by all the spoolers."
msgstr ""
-#: ../../printerdrake.pm_.c:836
+#: ../../printerdrake.pm_.c:890
msgid "A valid URI must be entered!"
msgstr ""
-#: ../../printerdrake.pm_.c:936
+#: ../../printerdrake.pm_.c:991
msgid ""
"Every printer needs a name (for example \"printer\"). The Description and "
"Location fields do not need to be filled in. They are comments for the users."
msgstr ""
-#: ../../printerdrake.pm_.c:937
+#: ../../printerdrake.pm_.c:992
msgid "Name of printer"
msgstr ""
-#: ../../printerdrake.pm_.c:938
+#: ../../printerdrake.pm_.c:993
msgid "Description"
msgstr ""
-#: ../../printerdrake.pm_.c:939
+#: ../../printerdrake.pm_.c:994
msgid "Location"
msgstr ""
-#: ../../printerdrake.pm_.c:953
+#: ../../printerdrake.pm_.c:1008
msgid "Preparing printer database ..."
msgstr ""
-#: ../../printerdrake.pm_.c:1050
+#: ../../printerdrake.pm_.c:1105
msgid "Printer model selection"
msgstr ""
-#: ../../printerdrake.pm_.c:1051
+#: ../../printerdrake.pm_.c:1106
msgid "Which printer model do you have?"
msgstr ""
-#: ../../printerdrake.pm_.c:1052
+#: ../../printerdrake.pm_.c:1107
msgid ""
"\n"
"\n"
@@ -6105,11 +6132,11 @@ msgid ""
"standing on a wrong model or on \"Raw printer\"."
msgstr ""
-#: ../../printerdrake.pm_.c:1128
+#: ../../printerdrake.pm_.c:1183
msgid "OKI winprinter configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:1129
+#: ../../printerdrake.pm_.c:1184
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
"use a very special communication protocol and therefore they work only when "
@@ -6119,11 +6146,11 @@ msgid ""
"not work. Your connection type setting will be ignored by the driver."
msgstr ""
-#: ../../printerdrake.pm_.c:1172 ../../printerdrake.pm_.c:1199
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:1254
msgid "Lexmark inkjet configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:1173
+#: ../../printerdrake.pm_.c:1228
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
"no printers on remote machines or print server boxes. Please connect your "
@@ -6131,7 +6158,7 @@ msgid ""
"to."
msgstr ""
-#: ../../printerdrake.pm_.c:1200
+#: ../../printerdrake.pm_.c:1255
msgid ""
"To be able to print with your Lexmark inkjet and this configuration, you "
"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
@@ -6144,7 +6171,7 @@ msgid ""
"program."
msgstr ""
-#: ../../printerdrake.pm_.c:1409
+#: ../../printerdrake.pm_.c:1464
msgid ""
"Printer default settings\n"
"\n"
@@ -6154,33 +6181,33 @@ msgid ""
"printout quality/resolution printing can get substantially slower."
msgstr ""
-#: ../../printerdrake.pm_.c:1418
+#: ../../printerdrake.pm_.c:1473
#, c-format
msgid "Option %s must be an integer number!"
msgstr ""
-#: ../../printerdrake.pm_.c:1422
+#: ../../printerdrake.pm_.c:1477
#, c-format
msgid "Option %s must be a number!"
msgstr ""
-#: ../../printerdrake.pm_.c:1427
+#: ../../printerdrake.pm_.c:1482
#, c-format
msgid "Option %s out of range!"
msgstr ""
-#: ../../printerdrake.pm_.c:1464
+#: ../../printerdrake.pm_.c:1519
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
"as the default printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:1480
+#: ../../printerdrake.pm_.c:1536
msgid "Test pages"
msgstr ""
-#: ../../printerdrake.pm_.c:1481
+#: ../../printerdrake.pm_.c:1537
msgid ""
"Please select the test pages you want to print.\n"
"Note: the photo test page can take a rather long time to get printed and on "
@@ -6188,35 +6215,39 @@ msgid ""
"it is enough to print the standard test page."
msgstr ""
-#: ../../printerdrake.pm_.c:1484
+#: ../../printerdrake.pm_.c:1541
msgid "No test pages"
msgstr ""
-#: ../../printerdrake.pm_.c:1485
+#: ../../printerdrake.pm_.c:1542
msgid "Print"
msgstr ""
-#: ../../printerdrake.pm_.c:1487
+#: ../../printerdrake.pm_.c:1544
msgid "Standard test page"
msgstr ""
-#: ../../printerdrake.pm_.c:1490
+#: ../../printerdrake.pm_.c:1547
msgid "Alternative test page (Letter)"
msgstr ""
-#: ../../printerdrake.pm_.c:1493
+#: ../../printerdrake.pm_.c:1550
msgid "Alternative test page (A4)"
msgstr ""
-#: ../../printerdrake.pm_.c:1495
+#: ../../printerdrake.pm_.c:1552
msgid "Photo test page"
msgstr ""
-#: ../../printerdrake.pm_.c:1501 ../../printerdrake.pm_.c:1632
+#: ../../printerdrake.pm_.c:1556
+msgid "Do not print any test page"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1564 ../../printerdrake.pm_.c:1703
msgid "Printing test page(s)..."
msgstr ""
-#: ../../printerdrake.pm_.c:1526
+#: ../../printerdrake.pm_.c:1589
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -6226,21 +6257,21 @@ msgid ""
"\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1530
+#: ../../printerdrake.pm_.c:1593
msgid ""
"Test page(s) have been sent to the printer.\n"
"It may take some time before the printer starts.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1537
+#: ../../printerdrake.pm_.c:1600
msgid "Did it work properly?"
msgstr ""
-#: ../../printerdrake.pm_.c:1557 ../../printerdrake.pm_.c:2450
+#: ../../printerdrake.pm_.c:1620 ../../printerdrake.pm_.c:2600
msgid "Raw printer"
msgstr ""
-#: ../../printerdrake.pm_.c:1568
+#: ../../printerdrake.pm_.c:1641
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -6249,15 +6280,15 @@ msgid ""
"to modify the option settings easily.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1570
+#: ../../printerdrake.pm_.c:1643
msgid ""
"These commands you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications, but here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1573 ../../printerdrake.pm_.c:1589
-#: ../../printerdrake.pm_.c:1601
+#: ../../printerdrake.pm_.c:1646 ../../printerdrake.pm_.c:1662
+#: ../../printerdrake.pm_.c:1672
#, c-format
msgid ""
"\n"
@@ -6266,49 +6297,49 @@ msgid ""
"line, e. g. \"%s <file>\". "
msgstr ""
-#: ../../printerdrake.pm_.c:1576 ../../printerdrake.pm_.c:1619
+#: ../../printerdrake.pm_.c:1649 ../../printerdrake.pm_.c:1688
+#, c-format
msgid ""
-"To get a list of the options available for the current printer read either "
-"the list shown below or click on the \"Print option list\" button.\n"
+"To know about the options available for the current printer read either the "
+"list shown below or click on the \"Print option list\" button.%s\n"
"\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1579
+#: ../../printerdrake.pm_.c:1652
msgid ""
-"Here is a list of the available options for the current printer:\n"
+"Here is a list of the available printing options for the current printer:\n"
"\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1584 ../../printerdrake.pm_.c:1596
+#: ../../printerdrake.pm_.c:1657 ../../printerdrake.pm_.c:1667
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\".\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1586 ../../printerdrake.pm_.c:1598
-#: ../../printerdrake.pm_.c:1610
+#: ../../printerdrake.pm_.c:1659 ../../printerdrake.pm_.c:1669
+#: ../../printerdrake.pm_.c:1679
msgid ""
"This command you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications. But here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1591 ../../printerdrake.pm_.c:1603
+#: ../../printerdrake.pm_.c:1664 ../../printerdrake.pm_.c:1674
msgid ""
"To get a list of the options available for the current printer click on the "
-"\"Print option list\" button.\n"
-"\n"
+"\"Print option list\" button."
msgstr ""
-#: ../../printerdrake.pm_.c:1608
+#: ../../printerdrake.pm_.c:1677
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\" or \"%s <file>\".\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1612
+#: ../../printerdrake.pm_.c:1681
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
"handling printing jobs.\n"
@@ -6318,7 +6349,7 @@ msgid ""
"jams.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1616
+#: ../../printerdrake.pm_.c:1685
#, c-format
msgid ""
"\n"
@@ -6327,26 +6358,58 @@ msgid ""
"line, e. g. \"%s <file>\".\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1627 ../../printerdrake.pm_.c:1637
+#: ../../printerdrake.pm_.c:1697 ../../printerdrake.pm_.c:1709
+#, c-format
+msgid "Printing/Scanning on \"%s\""
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1698 ../../printerdrake.pm_.c:1710
#, c-format
msgid "Printing on the printer \"%s\""
msgstr ""
-#: ../../printerdrake.pm_.c:1629
+#: ../../printerdrake.pm_.c:1700
msgid "Print option list"
msgstr ""
-#: ../../printerdrake.pm_.c:1654 ../../printerdrake.pm_.c:2046
-#: ../../printerdrake.pm_.c:2281 ../../standalone/printerdrake_.c:49
+#: ../../printerdrake.pm_.c:1722
+#, c-format
+msgid ""
+"Your HP multi-function device was configured automatically to be able to "
+"scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify "
+"the scanner when you have more than one) from the command line or with the "
+"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
+"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
+"\" menu. Call also \"man scanimage\" and \"man sane-hp\" on the command line "
+"to get more information.\n"
+"\n"
+"Do not use \"scannerdrake\" for this device!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1728
+#, c-format
+msgid ""
+"Your HP multi-function device was configured automatically to be able to "
+"scan. Now you can scan from the command line with \"ptal-hp %s scan ...\". "
+"Scanning via a graphical interface or from the GIMP is not supported yet for "
+"your device. More information you will find in the \"/usr/share/doc/hpoj-0.8/"
+"ptal-hp-scan.html\" file on your system. If you have an HP LaserJet 1100 or "
+"1200 you can only scan when you have the scanner option installed.\n"
+"\n"
+"Do not use \"scannerdrake\" for this device!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1750 ../../printerdrake.pm_.c:2157
+#: ../../printerdrake.pm_.c:2392 ../../standalone/printerdrake_.c:49
msgid "Reading printer data ..."
msgstr ""
-#: ../../printerdrake.pm_.c:1674 ../../printerdrake.pm_.c:1702
-#: ../../printerdrake.pm_.c:1737
+#: ../../printerdrake.pm_.c:1770 ../../printerdrake.pm_.c:1798
+#: ../../printerdrake.pm_.c:1833
msgid "Transfer printer configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:1675
+#: ../../printerdrake.pm_.c:1771
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -6356,51 +6419,51 @@ msgid ""
"Not all queues can be transferred due to the following reasons:\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1678
+#: ../../printerdrake.pm_.c:1774
msgid ""
"CUPS does not support printers on Novell servers or printers sending the "
"data into a free-formed command.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1680
+#: ../../printerdrake.pm_.c:1776
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
"printers.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1682
+#: ../../printerdrake.pm_.c:1778
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr ""
-#: ../../printerdrake.pm_.c:1684
+#: ../../printerdrake.pm_.c:1780
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
"cannot be transferred."
msgstr ""
-#: ../../printerdrake.pm_.c:1685
+#: ../../printerdrake.pm_.c:1781
msgid ""
"\n"
"Also printers configured with the PPD files provided by their manufacturers "
"or with native CUPS drivers cannot be transferred."
msgstr ""
-#: ../../printerdrake.pm_.c:1686
+#: ../../printerdrake.pm_.c:1782
msgid ""
"\n"
"Mark the printers which you want to transfer and click \n"
"\"Transfer\"."
msgstr ""
-#: ../../printerdrake.pm_.c:1689
+#: ../../printerdrake.pm_.c:1785
msgid "Do not transfer printers"
msgstr ""
-#: ../../printerdrake.pm_.c:1690 ../../printerdrake.pm_.c:1707
+#: ../../printerdrake.pm_.c:1786 ../../printerdrake.pm_.c:1803
msgid "Transfer"
msgstr ""
-#: ../../printerdrake.pm_.c:1703
+#: ../../printerdrake.pm_.c:1799
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -6408,56 +6471,56 @@ msgid ""
"You can also type a new name or skip this printer."
msgstr ""
-#: ../../printerdrake.pm_.c:1711
+#: ../../printerdrake.pm_.c:1807
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr ""
-#: ../../printerdrake.pm_.c:1716
+#: ../../printerdrake.pm_.c:1812
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
"do you really want to overwrite its configuration?"
msgstr ""
-#: ../../printerdrake.pm_.c:1724
+#: ../../printerdrake.pm_.c:1820
msgid "New printer name"
msgstr ""
-#: ../../printerdrake.pm_.c:1727
+#: ../../printerdrake.pm_.c:1823
#, c-format
msgid "Transferring %s ..."
msgstr ""
-#: ../../printerdrake.pm_.c:1738
+#: ../../printerdrake.pm_.c:1834
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
"the default printer under the new printing system %s?"
msgstr ""
-#: ../../printerdrake.pm_.c:1747
+#: ../../printerdrake.pm_.c:1843
msgid "Refreshing printer data ..."
msgstr ""
-#: ../../printerdrake.pm_.c:1755 ../../printerdrake.pm_.c:1814
-#: ../../printerdrake.pm_.c:1826
+#: ../../printerdrake.pm_.c:1851 ../../printerdrake.pm_.c:1914
+#: ../../printerdrake.pm_.c:1926
msgid "Configuration of a remote printer"
msgstr ""
-#: ../../printerdrake.pm_.c:1756
+#: ../../printerdrake.pm_.c:1852
msgid "Starting network ..."
msgstr ""
-#: ../../printerdrake.pm_.c:1778 ../../printerdrake.pm_.c:1782
-#: ../../printerdrake.pm_.c:1784
+#: ../../printerdrake.pm_.c:1878 ../../printerdrake.pm_.c:1882
+#: ../../printerdrake.pm_.c:1884
msgid "Configure the network now"
msgstr ""
-#: ../../printerdrake.pm_.c:1779
+#: ../../printerdrake.pm_.c:1879
msgid "Network functionality not configured"
msgstr ""
-#: ../../printerdrake.pm_.c:1780
+#: ../../printerdrake.pm_.c:1880
msgid ""
"You are going to configure a remote printer. This needs working network "
"access, but your network is not configured yet. If you go on without network "
@@ -6465,11 +6528,11 @@ msgid ""
"configuring now. How do you want to proceed?"
msgstr ""
-#: ../../printerdrake.pm_.c:1783
+#: ../../printerdrake.pm_.c:1883
msgid "Go on without configuring the network"
msgstr ""
-#: ../../printerdrake.pm_.c:1816
+#: ../../printerdrake.pm_.c:1916
msgid ""
"The network configuration done during the installation cannot be started "
"now. Please check whether the network gets accessable after booting your "
@@ -6479,31 +6542,31 @@ msgid ""
"\"Printer\""
msgstr ""
-#: ../../printerdrake.pm_.c:1817
+#: ../../printerdrake.pm_.c:1917
msgid ""
"The network access was not running and could not be started. Please check "
"your configuration and your hardware. Then try to configure your remote "
"printer again."
msgstr ""
-#: ../../printerdrake.pm_.c:1827
+#: ../../printerdrake.pm_.c:1927
msgid "Restarting printing system ..."
msgstr ""
-#: ../../printerdrake.pm_.c:1859
+#: ../../printerdrake.pm_.c:1965
msgid "high"
msgstr ""
-#: ../../printerdrake.pm_.c:1859
+#: ../../printerdrake.pm_.c:1965
msgid "paranoid"
msgstr ""
-#: ../../printerdrake.pm_.c:1860
+#: ../../printerdrake.pm_.c:1966
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr ""
-#: ../../printerdrake.pm_.c:1861
+#: ../../printerdrake.pm_.c:1967
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
@@ -6518,11 +6581,11 @@ msgid ""
"Do you really want to configure printing on this machine?"
msgstr ""
-#: ../../printerdrake.pm_.c:1888
+#: ../../printerdrake.pm_.c:1999
msgid "Starting the printing system at boot time"
msgstr ""
-#: ../../printerdrake.pm_.c:1889
+#: ../../printerdrake.pm_.c:2000
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -6536,145 +6599,141 @@ msgid ""
"again?"
msgstr ""
-#: ../../printerdrake.pm_.c:1912 ../../printerdrake.pm_.c:1940
-#: ../../printerdrake.pm_.c:1970 ../../printerdrake.pm_.c:2003
-#: ../../printerdrake.pm_.c:2095
+#: ../../printerdrake.pm_.c:2023 ../../printerdrake.pm_.c:2051
+#: ../../printerdrake.pm_.c:2081 ../../printerdrake.pm_.c:2114
+#: ../../printerdrake.pm_.c:2206
msgid "Checking installed software..."
msgstr ""
-#: ../../printerdrake.pm_.c:1944
+#: ../../printerdrake.pm_.c:2055
msgid "Removing LPRng..."
msgstr ""
-#: ../../printerdrake.pm_.c:1974
+#: ../../printerdrake.pm_.c:2085
msgid "Removing LPD..."
msgstr ""
-#: ../../printerdrake.pm_.c:2032
+#: ../../printerdrake.pm_.c:2143
msgid "Select Printer Spooler"
msgstr ""
-#: ../../printerdrake.pm_.c:2033
+#: ../../printerdrake.pm_.c:2144
msgid "Which printing system (spooler) do you want to use?"
msgstr ""
-#: ../../printerdrake.pm_.c:2064
+#: ../../printerdrake.pm_.c:2175
#, c-format
msgid "Configuring printer \"%s\" ..."
msgstr ""
-#: ../../printerdrake.pm_.c:2123 ../../printerdrake.pm_.c:2155
-#: ../../printerdrake.pm_.c:2451 ../../printerdrake.pm_.c:2518
+#: ../../printerdrake.pm_.c:2234 ../../printerdrake.pm_.c:2266
+#: ../../printerdrake.pm_.c:2601 ../../printerdrake.pm_.c:2668
msgid "Printer options"
msgstr ""
-#: ../../printerdrake.pm_.c:2132
+#: ../../printerdrake.pm_.c:2243
msgid "Preparing PrinterDrake ..."
msgstr ""
-#: ../../printerdrake.pm_.c:2162
+#: ../../printerdrake.pm_.c:2273
msgid "Would you like to configure printing?"
msgstr ""
-#: ../../printerdrake.pm_.c:2174
+#: ../../printerdrake.pm_.c:2285
msgid "Printing system: "
msgstr ""
-#: ../../printerdrake.pm_.c:2222
+#: ../../printerdrake.pm_.c:2333
msgid "Printerdrake"
msgstr ""
-#: ../../printerdrake.pm_.c:2225
+#: ../../printerdrake.pm_.c:2336
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
"it."
msgstr ""
-#: ../../printerdrake.pm_.c:2242 ../../printerdrake.pm_.c:2344
-msgid "Add a new printer"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:2251
+#: ../../printerdrake.pm_.c:2362
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr ""
-#: ../../printerdrake.pm_.c:2260
+#: ../../printerdrake.pm_.c:2371
msgid "Configure printing system"
msgstr ""
-#: ../../printerdrake.pm_.c:2265 ../../standalone/draknet_.c:278
+#: ../../printerdrake.pm_.c:2376 ../../standalone/draknet_.c:278
msgid "Normal Mode"
msgstr ""
-#: ../../printerdrake.pm_.c:2362 ../../printerdrake.pm_.c:2392
-#: ../../printerdrake.pm_.c:2581
+#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2539
+#: ../../printerdrake.pm_.c:2731
msgid "Do you want to configure another printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:2430
+#: ../../printerdrake.pm_.c:2580
msgid "Modify printer configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:2432
+#: ../../printerdrake.pm_.c:2582
#, c-format
msgid ""
"Printer %s\n"
"What do you want to modify on this printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:2436
+#: ../../printerdrake.pm_.c:2586
msgid "Do it!"
msgstr ""
-#: ../../printerdrake.pm_.c:2440 ../../printerdrake.pm_.c:2492
+#: ../../printerdrake.pm_.c:2590 ../../printerdrake.pm_.c:2642
msgid "Printer connection type"
msgstr ""
-#: ../../printerdrake.pm_.c:2441 ../../printerdrake.pm_.c:2496
+#: ../../printerdrake.pm_.c:2591 ../../printerdrake.pm_.c:2646
msgid "Printer name, description, location"
msgstr ""
-#: ../../printerdrake.pm_.c:2443 ../../printerdrake.pm_.c:2511
+#: ../../printerdrake.pm_.c:2593 ../../printerdrake.pm_.c:2661
msgid "Printer manufacturer, model, driver"
msgstr ""
-#: ../../printerdrake.pm_.c:2444 ../../printerdrake.pm_.c:2512
+#: ../../printerdrake.pm_.c:2594 ../../printerdrake.pm_.c:2662
msgid "Printer manufacturer, model"
msgstr ""
-#: ../../printerdrake.pm_.c:2453 ../../printerdrake.pm_.c:2522
+#: ../../printerdrake.pm_.c:2603 ../../printerdrake.pm_.c:2672
msgid "Set this printer as the default"
msgstr ""
-#: ../../printerdrake.pm_.c:2454 ../../printerdrake.pm_.c:2527
+#: ../../printerdrake.pm_.c:2604 ../../printerdrake.pm_.c:2677
msgid "Print test pages"
msgstr ""
-#: ../../printerdrake.pm_.c:2455 ../../printerdrake.pm_.c:2529
-msgid "Know how to print with this printer"
+#: ../../printerdrake.pm_.c:2605 ../../printerdrake.pm_.c:2679
+msgid "Know how to use this printer"
msgstr ""
-#: ../../printerdrake.pm_.c:2457 ../../printerdrake.pm_.c:2531
+#: ../../printerdrake.pm_.c:2607 ../../printerdrake.pm_.c:2681
msgid "Remove printer"
msgstr ""
-#: ../../printerdrake.pm_.c:2501
+#: ../../printerdrake.pm_.c:2651
#, c-format
msgid "Removing old printer \"%s\" ..."
msgstr ""
-#: ../../printerdrake.pm_.c:2526
+#: ../../printerdrake.pm_.c:2676
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr ""
-#: ../../printerdrake.pm_.c:2533
+#: ../../printerdrake.pm_.c:2683
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr ""
-#: ../../printerdrake.pm_.c:2535
+#: ../../printerdrake.pm_.c:2685
#, c-format
msgid "Removing printer \"%s\" ..."
msgstr ""
diff --git a/perl-install/share/po/help_xml2pm.pl b/perl-install/share/po/help_xml2pm.pl
index acef76d19..3a4793bff 100755
--- a/perl-install/share/po/help_xml2pm.pl
+++ b/perl-install/share/po/help_xml2pm.pl
@@ -140,7 +140,7 @@ sub rewrite2_ {
};
if (0) {
- } elsif (member($tree->{tag}, 'para', 'itemizedlist', 'orderedlist')) {
+ } elsif (member($tree->{tag}, 'formalpara', 'para', 'itemizedlist', 'orderedlist')) {
$text =~ s/^\s(?!\s)//;
$text =~ s/^( ?\n)+//;
$text =~ s/\s+$//;