summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2004-02-06 15:36:47 +0000
committerPablo Saratxaga <pablo@mandriva.com>2004-02-06 15:36:47 +0000
commit1b2aace3ba1348315d3d0ddc33c1b198e5715530 (patch)
tree24a61fb617a1c56de5c87ad642d7e743f0112f7c
parent4488b79761741d22801aa6711fa2e27b844b9c52 (diff)
downloaddrakx-1b2aace3ba1348315d3d0ddc33c1b198e5715530.tar
drakx-1b2aace3ba1348315d3d0ddc33c1b198e5715530.tar.gz
drakx-1b2aace3ba1348315d3d0ddc33c1b198e5715530.tar.bz2
drakx-1b2aace3ba1348315d3d0ddc33c1b198e5715530.tar.xz
drakx-1b2aace3ba1348315d3d0ddc33c1b198e5715530.zip
updated pot file
-rw-r--r--perl-install/share/po/DrakX.pot1466
-rw-r--r--perl-install/share/po/help-it.pot160
-rw-r--r--perl-install/share/po/help-zh_CN.pot4
-rwxr-xr-xperl-install/share/po/help_xml2pm.pl18
4 files changed, 778 insertions, 870 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 3fe32b2fb..0a7cbf3ef 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: 2004-02-05 19:38+0100\n"
+"POT-Creation-Date: 2004-02-06 13:09+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"
@@ -76,7 +76,7 @@ msgid ""
"plug the key again, and launch Mandrake Move again."
msgstr ""
-#: ../move/move.pm:402 help.pm:414 install_steps_interactive.pm:1299
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1299
#, c-format
msgid "Reboot"
msgstr ""
@@ -118,7 +118,7 @@ msgstr ""
msgid "Please wait, detecting and configuring devices..."
msgstr ""
-#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:214 diskdrake/interactive.pm:227 diskdrake/interactive.pm:366 diskdrake/interactive.pm:381 diskdrake/interactive.pm:502 diskdrake/interactive.pm:507 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:82 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:820 network/netconnect.pm:823 network/netconnect.pm:902 network/netconnect.pm:906 network/netconnect.pm:924 network/netconnect.pm:968 network/netconnect.pm:973 network/netconnect.pm:988 printer/printerdrake.pm:213 printer/printerdrake.pm:220 printer/printerdrake.pm:245 printer/printerdrake.pm:393 printer/printerdrake.pm:398 printer/printerdrake.pm:411 printer/printerdrake.pm:421 printer/printerdrake.pm:1048 printer/printerdrake.pm:1095 printer/printerdrake.pm:1170 printer/printerdrake.pm:1174 printer/printerdrake.pm:1345 printer/printerdrake.pm:1349 printer/printerdrake.pm:1353 printer/printerdrake.pm:1453 printer/printerdrake.pm:1457 printer/printerdrake.pm:1574 printer/printerdrake.pm:1578 printer/printerdrake.pm:1664 printer/printerdrake.pm:1751 printer/printerdrake.pm:2144 printer/printerdrake.pm:2410 printer/printerdrake.pm:2416 printer/printerdrake.pm:2833 printer/printerdrake.pm:2837 printer/printerdrake.pm:2841 printer/printerdrake.pm:3232 standalone/drakTermServ:398 standalone/drakTermServ:736 standalone/drakTermServ:748 standalone/drakTermServ:934 standalone/drakTermServ:1319 standalone/drakTermServ:1324 standalone/drakTermServ:1335 standalone/drakTermServ:1354 standalone/drakauth:36 standalone/drakbackup:766 standalone/drakbackup:879 standalone/drakbackup:1474 standalone/drakbackup:1505 standalone/drakbackup:1986 standalone/drakbackup:2158 standalone/drakbackup:2712 standalone/drakbackup:2779 standalone/drakbackup:4757 standalone/drakboot:233 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:518 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:208 standalone/drakfont:221 standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21 standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420 standalone/scannerdrake:52 standalone/scannerdrake:194 standalone/scannerdrake:253 standalone/scannerdrake:676 standalone/scannerdrake:687 standalone/scannerdrake:826 standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:94 wizards.pm:98 wizards.pm:120
+#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563 ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:214 diskdrake/interactive.pm:227 diskdrake/interactive.pm:366 diskdrake/interactive.pm:381 diskdrake/interactive.pm:502 diskdrake/interactive.pm:507 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:252 install_steps.pm:82 install_steps_interactive.pm:40 interactive/http.pm:118 interactive/http.pm:119 network/netconnect.pm:826 network/netconnect.pm:829 network/netconnect.pm:874 network/netconnect.pm:878 network/netconnect.pm:945 network/netconnect.pm:989 network/netconnect.pm:994 network/netconnect.pm:1009 printer/printerdrake.pm:213 printer/printerdrake.pm:220 printer/printerdrake.pm:245 printer/printerdrake.pm:393 printer/printerdrake.pm:398 printer/printerdrake.pm:411 printer/printerdrake.pm:421 printer/printerdrake.pm:1048 printer/printerdrake.pm:1095 printer/printerdrake.pm:1170 printer/printerdrake.pm:1174 printer/printerdrake.pm:1345 printer/printerdrake.pm:1349 printer/printerdrake.pm:1353 printer/printerdrake.pm:1453 printer/printerdrake.pm:1457 printer/printerdrake.pm:1574 printer/printerdrake.pm:1578 printer/printerdrake.pm:1664 printer/printerdrake.pm:1751 printer/printerdrake.pm:2144 printer/printerdrake.pm:2410 printer/printerdrake.pm:2416 printer/printerdrake.pm:2833 printer/printerdrake.pm:2837 printer/printerdrake.pm:2841 printer/printerdrake.pm:3232 standalone/drakTermServ:398 standalone/drakTermServ:736 standalone/drakTermServ:748 standalone/drakTermServ:934 standalone/drakTermServ:1319 standalone/drakTermServ:1324 standalone/drakTermServ:1335 standalone/drakTermServ:1354 standalone/drakauth:36 standalone/drakbackup:767 standalone/drakbackup:880 standalone/drakbackup:1461 standalone/drakbackup:1492 standalone/drakbackup:2009 standalone/drakbackup:2181 standalone/drakbackup:2735 standalone/drakbackup:2802 standalone/drakbackup:4780 standalone/drakboot:233 standalone/drakbug:267 standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:518 standalone/drakfloppy:301 standalone/drakfloppy:305 standalone/drakfloppy:311 standalone/drakfont:208 standalone/drakfont:221 standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21 standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420 standalone/scannerdrake:52 standalone/scannerdrake:194 standalone/scannerdrake:253 standalone/scannerdrake:676 standalone/scannerdrake:687 standalone/scannerdrake:826 standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:94 wizards.pm:98 wizards.pm:120
#, c-format
msgid "Error"
msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
msgid "Custom"
msgstr ""
-#: Xconfig/main.pm:113 diskdrake/dav.pm:28 install_steps_interactive.pm:83 printer/printerdrake.pm:3857 standalone/draksplash:114 standalone/harddrake2:186 standalone/logdrake:176 standalone/scannerdrake:438
+#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14 install_steps_interactive.pm:83 printer/printerdrake.pm:3857 standalone/draksplash:114 standalone/harddrake2:186 standalone/logdrake:176 standalone/scannerdrake:438
#, c-format
msgid "Quit"
msgstr ""
@@ -467,17 +467,17 @@ msgstr ""
msgid "Graphics card: %s"
msgstr ""
-#: Xconfig/resolution_and_depth.pm:288 interactive.pm:403 interactive/gtk.pm:742 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:300 interactive/newt.pm:402 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:4251 standalone/drakbackup:4283 standalone/drakbackup:4376 standalone/drakbackup:4393 standalone/drakbackup:4494 standalone/drakconnect:161 standalone/drakconnect:668 standalone/drakconnect:755 standalone/drakconnect:898 standalone/drakups:194 standalone/mousedrake:77 standalone/net_monitor:303 ugtk2.pm:412 ugtk2.pm:510 ugtk2.pm:1064 ugtk2.pm:1087
+#: Xconfig/resolution_and_depth.pm:288 interactive.pm:403 interactive/gtk.pm:742 interactive/http.pm:103 interactive/http.pm:157 interactive/newt.pm:300 interactive/newt.pm:402 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:4274 standalone/drakbackup:4306 standalone/drakbackup:4399 standalone/drakbackup:4416 standalone/drakbackup:4517 standalone/drakconnect:161 standalone/drakconnect:668 standalone/drakconnect:755 standalone/drakconnect:898 standalone/drakups:194 standalone/mousedrake:77 standalone/net_monitor:303 ugtk2.pm:412 ugtk2.pm:510 ugtk2.pm:1064 ugtk2.pm:1087
#, c-format
msgid "Ok"
msgstr ""
-#: Xconfig/resolution_and_depth.pm:288 any.pm:850 diskdrake/smbnfs_gtk.pm:81 help.pm:192 help.pm:453 install_steps_gtk.pm:500 install_steps_interactive.pm:779 interactive.pm:404 interactive/gtk.pm:746 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299 interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:2911 standalone/drakautoinst:200 standalone/drakbackup:4215 standalone/drakbackup:4242 standalone/drakbackup:4267 standalone/drakbackup:4300 standalone/drakbackup:4326 standalone/drakbackup:4352 standalone/drakbackup:4409 standalone/drakbackup:4435 standalone/drakbackup:4465 standalone/drakbackup:4489 standalone/drakconnect:160 standalone/drakconnect:753 standalone/drakconnect:907 standalone/drakfont:657 standalone/drakfont:734 standalone/drakups:201 standalone/logdrake:176 standalone/mousedrake:76 standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1064
+#: Xconfig/resolution_and_depth.pm:288 any.pm:850 diskdrake/smbnfs_gtk.pm:81 help.pm:197 help.pm:457 install_steps_gtk.pm:500 install_steps_interactive.pm:779 interactive.pm:404 interactive/gtk.pm:746 interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:299 interactive/newt.pm:406 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:2911 standalone/drakautoinst:200 standalone/drakbackup:4238 standalone/drakbackup:4265 standalone/drakbackup:4290 standalone/drakbackup:4323 standalone/drakbackup:4349 standalone/drakbackup:4375 standalone/drakbackup:4432 standalone/drakbackup:4458 standalone/drakbackup:4488 standalone/drakbackup:4512 standalone/drakconnect:160 standalone/drakconnect:753 standalone/drakconnect:907 standalone/drakfont:657 standalone/drakfont:734 standalone/drakups:201 standalone/logdrake:176 standalone/mousedrake:76 standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1064
#, c-format
msgid "Cancel"
msgstr ""
-#: Xconfig/resolution_and_depth.pm:288 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:278 install_steps_gtk.pm:680 interactive.pm:498 interactive/gtk.pm:629 interactive/gtk.pm:631 standalone/drakTermServ:316 standalone/drakbackup:4212 standalone/drakbackup:4239 standalone/drakbackup:4264 standalone/drakbackup:4297 standalone/drakbackup:4323 standalone/drakbackup:4349 standalone/drakbackup:4390 standalone/drakbackup:4406 standalone/drakbackup:4432 standalone/drakbackup:4461 standalone/drakbackup:4486 standalone/drakbackup:4511 standalone/drakbug:157 standalone/drakconnect:156 standalone/drakconnect:222 standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:283 standalone/harddrake2:185 ugtk2.pm:1172 ugtk2.pm:1173
+#: Xconfig/resolution_and_depth.pm:288 diskdrake/hd_gtk.pm:154 install_steps_gtk.pm:278 install_steps_gtk.pm:680 interactive.pm:498 interactive/gtk.pm:629 interactive/gtk.pm:631 standalone/drakTermServ:316 standalone/drakbackup:4235 standalone/drakbackup:4262 standalone/drakbackup:4287 standalone/drakbackup:4320 standalone/drakbackup:4346 standalone/drakbackup:4372 standalone/drakbackup:4413 standalone/drakbackup:4429 standalone/drakbackup:4455 standalone/drakbackup:4484 standalone/drakbackup:4509 standalone/drakbackup:4534 standalone/drakbug:157 standalone/drakconnect:156 standalone/drakconnect:222 standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:283 standalone/harddrake2:185 ugtk2.pm:1172 ugtk2.pm:1173
#, c-format
msgid "Help"
msgstr ""
@@ -647,7 +647,7 @@ msgid ""
"On which drive are you booting?"
msgstr ""
-#: any.pm:160 any.pm:192
+#: any.pm:160 any.pm:192 help.pm:800
#, c-format
msgid "First sector of drive (MBR)"
msgstr ""
@@ -662,7 +662,7 @@ msgstr ""
msgid "On Floppy"
msgstr ""
-#: any.pm:165 help.pm:729 printer/printerdrake.pm:3229
+#: any.pm:165 help.pm:768 help.pm:800 printer/printerdrake.pm:3229
#, c-format
msgid "Skip"
msgstr ""
@@ -697,7 +697,7 @@ msgstr ""
msgid "Boot Style Configuration"
msgstr ""
-#: any.pm:209 any.pm:243 help.pm:729
+#: any.pm:209 any.pm:243 help.pm:768
#, c-format
msgid "Bootloader to use"
msgstr ""
@@ -707,7 +707,7 @@ msgstr ""
msgid "Bootloader installation"
msgstr ""
-#: any.pm:213 any.pm:245 help.pm:729
+#: any.pm:213 any.pm:245 help.pm:768
#, c-format
msgid "Boot device"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Delay before booting default image"
msgstr ""
-#: any.pm:218
+#: any.pm:218 help.pm:768
#, c-format
msgid "Enable ACPI"
msgstr ""
@@ -742,7 +742,7 @@ msgstr ""
msgid "Force No APIC"
msgstr ""
-#: any.pm:221 any.pm:545 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1155 network/netconnect.pm:479 printer/printerdrake.pm:1336 printer/printerdrake.pm:1450 standalone/drakbackup:1972 standalone/drakbackup:3820 standalone/drakconnect:850 standalone/drakconnect:878 standalone/drakups:278
+#: any.pm:221 any.pm:545 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1155 network/netconnect.pm:485 printer/printerdrake.pm:1336 printer/printerdrake.pm:1450 standalone/drakbackup:1995 standalone/drakbackup:3843 standalone/drakconnect:850 standalone/drakconnect:878 standalone/drakups:278
#, c-format
msgid "Password"
msgstr ""
@@ -892,7 +892,7 @@ msgstr ""
msgid "Which type of entry do you want to add?"
msgstr ""
-#: any.pm:342 standalone/drakbackup:1886
+#: any.pm:342 standalone/drakbackup:1909
#, c-format
msgid "Linux"
msgstr ""
@@ -991,12 +991,12 @@ msgid ""
"%s"
msgstr ""
-#: any.pm:531 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:534 interactive/http.pm:152 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:3857 standalone/drakbackup:3067 standalone/scannerdrake:629 standalone/scannerdrake:779
+#: any.pm:531 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158 diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544 interactive/http.pm:152 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:3857 standalone/drakbackup:3090 standalone/scannerdrake:629 standalone/scannerdrake:779
#, c-format
msgid "Done"
msgstr ""
-#: any.pm:532 help.pm:51
+#: any.pm:532 help.pm:52
#, c-format
msgid "Accept user"
msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
msgid "Real name"
msgstr ""
-#: any.pm:544 help.pm:51 printer/printerdrake.pm:1335 printer/printerdrake.pm:1449
+#: any.pm:544 help.pm:52 printer/printerdrake.pm:1335 printer/printerdrake.pm:1449
#, c-format
msgid "User name"
msgstr ""
@@ -1031,7 +1031,7 @@ msgstr ""
msgid "I can set up your computer to automatically log on one user."
msgstr ""
-#: any.pm:592 help.pm:51
+#: any.pm:592 help.pm:52
#, c-format
msgid "Do you want to use this feature?"
msgstr ""
@@ -1059,17 +1059,17 @@ msgid ""
"when your installation is complete and you restart your system."
msgstr ""
-#: any.pm:637 help.pm:634
+#: any.pm:637 help.pm:660
#, c-format
msgid "Use Unicode by default"
msgstr ""
-#: any.pm:638 help.pm:634
+#: any.pm:638 help.pm:660
#, c-format
msgid "All languages"
msgstr ""
-#: any.pm:674 help.pm:571 help.pm:951 install_steps_interactive.pm:899
+#: any.pm:674 help.pm:581 help.pm:991 install_steps_interactive.pm:899
#, c-format
msgid "Country / Region"
msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
msgid "Here is the full list of available countries"
msgstr ""
-#: any.pm:678 diskdrake/interactive.pm:289 help.pm:534 help.pm:571 help.pm:609 help.pm:951 install_steps_interactive.pm:114
+#: any.pm:678 diskdrake/interactive.pm:289 help.pm:544 help.pm:581 help.pm:621 help.pm:991 install_steps_interactive.pm:114
#, c-format
msgid "More"
msgstr ""
@@ -1233,12 +1233,12 @@ msgstr ""
msgid "SILO"
msgstr ""
-#: bootloader.pm:669 help.pm:729
+#: bootloader.pm:669 help.pm:768
#, c-format
msgid "LILO with graphical menu"
msgstr ""
-#: bootloader.pm:670 help.pm:729
+#: bootloader.pm:670 help.pm:768
#, c-format
msgid "LILO with text menu"
msgstr ""
@@ -1456,7 +1456,7 @@ msgid ""
"at the beginning of the disk"
msgstr ""
-#: diskdrake/hd_gtk.pm:156 help.pm:534
+#: diskdrake/hd_gtk.pm:156 help.pm:544
#, c-format
msgid "Wizard"
msgstr ""
@@ -1519,7 +1519,7 @@ msgstr ""
msgid "Windows"
msgstr ""
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:338 mouse.pm:158 services.pm:164 standalone/drakbackup:1929 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:338 mouse.pm:158 services.pm:164 standalone/drakbackup:1952 standalone/drakperm:250
#, c-format
msgid "Other"
msgstr ""
@@ -1574,7 +1574,7 @@ msgstr ""
msgid "Exit"
msgstr ""
-#: diskdrake/interactive.pm:240 help.pm:534
+#: diskdrake/interactive.pm:240 help.pm:544
#, c-format
msgid "Undo"
msgstr ""
@@ -1614,12 +1614,12 @@ msgstr ""
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
-#: diskdrake/interactive.pm:287 help.pm:534
+#: diskdrake/interactive.pm:287 help.pm:544
#, c-format
msgid "Clear all"
msgstr ""
-#: diskdrake/interactive.pm:288 help.pm:534
+#: diskdrake/interactive.pm:288 help.pm:544
#, c-format
msgid "Auto allocate"
msgstr ""
@@ -1644,27 +1644,27 @@ msgstr ""
msgid "To have more partitions, please delete one to be able to create an extended partition"
msgstr ""
-#: diskdrake/interactive.pm:339 help.pm:534
+#: diskdrake/interactive.pm:339 help.pm:544
#, c-format
msgid "Save partition table"
msgstr ""
-#: diskdrake/interactive.pm:340 help.pm:534
+#: diskdrake/interactive.pm:340 help.pm:544
#, c-format
msgid "Restore partition table"
msgstr ""
-#: diskdrake/interactive.pm:341 help.pm:534
+#: diskdrake/interactive.pm:341 help.pm:544
#, c-format
msgid "Rescue partition table"
msgstr ""
-#: diskdrake/interactive.pm:343 help.pm:534
+#: diskdrake/interactive.pm:343 help.pm:544
#, c-format
msgid "Reload partition table"
msgstr ""
-#: diskdrake/interactive.pm:345 help.pm:534
+#: diskdrake/interactive.pm:345
#, c-format
msgid "Removable media automounting"
msgstr ""
@@ -1681,7 +1681,7 @@ msgid ""
"Still continue?"
msgstr ""
-#: diskdrake/interactive.pm:375 harddrake/sound.pm:222 keyboard.pm:311 network/netconnect.pm:341 printer/printerdrake.pm:2150 printer/printerdrake.pm:3237 printer/printerdrake.pm:4324 standalone/drakTermServ:1043 standalone/drakTermServ:1697 standalone/drakbackup:765 standalone/drakbackup:863 standalone/drakclock:201 standalone/drakconnect:790 standalone/drakfloppy:295 standalone/drakups:27
+#: diskdrake/interactive.pm:375 harddrake/sound.pm:222 keyboard.pm:311 network/netconnect.pm:347 printer/printerdrake.pm:2150 printer/printerdrake.pm:3237 printer/printerdrake.pm:4324 standalone/drakTermServ:1043 standalone/drakTermServ:1697 standalone/drakbackup:766 standalone/drakbackup:864 standalone/drakclock:201 standalone/drakconnect:790 standalone/drakfloppy:295 standalone/drakups:27
#, c-format
msgid "Warning"
msgstr ""
@@ -2248,7 +2248,7 @@ msgstr ""
msgid "The encryption keys do not match"
msgstr ""
-#: diskdrake/interactive.pm:1253 network/netconnect.pm:862 standalone/drakconnect:353
+#: diskdrake/interactive.pm:1253 network/netconnect.pm:869 standalone/drakconnect:353
#, c-format
msgid "Encryption key"
msgstr ""
@@ -2288,7 +2288,7 @@ msgstr ""
msgid "Please enter your username, password and domain name to access this host."
msgstr ""
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3819
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3842
#, c-format
msgid "Username"
msgstr ""
@@ -2557,7 +2557,7 @@ msgstr ""
msgid "DVD-ROM"
msgstr ""
-#: harddrake/data.pm:51 standalone/drakbackup:2387
+#: harddrake/data.pm:51 standalone/drakbackup:2410
#, c-format
msgid "Tape"
msgstr ""
@@ -2597,7 +2597,7 @@ msgstr ""
msgid "Ethernetcard"
msgstr ""
-#: harddrake/data.pm:66 network/netconnect.pm:354 standalone/drakconnect:267 standalone/drakconnect:430 standalone/drakconnect:431 standalone/drakconnect:484
+#: harddrake/data.pm:66 network/netconnect.pm:360 standalone/drakconnect:267 standalone/drakconnect:430 standalone/drakconnect:431 standalone/drakconnect:484
#, c-format
msgid "Modem"
msgstr ""
@@ -2622,7 +2622,7 @@ msgstr ""
msgid "Unknown/Others"
msgstr ""
-#: harddrake/data.pm:74 help.pm:198 help.pm:951 install_steps_interactive.pm:927 printer/printerdrake.pm:676 printer/printerdrake.pm:3956
+#: harddrake/data.pm:74 help.pm:203 help.pm:991 install_steps_interactive.pm:927 printer/printerdrake.pm:676 printer/printerdrake.pm:3956
#, c-format
msgid "Printer"
msgstr ""
@@ -2632,7 +2632,7 @@ msgstr ""
msgid "Scanner"
msgstr ""
-#: harddrake/data.pm:78 help.pm:951 install_steps_interactive.pm:920
+#: harddrake/data.pm:78 help.pm:991 install_steps_interactive.pm:920
#, c-format
msgid "Mouse"
msgstr ""
@@ -2888,15 +2888,16 @@ msgstr ""
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, simply turn off your computer."
+"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
+"will reboot your computer."
msgstr ""
-#: help.pm:13 install_steps_gtk.pm:609 install_steps_interactive.pm:88 install_steps_interactive.pm:689 standalone/drakautoinst:199
+#: help.pm:14 install_steps_gtk.pm:609 install_steps_interactive.pm:88 install_steps_interactive.pm:689 standalone/drakautoinst:199
#, c-format
msgid "Accept"
msgstr ""
-#: help.pm:16
+#: help.pm:17
#, c-format
msgid ""
"GNU/Linux is a multi-user system, meaning each user may have their own\n"
@@ -2917,7 +2918,7 @@ msgid ""
"-- you can actually enter whatever you like. DrakX will use the first word\n"
"you typed in this field and copy it to the \"%s\" field, which is the name\n"
"this user will enter to log onto the system. If you like, you may override\n"
-"the default and change the username. The next step is to enter a password.\n"
+"the default and change the user name. The next step is to enter a password.\n"
"From a security point of view, a non-privileged (regular) user password is\n"
"not as crucial as the \"root\" password, but that is no reason to neglect\n"
"it by making it blank or too simple: after all, your files could be the\n"
@@ -2930,24 +2931,24 @@ msgid ""
"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
"that user (bash by default).\n"
"\n"
-"When you have finished adding users, you will be asked to choose a user\n"
-"that can automatically log into the system when the computer boots up. If\n"
-"you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"%s\".\n"
-"If you are not interested in this feature, uncheck the \"%s\" box."
+"When you have finished adding users, you will be asked to choose a user who\n"
+"can automatically log into the system when the computer boots up. If you\n"
+"are interested in that feature (and do not care much about local security),\n"
+"choose the desired user and window manager, then click \"%s\". If you are\n"
+"not interested in this feature, uncheck the \"%s\" box."
msgstr ""
-#: help.pm:51 help.pm:51 help.pm:192 help.pm:440 help.pm:660 help.pm:965 help.pm:965 install_steps_gtk.pm:286 interactive.pm:403 interactive/newt.pm:300 network/netconnect.pm:230 network/tools.pm:208 printer/printerdrake.pm:2913 standalone/drakbackup:4418 standalone/drakbackup:4444 standalone/drakbackup:4474 standalone/drakbackup:4498 ugtk2.pm:510
+#: help.pm:52 help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:1005 help.pm:1005
#, c-format
-msgid "Next"
+msgid "Next ->"
msgstr ""
-#: help.pm:51 help.pm:414 help.pm:440 help.pm:634 help.pm:702 help.pm:729 interactive.pm:371
+#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768 interactive.pm:371
#, c-format
msgid "Advanced"
msgstr ""
-#: help.pm:54
+#: help.pm:55
#, c-format
msgid ""
"Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -2981,15 +2982,15 @@ msgid ""
"\"second lowest SCSI ID\", etc."
msgstr ""
-#: help.pm:85
+#: help.pm:86
#, c-format
msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. DrakX\n"
-"knows if a selected package is located on another CD-ROM so it will eject\n"
-"the current CD and ask you to insert the correct CD as required."
+"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"selected package is located on another CD-ROM, DrakX will eject the current\n"
+"CD and ask you to insert the correct CD as required."
msgstr ""
-#: help.pm:90
+#: help.pm:91
#, c-format
msgid ""
"It is now time to specify which programs you wish to install on your\n"
@@ -2998,17 +2999,16 @@ msgid ""
"similar applications.\n"
"\n"
"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux has four predefined installations available. You\n"
-"can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various groups, so a\n"
+"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"mix and match applications from the various categories, so a\n"
"``Workstation'' installation can still have applications from the\n"
-"``Development'' group installed.\n"
+"``Development'' category installed.\n"
"\n"
" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the applications that are in the workstation group.\n"
+"more of the groups that are in the workstation category.\n"
"\n"
-" * \"%s\": if plan on using your machine for programming, choose the\n"
-"appropriate packages from that group.\n"
+" * \"%s\": if you plan on using your machine for programming, select the\n"
+"appropriate groups from that category.\n"
"\n"
" * \"%s\": if your machine is intended to be a server, select which of the\n"
"more common services you wish to install on your machine.\n"
@@ -3077,7 +3077,7 @@ msgstr ""
msgid "Individual package selection"
msgstr ""
-#: help.pm:137 help.pm:592
+#: help.pm:137 help.pm:602
#, c-format
msgid "Upgrade"
msgstr ""
@@ -3107,9 +3107,9 @@ msgid ""
"\n"
"The \"%s\" option is used to disable the warning dialog which appears\n"
"whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each other such\n"
-"that installation of a package requires that some other program is also\n"
-"rerquired to be installed. The installer can determine which packages are\n"
+"dependency issue. Some packages have relationships between each them such\n"
+"that installation of one package requires that some other program is also\n"
+"required to be installed. The installer can determine which packages are\n"
"required to satisfy a dependency to successfully complete the installation.\n"
"\n"
"The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -3120,12 +3120,12 @@ msgid ""
"create such a floppy."
msgstr ""
-#: help.pm:172 help.pm:294 help.pm:322 help.pm:453 install_any.pm:415 interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:216 ugtk2.pm:1063 wizards.pm:155
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:415 interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:216 ugtk2.pm:1063 wizards.pm:155
#, c-format
msgid "No"
msgstr ""
-#: help.pm:172 help.pm:294 help.pm:453 help.pm:453 install_any.pm:415 interactive.pm:149 modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281 standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:215 ugtk2.pm:1063 wizards.pm:155
+#: help.pm:172 help.pm:301 help.pm:457 help.pm:457 install_any.pm:415 interactive.pm:149 modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281 standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:215 ugtk2.pm:1063 wizards.pm:155
#, c-format
msgid "Yes"
msgstr ""
@@ -3140,30 +3140,35 @@ msgstr ""
msgid ""
"You will now set up your Internet/network connection. If you wish to\n"
"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to autodetect network devices and modems. If\n"
+"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
"configure the network, or to do it later, in which case clicking the \"%s\"\n"
"button will take you to the next step.\n"
"\n"
"When configuring your network, the available connections options are:\n"
-"traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
-"simple LAN connection (Ethernet).\n"
+"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
+"cable modem, and finally a simple LAN connection (Ethernet).\n"
"\n"
"We will not detail each configuration option - just make sure that you have\n"
"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
"from your Internet Service Provider or system administrator.\n"
"\n"
+"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
+"that require additional software to work compared to Normal modems. Some of\n"
+"those modems actually work under Mandrake Linux, some others do not. You\n"
+"can consult the list of supported modems at LinModems.\n"
+"\n"
"You can consult the ``Starter Guide'' chapter about Internet connections\n"
"for details about the configuration, or simply wait until your system is\n"
"installed and use the program described there to configure your connection."
msgstr ""
-#: help.pm:192
+#: help.pm:197
#, c-format
msgid "Use auto detection"
msgstr ""
-#: help.pm:195
+#: help.pm:200
#, c-format
msgid ""
"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
@@ -3172,12 +3177,12 @@ msgid ""
"similar to the one used during installation."
msgstr ""
-#: help.pm:198 help.pm:571 help.pm:951 help.pm:951 help.pm:951 help.pm:951 help.pm:951 help.pm:951 help.pm:951 install_steps_gtk.pm:659 standalone/drakbackup:2651 standalone/drakbackup:2661 standalone/drakbackup:2671 standalone/drakbackup:2681
+#: help.pm:203 help.pm:581 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 help.pm:991 install_steps_gtk.pm:659 standalone/drakbackup:2674 standalone/drakbackup:2684 standalone/drakbackup:2694 standalone/drakbackup:2704
#, c-format
msgid "Configure"
msgstr ""
-#: help.pm:201
+#: help.pm:206
#, c-format
msgid ""
"This dialog is used to choose which services you wish to start at boot\n"
@@ -3198,34 +3203,34 @@ msgid ""
"!!"
msgstr ""
-#: help.pm:219
+#: help.pm:224
#, c-format
msgid ""
"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
"local time according to the time zone you selected. If the clock on your\n"
"motherboard is set to local time, you may deactivate this by unselecting\n"
"\"%s\", which will let GNU/Linux know that the system clock and the\n"
-"hardware clock are in the same timezone. This is useful when the machine\n"
+"hardware clock are in the same time zone. This is useful when the machine\n"
"also hosts another operating system like Windows.\n"
"\n"
"The \"%s\" option will automatically regulate the clock by connecting to a\n"
"remote time server on the Internet. For this feature to work, you must have\n"
"a working Internet connection. It is best to choose a time server located\n"
-"near you. This option actually installs a time server that can used by\n"
+"near you. This option actually installs a time server that can be used by\n"
"other machines on your local network as well."
msgstr ""
-#: help.pm:230 install_steps_interactive.pm:826
+#: help.pm:235 install_steps_interactive.pm:826
#, c-format
msgid "Hardware clock set to GMT"
msgstr ""
-#: help.pm:230
+#: help.pm:235
#, c-format
msgid "Automatic time synchronization"
msgstr ""
-#: help.pm:233
+#: help.pm:238
#, c-format
msgid ""
"Graphic Card\n"
@@ -3234,12 +3239,12 @@ msgid ""
"graphic card installed on your machine. If it is not the case, you can\n"
"choose from this list the card you actually have installed.\n"
"\n"
-" In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then asked to choose the server that best\n"
-"suits your needs."
+" In the situation where different servers are available for your card,\n"
+"with or without 3D acceleration, you are asked to choose the server that\n"
+"best suits your needs."
msgstr ""
-#: help.pm:244
+#: help.pm:249
#, c-format
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
@@ -3253,9 +3258,9 @@ msgid ""
"graphic card installed on your machine. If it is not the case, you can\n"
"choose from this list the card you actually have installed.\n"
"\n"
-" In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then asked to choose the server that best\n"
-"suits your needs.\n"
+" In the situation where different servers are available for your card,\n"
+"with or without 3D acceleration, you are asked to choose the server that\n"
+"best suits your needs.\n"
"\n"
"\n"
"\n"
@@ -3272,16 +3277,18 @@ msgid ""
" Here you can choose the resolutions and color depths available for your\n"
"hardware. Choose the one that best suits your needs (you will be able to\n"
"change that after installation though). A sample of the chosen\n"
-"configuration is shown in the monitor.\n"
+"configuration is shown in the monitor picture.\n"
"\n"
"\n"
"\n"
"Test\n"
"\n"
+" Depending on your hardware, this entry might not appear.\n"
+"\n"
" the system will try to open a graphical screen at the desired\n"
"resolution. If you can see the message during the test and answer \"%s\",\n"
"then DrakX will proceed to the next step. If you cannot see the message, it\n"
-"means that some part of the autodetected configuration was incorrect and\n"
+"means that some part of the auto-detected configuration was incorrect and\n"
"the test will automatically end after 12 seconds, bringing you back to the\n"
"menu. Change settings until you get a correct graphical display.\n"
"\n"
@@ -3295,7 +3302,7 @@ msgid ""
"in getting the display configured."
msgstr ""
-#: help.pm:297
+#: help.pm:304
#, c-format
msgid ""
"Monitor\n"
@@ -3305,7 +3312,7 @@ msgid ""
"this list the monitor you actually have connected to your computer."
msgstr ""
-#: help.pm:304
+#: help.pm:311
#, c-format
msgid ""
"Resolution\n"
@@ -3313,18 +3320,18 @@ msgid ""
" Here you can choose the resolutions and color depths available for your\n"
"hardware. Choose the one that best suits your needs (you will be able to\n"
"change that after installation though). A sample of the chosen\n"
-"configuration is shown in the monitor."
+"configuration is shown in the monitor picture."
msgstr ""
-#: help.pm:312
+#: help.pm:319
#, c-format
msgid ""
-"In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then asked to choose the server that best\n"
+"In the situation where different servers are available for your card, with\n"
+"or without 3D acceleration, you are asked to choose the server that best\n"
"suits your needs."
msgstr ""
-#: help.pm:317
+#: help.pm:324
#, c-format
msgid ""
"Options\n"
@@ -3335,7 +3342,7 @@ msgid ""
"in getting the display configured."
msgstr ""
-#: help.pm:325
+#: help.pm:332
#, c-format
msgid ""
"At this point, you need to decide where you want to install the Mandrake\n"
@@ -3365,13 +3372,13 @@ msgid ""
"\n"
" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
"all the space available on it, you will have to create free space for\n"
-"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
-"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
-"partition. Resizing can be performed without the loss of any data, provided\n"
-"you have previously defragmented the Windows partition and that it uses the\n"
-"FAT format. Backing up your data is strongly recommended.. Using this\n"
-"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
-"Windows on the same computer.\n"
+"GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
+"data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
+"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
+"data, provided you have previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended.. Using this option is\n"
+"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
"procedure, the size of your Microsoft Windows partition will be smaller\n"
@@ -3395,45 +3402,45 @@ msgid ""
"easily lose all your data. That's why this option is really only\n"
"recommended if you have done something like this before and have some\n"
"experience. For more instructions on how to use the DiskDrake utility,\n"
-"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
-"Guide''."
+"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-#: help.pm:383 install_interactive.pm:95
+#: help.pm:389 install_interactive.pm:95
#, c-format
msgid "Use free space"
msgstr ""
-#: help.pm:383
+#: help.pm:389
#, c-format
msgid "Use existing partition"
msgstr ""
-#: help.pm:383 install_interactive.pm:137
+#: help.pm:389 install_interactive.pm:137
#, c-format
msgid "Use the free space on the Windows partition"
msgstr ""
-#: help.pm:383 install_interactive.pm:211
+#: help.pm:389 install_interactive.pm:211
#, c-format
msgid "Erase entire disk"
msgstr ""
-#: help.pm:383
+#: help.pm:389
#, c-format
msgid "Remove Windows"
msgstr ""
-#: help.pm:383 install_interactive.pm:226
+#: help.pm:389 install_interactive.pm:226
#, c-format
msgid "Custom disk partitioning"
msgstr ""
-#: help.pm:386
+#: help.pm:392
#, c-format
msgid ""
"There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. The first thing you\n"
+"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
+"remove the installation media (CD-ROM or floppy). The first thing you\n"
"should see after your computer has finished doing its hardware tests is the\n"
"bootloader menu, giving you the choice of which operating system to start.\n"
"\n"
@@ -3454,36 +3461,33 @@ msgid ""
" This feature is very handy when installing a number of similar machines.\n"
"See the Auto install section on our web site for more information.\n"
"\n"
-" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
-"To use this selection with another installation, insert the floppy and\n"
-"start the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<.\n"
-"\n"
-"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
-"\"mformat a:\")"
+" * \"%s\": saves a list of the packages selected in this installation. To\n"
+"use this selection with another installation, insert the floppy and start\n"
+"the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<."
msgstr ""
-#: help.pm:414
+#: help.pm:418
#, c-format
-msgid "generate auto-install floppy"
+msgid "Generate auto-install floppy"
msgstr ""
-#: help.pm:414 install_steps_interactive.pm:1309
+#: help.pm:418 install_steps_interactive.pm:1309
#, c-format
msgid "Replay"
msgstr ""
-#: help.pm:414 install_steps_interactive.pm:1309
+#: help.pm:418 install_steps_interactive.pm:1309
#, c-format
msgid "Automated"
msgstr ""
-#: help.pm:414 install_steps_interactive.pm:1312
+#: help.pm:418 install_steps_interactive.pm:1312
#, c-format
msgid "Save packages selection"
msgstr ""
-#: help.pm:417
+#: help.pm:421
#, c-format
msgid ""
"Any partitions that have been newly defined must be formatted for use\n"
@@ -3503,7 +3507,7 @@ msgid ""
"the selected partitions will be deleted and you will not be able to recover\n"
"it.\n"
"\n"
-"Click on \"%s\" when you are ready to format partitions.\n"
+"Click on \"%s\" when you are ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
"Mandrake Linux operating system installation.\n"
@@ -3512,33 +3516,33 @@ msgid ""
"bad blocks on the disk."
msgstr ""
-#: help.pm:440 help.pm:965 install_steps_gtk.pm:443 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2911 standalone/drakbackup:4219 standalone/drakbackup:4247 standalone/drakbackup:4305 standalone/drakbackup:4331 standalone/drakbackup:4357 standalone/drakbackup:4414 standalone/drakbackup:4440 standalone/drakbackup:4470 standalone/drakbackup:4494 ugtk2.pm:508
+#: help.pm:444 help.pm:1005
#, c-format
-msgid "Previous"
+msgid "<- Previous"
msgstr ""
-#: help.pm:443
+#: help.pm:447
#, c-format
msgid ""
"At the time you are installing Mandrake Linux, it is likely that some\n"
-"packages have been updated since the initial release. Bugs may have been\n"
-"fixed, security issues resolved. To allow you to benefit from these\n"
+"packages will have been updated since the initial release. Bugs may have\n"
+"been fixed, security issues resolved. To allow you to benefit from these\n"
"updates, you are now able to download them from the Internet. Check \"%s\"\n"
"if you have a working Internet connection, or \"%s\" if you prefer to\n"
"install updated packages later.\n"
"\n"
"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one nearer to you. A package-selection tree\n"
-"will appear: review the selection, and press \"%s\" to retrieve and install\n"
-"the selected package(s), or \"%s\" to abort."
+"retrieved. You should choose one near to you. A package-selection tree will\n"
+"appear: review the selection, and press \"%s\" to retrieve and install the\n"
+"selected package(s), or \"%s\" to abort."
msgstr ""
-#: help.pm:453 help.pm:592 install_steps_gtk.pm:442 install_steps_interactive.pm:148 standalone/drakbackup:4533
+#: help.pm:457 help.pm:602 install_steps_gtk.pm:442 install_steps_interactive.pm:148 standalone/drakbackup:4556
#, c-format
msgid "Install"
msgstr ""
-#: help.pm:456
+#: help.pm:460
#, c-format
msgid ""
"At this point, DrakX will allow you to choose the security level desired\n"
@@ -3547,10 +3551,21 @@ msgid ""
"directly exposed to the Internet. The trade-off of a higher security level\n"
"is generally obtained at the expense of ease of use.\n"
"\n"
-"If you do not know what to choose, stay with the default option."
+"If you do not know what to choose, stay with the default option. You will\n"
+"be able to change that security level later with tool draksec from the\n"
+"Mandrake Control Center.\n"
+"\n"
+"The \"%s\" field can inform the system of the user on this computer who\n"
+"will be responsible for security. Security messages will be sent to that\n"
+"address."
+msgstr ""
+
+#: help.pm:472
+#, c-format
+msgid "Security Administrator"
msgstr ""
-#: help.pm:465
+#: help.pm:475
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
@@ -3586,7 +3601,7 @@ msgid ""
" * \"%s\": discards all changes and reloads the partition table that was\n"
"originally on the hard drive.\n"
"\n"
-" * \"%s\": unchecking this option will force users to manually mount and\n"
+" * \"%s\": un-checking this option will force users to manually mount and\n"
"unmount removable media such as floppies and CD-ROMs.\n"
"\n"
" * \"%s\": use this option if you wish to use a wizard to partition your\n"
@@ -3625,16 +3640,21 @@ msgid ""
"emergency boot situations."
msgstr ""
-#: help.pm:534
+#: help.pm:544
+#, c-format
+msgid "Removable media auto-mounting"
+msgstr ""
+
+#: help.pm:544
#, c-format
msgid "Toggle between normal/expert mode"
msgstr ""
-#: help.pm:537
+#: help.pm:547
#, c-format
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose which one you want to resize in order to install your new\n"
+"Please choose the one which you want to resize in order to install your new\n"
"Mandrake Linux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -3664,7 +3684,7 @@ msgid ""
"disk or partition is called \"C:\")."
msgstr ""
-#: help.pm:568
+#: help.pm:578
#, c-format
msgid ""
"\"%s\": check the current country selection. If you are not in this\n"
@@ -3673,11 +3693,11 @@ msgid ""
"country list."
msgstr ""
-#: help.pm:574
+#: help.pm:584
#, c-format
msgid ""
-"This step is activated only if an old GNU/Linux partition has been found on\n"
-"your machine.\n"
+"This step is activated only if an existing GNU/Linux partition has been\n"
+"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new install or an upgrade\n"
"of an existing Mandrake Linux system:\n"
@@ -3697,17 +3717,19 @@ msgid ""
"to Mandrake Linux version \"8.1\" is not recommended."
msgstr ""
-#: help.pm:595
+#: help.pm:605
#, c-format
msgid ""
-"Depending on the default language you chose in Section , DrakX will\n"
-"automatically select a particular type of keyboard configuration. However,\n"
-"you may not have a keyboard that corresponds exactly to your language: for\n"
-"example, if you are an English speaking Swiss person, you may have a Swiss\n"
-"keyboard. Or if you speak English but are located in Quebec, you may find\n"
-"yourself in the same situation where your native language and keyboard do\n"
-"not match. In either case, this installation step will allow you to select\n"
-"an appropriate keyboard from a list.\n"
+"Depending on the language you chose in section , DrakX will automatically\n"
+"select a particular type of keyboard configuration. Check that the\n"
+"selection suits you or choose another keyboard layout.\n"
+"\n"
+"Also, you may not have a keyboard that corresponds exactly to your\n"
+"language: for example, if you are an English-speaking Swiss native, you may\n"
+"have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
+"you may find yourself in the same situation where your native language and\n"
+"country-set keyboard do not match. In either case, this installation step\n"
+"will allow you to select an appropriate keyboard from a list.\n"
"\n"
"Click on the \"%s\" button to be presented with the complete list of\n"
"supported keyboards.\n"
@@ -3717,7 +3739,7 @@ msgid ""
"keyboard between the Latin and non-Latin layouts."
msgstr ""
-#: help.pm:612
+#: help.pm:624
#, c-format
msgid ""
"Your choice of preferred language will affect the language of the\n"
@@ -3730,14 +3752,28 @@ msgid ""
"host users from Spain on your machine, select English as the default\n"
"language in the tree view and \"%s\" in the Advanced section.\n"
"\n"
+"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
+"cover all existing languages. Though full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrake Linux will be using it\n"
+"or not depending on the user choices:\n"
+"\n"
+" * If you choose a languages with a strong legacy encoding (latin1\n"
+"languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
+"iso-8859-2 languages), the legacy encoding will be used by default;\n"
+"\n"
+" * Other languages will use unicode by default;\n"
+"\n"
+" * If two or more languages are required, and those languages are not using\n"
+"the same encoding, then unicode will be used for the whole system;\n"
+"\n"
+" * Finally, unicode can also be forced for the system at user request by\n"
+"selecting option \"%s\" independently of which language(s) have been\n"
+"chosen.\n"
+"\n"
"Note that you're not limited to choosing a single additional language. You\n"
"may choose several ones, or even install them all by selecting the \"%s\"\n"
"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will be installed. Additionally, the\n"
-"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
-"however that this is an experimental feature. If you select different\n"
-"languages requiring different encoding the unicode support will be\n"
-"installed anyway.\n"
+"checkers, etc. for that language will also be installed.\n"
"\n"
"To switch between the various languages installed on the system, you can\n"
"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
@@ -3745,12 +3781,12 @@ msgid ""
"will only change the language settings for that particular user."
msgstr ""
-#: help.pm:634
+#: help.pm:660
#, c-format
msgid "Espanol"
msgstr ""
-#: help.pm:637
+#: help.pm:663
#, c-format
msgid ""
"Usually, DrakX has no problems detecting the number of buttons on your\n"
@@ -3760,6 +3796,11 @@ msgid ""
"right mouse buttons. DrakX will automatically know whether your mouse uses\n"
"a PS/2, serial or USB interface.\n"
"\n"
+"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
+"that says \"%s\". DrakX will then configure your mouse so that you can\n"
+"simulate the wheel with it: to do so, press the middle button and move your\n"
+"mouse up and down.\n"
+"\n"
"If for some reason you wish to specify a different type of mouse, select it\n"
"from the list provided.\n"
"\n"
@@ -3779,14 +3820,19 @@ msgid ""
"mouse."
msgstr ""
-#: help.pm:663
+#: help.pm:691
+#, c-format
+msgid "with Wheel emulation"
+msgstr ""
+
+#: help.pm:694
#, c-format
msgid ""
"Please select the correct port. For example, the \"COM1\" port under\n"
"Windows is named \"ttyS0\" under GNU/Linux."
msgstr ""
-#: help.pm:667
+#: help.pm:698
#, c-format
msgid ""
"This is the most crucial decision point for the security of your GNU/Linux\n"
@@ -3794,7 +3840,7 @@ msgid ""
"administrator and is the only user authorized to make updates, add users,\n"
"change the overall system configuration, and so on. In short, \"root\" can\n"
"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password that you chose too easy. As you\n"
+"guess - DrakX will tell you if the password you chose is too easy. As you\n"
"can see, you are not forced to enter a password, but we strongly advise you\n"
"against this. GNU/Linux is just as prone to operator error as any other\n"
"operating system. Since \"root\" can overcome all limitations and\n"
@@ -3823,29 +3869,29 @@ msgid ""
"one to use, you should ask your network administrator.\n"
"\n"
"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the internet or that you absolutely trust\n"
-"everybody who uses your computer, you can choose to have \"%s\"."
+"will never be connected to the Internet and you absolutely trust everybody\n"
+"who uses your computer, you can choose to have \"%s\"."
msgstr ""
-#: help.pm:702
+#: help.pm:733
#, c-format
msgid "authentication"
msgstr ""
#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:702 install_steps_interactive.pm:1146
+#: help.pm:733 install_steps_interactive.pm:1146
#, c-format
msgid "No password"
msgstr ""
-#: help.pm:705
+#: help.pm:736
#, c-format
msgid ""
"This dialog allows you to fine tune your bootloader:\n"
"\n"
" * \"%s\": there are three choices for your bootloader:\n"
"\n"
-" * \"%s\": if you prefer grub (text menu).\n"
+" * \"%s\": if you prefer GRUB (text menu).\n"
"\n"
" * \"%s\": if you prefer LILO with its text menu interface.\n"
"\n"
@@ -3859,7 +3905,15 @@ msgid ""
"given to the user at the console to select a boot entry other than the\n"
"default.\n"
"\n"
-"!! Beware that if you choose not to install a bootloader (by selecting\n"
+" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
+"management, notably for laptops. If you know your hardware supports it and\n"
+"you need it, check this box.\n"
+"\n"
+" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
+"instabilities, machine freeze, ...) you should try disabling APIC by\n"
+"checking this box.\n"
+"\n"
+"!! Be aware that if you choose not to install a bootloader (by selecting\n"
"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
"system! Be sure you know what you are doing before changing any of the\n"
"options. !!\n"
@@ -3868,32 +3922,37 @@ msgid ""
"are normally reserved for the expert user."
msgstr ""
-#: help.pm:729
+#: help.pm:768
#, c-format
msgid "GRUB"
msgstr ""
-#: help.pm:729
+#: help.pm:768
#, c-format
msgid "/dev/hda"
msgstr ""
-#: help.pm:729
+#: help.pm:768
#, c-format
msgid "/dev/hdb"
msgstr ""
-#: help.pm:729
+#: help.pm:768
#, c-format
msgid "/dev/fd0"
msgstr ""
-#: help.pm:729
+#: help.pm:768
#, c-format
msgid "Delay before booting the default image"
msgstr ""
-#: help.pm:732
+#: help.pm:768
+#, c-format
+msgid "Force no APIC"
+msgstr ""
+
+#: help.pm:771
#, c-format
msgid ""
"After you have configured the general bootloader parameters, the list of\n"
@@ -3912,49 +3971,50 @@ msgid ""
"operating systems!"
msgstr ""
-#: help.pm:745 interactive.pm:295 interactive/gtk.pm:476 standalone/drakbackup:1825 standalone/drakfont:586 standalone/drakfont:649 standalone/drakups:280 standalone/drakups:324 standalone/drakups:344
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:476 standalone/drakbackup:1848 standalone/drakfont:586 standalone/drakfont:649 standalone/drakups:280 standalone/drakups:324 standalone/drakups:344
#, c-format
msgid "Add"
msgstr ""
-#: help.pm:745 interactive.pm:295 interactive/gtk.pm:476
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:476
#, c-format
msgid "Modify"
msgstr ""
-#: help.pm:745 interactive.pm:295 interactive/gtk.pm:476 standalone/drakups:282 standalone/drakups:326 standalone/drakups:346
+#: help.pm:784 interactive.pm:295 interactive/gtk.pm:476 standalone/drakups:282 standalone/drakups:326 standalone/drakups:346
#, c-format
msgid "Remove"
msgstr ""
-#: help.pm:745 standalone/drakTermServ:217 standalone/drakTermServ:487 standalone/drakfont:572
+#: help.pm:784
#, c-format
-msgid "OK"
+msgid "Next->"
msgstr ""
-#: help.pm:748
+#: help.pm:787
#, c-format
msgid ""
-"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
+"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
"automated. DrakX will analyze the disk boot sector and act according to\n"
"what it finds there:\n"
"\n"
-" * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or another\n"
-"OS.\n"
+" * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
+"boot sector. This way you will be able to load either GNU/Linux or any\n"
+"other OS installed on your machine.\n"
"\n"
-" * if a grub or LILO boot sector is found, it will replace it with a new\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
"one.\n"
"\n"
"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader."
+"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
+"won't install any bootloader. Use it only if you know what you are doing."
msgstr ""
-#: help.pm:763
+#: help.pm:803
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing system\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
"is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -3967,7 +4027,7 @@ msgid ""
" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
"printing to your local printer or to one halfway around the planet. It is\n"
"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it compatible with older operating systems\n"
+"\"lpd \" printing system, so it is compatible with older operating systems\n"
"which may still need print services. While quite powerful, the basic setup\n"
"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
@@ -3979,17 +4039,17 @@ msgid ""
"Center and clicking the expert button."
msgstr ""
-#: help.pm:786 help.pm:786
+#: help.pm:826 help.pm:826
#, c-format
msgid "pdq"
msgstr ""
-#: help.pm:786 help.pm:786 printer/cups.pm:99 printer/data.pm:76
+#: help.pm:826 help.pm:826 printer/cups.pm:99 printer/data.pm:76
#, c-format
msgid "CUPS"
msgstr ""
-#: help.pm:789
+#: help.pm:829
#, c-format
msgid ""
"DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -4010,7 +4070,7 @@ msgid ""
"configure the driver."
msgstr ""
-#: help.pm:807
+#: help.pm:847
#, c-format
msgid ""
"You can add additional entries in yaboot for other operating systems,\n"
@@ -4034,10 +4094,10 @@ msgid ""
"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
"The following are some examples:\n"
"\n"
-" video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
+" \t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
"hda=autotune\n"
"\n"
-" video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+" \t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
"\n"
" * Initrd: this option can be used either to load initial modules before\n"
"the boot device is available, or to load a ramdisk image for an emergency\n"
@@ -4060,13 +4120,13 @@ msgid ""
"highlighted with a ``*'' if you press [Tab] to see the boot selections."
msgstr ""
-#: help.pm:854
+#: help.pm:894
#, c-format
msgid ""
"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Be careful to choose the correct\n"
+"can add an entry by hand in this screen. Take care to choose the correct\n"
"parameters.\n"
"\n"
"Yaboot's main options are:\n"
@@ -4095,7 +4155,7 @@ msgid ""
"Firmware Delay expires."
msgstr ""
-#: help.pm:886
+#: help.pm:926
#, c-format
msgid ""
"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
@@ -4104,12 +4164,12 @@ msgid ""
"driver."
msgstr ""
-#: help.pm:889 help.pm:951 install_steps_interactive.pm:954 install_steps_interactive.pm:971
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:954 install_steps_interactive.pm:971
#, c-format
msgid "Sound card"
msgstr ""
-#: help.pm:892
+#: help.pm:932
#, c-format
msgid ""
"As a review, DrakX will present a summary of information it has about your\n"
@@ -4118,7 +4178,7 @@ msgid ""
"be configured, followed by a quick summary of the current configuration.\n"
"Click on the corresponding \"%s\" button to change that.\n"
"\n"
-" * \"%s\": check the current keyboard map configuration and change that if\n"
+" * \"%s\": check the current keyboard map configuration and change it if\n"
"necessary.\n"
"\n"
" * \"%s\": check the current country selection. If you are not in this\n"
@@ -4155,7 +4215,7 @@ msgid ""
"here. You can click on \"%s\" to change the parameters associated with the\n"
"card.\n"
"\n"
-" * \"%s\": If you want to configure your Internet or local network access\n"
+" * \"%s\": If you wish to configure your Internet or local network access\n"
"now.\n"
"\n"
" * \"%s\": this entry allows you to redefine the security level as set in a\n"
@@ -4174,65 +4234,65 @@ msgid ""
"idea to review this setup."
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:110 install_steps_interactive.pm:891 standalone/keyboarddrake:23
+#: help.pm:991 install_steps_interactive.pm:110 install_steps_interactive.pm:891 standalone/keyboarddrake:23
#, c-format
msgid "Keyboard"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:913
+#: help.pm:991 install_steps_interactive.pm:913
#, c-format
msgid "Timezone"
msgstr ""
-#: help.pm:951
+#: help.pm:991
#, c-format
msgid "Graphical Interface"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:987
+#: help.pm:991 install_steps_interactive.pm:987
#, c-format
msgid "TV card"
msgstr ""
-#: help.pm:951
+#: help.pm:991
#, c-format
msgid "ISDN card"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:1005 standalone/drakbackup:2372
+#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2395
#, c-format
msgid "Network"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:1031
+#: help.pm:991 install_steps_interactive.pm:1031
#, c-format
msgid "Security Level"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:1045
+#: help.pm:991 install_steps_interactive.pm:1045
#, c-format
msgid "Firewall"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:1059
+#: help.pm:991 install_steps_interactive.pm:1059
#, c-format
msgid "Bootloader"
msgstr ""
-#: help.pm:951 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
#, c-format
msgid "Services"
msgstr ""
-#: help.pm:954
+#: help.pm:994
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on this partition\n"
-"will be lost and will not be recoverable!"
+"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"and will not be recoverable!"
msgstr ""
-#: help.pm:959
+#: help.pm:999
#, c-format
msgid ""
"Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -4240,8 +4300,8 @@ msgid ""
"to recover any data and partitions present on this hard drive, including\n"
"any Windows data.\n"
"\n"
-"Click on \"%s\" to stop this operation without losing any data and\n"
-"partitions present on this hard drive."
+"Click on \"%s\" to quit this operation without losing data and partitions\n"
+"present on this hard drive."
msgstr ""
#: install2.pm:119
@@ -4689,6 +4749,11 @@ msgstr ""
msgid "Package Group Selection"
msgstr ""
+#: install_steps_gtk.pm:286 interactive.pm:403 interactive/newt.pm:300 network/netconnect.pm:236 network/tools.pm:208 printer/printerdrake.pm:2913 standalone/drakbackup:4441 standalone/drakbackup:4467 standalone/drakbackup:4497 standalone/drakbackup:4521 ugtk2.pm:510
+#, c-format
+msgid "Next"
+msgstr ""
+
#: install_steps_gtk.pm:303 install_steps_interactive.pm:519
#, c-format
msgid "Total size: %d / %d MB"
@@ -4788,6 +4853,11 @@ msgstr ""
msgid "Show automatically selected packages"
msgstr ""
+#: install_steps_gtk.pm:443 interactive.pm:404 interactive/newt.pm:299 printer/printerdrake.pm:2911 standalone/drakbackup:4242 standalone/drakbackup:4270 standalone/drakbackup:4328 standalone/drakbackup:4354 standalone/drakbackup:4380 standalone/drakbackup:4437 standalone/drakbackup:4463 standalone/drakbackup:4493 standalone/drakbackup:4517 ugtk2.pm:508
+#, c-format
+msgid "Previous"
+msgstr ""
+
#: install_steps_gtk.pm:445
#, c-format
msgid "Load/Save on floppy"
@@ -5194,7 +5264,7 @@ msgstr ""
msgid "Summary"
msgstr ""
-#: install_steps_interactive.pm:890 install_steps_interactive.pm:898 install_steps_interactive.pm:912 install_steps_interactive.pm:919 install_steps_interactive.pm:1068 services.pm:135 standalone/drakbackup:1919
+#: install_steps_interactive.pm:890 install_steps_interactive.pm:898 install_steps_interactive.pm:912 install_steps_interactive.pm:919 install_steps_interactive.pm:1068 services.pm:135 standalone/drakbackup:1942
#, c-format
msgid "System"
msgstr ""
@@ -5300,7 +5370,7 @@ msgstr ""
msgid "This password is too short (it must be at least %d characters long)"
msgstr ""
-#: install_steps_interactive.pm:1157 network/netconnect.pm:480 standalone/drakauth:26 standalone/drakconnect:411 standalone/drakconnect:851 standalone/logdrake:111
+#: install_steps_interactive.pm:1157 network/netconnect.pm:486 standalone/drakauth:26 standalone/drakconnect:411 standalone/drakconnect:851 standalone/logdrake:111
#, c-format
msgid "Authentication"
msgstr ""
@@ -7367,7 +7437,7 @@ msgstr ""
msgid "GlidePoint"
msgstr ""
-#: mouse.pm:35 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42 network/modem.pm:73 network/netconnect.pm:469 network/netconnect.pm:470 network/netconnect.pm:471 network/netconnect.pm:491 network/netconnect.pm:496 network/netconnect.pm:508 network/netconnect.pm:513 network/netconnect.pm:529 network/netconnect.pm:531
+#: mouse.pm:35 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42 network/modem.pm:73 network/netconnect.pm:475 network/netconnect.pm:476 network/netconnect.pm:477 network/netconnect.pm:497 network/netconnect.pm:502 network/netconnect.pm:514 network/netconnect.pm:519 network/netconnect.pm:535 network/netconnect.pm:537
#, c-format
msgid "Automatic"
msgstr ""
@@ -7562,12 +7632,12 @@ msgstr ""
msgid "Sagem (using dhcp) usb"
msgstr ""
-#: network/adsl.pm:35 network/netconnect.pm:660
+#: network/adsl.pm:35 network/netconnect.pm:666
#, c-format
msgid "Connect to the Internet"
msgstr ""
-#: network/adsl.pm:36 network/netconnect.pm:661
+#: network/adsl.pm:36 network/netconnect.pm:667
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -7575,7 +7645,7 @@ msgid ""
"If you don't know, choose 'use pppoe'"
msgstr ""
-#: network/adsl.pm:41 network/netconnect.pm:665
+#: network/adsl.pm:41 network/netconnect.pm:671
#, c-format
msgid "ADSL connection type :"
msgstr ""
@@ -7687,7 +7757,7 @@ msgstr ""
msgid "Other ports"
msgstr ""
-#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157 network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183 network/netconnect.pm:320
+#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157 network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183 network/netconnect.pm:326
#, c-format
msgid "ISDN Configuration"
msgstr ""
@@ -7826,168 +7896,168 @@ msgstr ""
msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
msgstr ""
-#: network/netconnect.pm:150
+#: network/netconnect.pm:156
#, c-format
msgid "Alcatel speedtouch USB modem"
msgstr ""
-#: network/netconnect.pm:151
+#: network/netconnect.pm:157
#, c-format
msgid "Sagem USB modem"
msgstr ""
-#: network/netconnect.pm:152
+#: network/netconnect.pm:158
#, c-format
msgid "Bewan USB modem"
msgstr ""
-#: network/netconnect.pm:153
+#: network/netconnect.pm:159
#, c-format
msgid "Bewan PCI modem"
msgstr ""
-#: network/netconnect.pm:154
+#: network/netconnect.pm:160
#, c-format
msgid "ECI Hi-Focus modem"
msgstr ""
-#: network/netconnect.pm:158
+#: network/netconnect.pm:164
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr ""
-#: network/netconnect.pm:159
+#: network/netconnect.pm:165
#, c-format
msgid "Manual TCP/IP configuration"
msgstr ""
-#: network/netconnect.pm:160
+#: network/netconnect.pm:166
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr ""
-#: network/netconnect.pm:161
+#: network/netconnect.pm:167
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr ""
-#: network/netconnect.pm:162
+#: network/netconnect.pm:168
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr ""
-#: network/netconnect.pm:166
+#: network/netconnect.pm:172
#, c-format
msgid "Bridged Ethernet LLC"
msgstr ""
-#: network/netconnect.pm:167
+#: network/netconnect.pm:173
#, c-format
msgid "Bridged Ethernet VC"
msgstr ""
-#: network/netconnect.pm:168
+#: network/netconnect.pm:174
#, c-format
msgid "Routed IP LLC"
msgstr ""
-#: network/netconnect.pm:169
+#: network/netconnect.pm:175
#, c-format
msgid "Routed IP VC"
msgstr ""
-#: network/netconnect.pm:170
+#: network/netconnect.pm:176
#, c-format
msgid "PPPOA LLC"
msgstr ""
-#: network/netconnect.pm:171
+#: network/netconnect.pm:177
#, c-format
msgid "PPPOA VC"
msgstr ""
-#: network/netconnect.pm:175 standalone/drakconnect:426 standalone/drakconnect:851
+#: network/netconnect.pm:181 standalone/drakconnect:426 standalone/drakconnect:851
#, c-format
msgid "Script-based"
msgstr ""
-#: network/netconnect.pm:176 standalone/drakconnect:426 standalone/drakconnect:851
+#: network/netconnect.pm:182 standalone/drakconnect:426 standalone/drakconnect:851
#, c-format
msgid "PAP"
msgstr ""
-#: network/netconnect.pm:177 standalone/drakconnect:426 standalone/drakconnect:851
+#: network/netconnect.pm:183 standalone/drakconnect:426 standalone/drakconnect:851
#, c-format
msgid "Terminal-based"
msgstr ""
-#: network/netconnect.pm:178 standalone/drakconnect:426 standalone/drakconnect:851
+#: network/netconnect.pm:184 standalone/drakconnect:426 standalone/drakconnect:851
#, c-format
msgid "CHAP"
msgstr ""
-#: network/netconnect.pm:179
+#: network/netconnect.pm:185
#, c-format
msgid "PAP/CHAP"
msgstr ""
-#: network/netconnect.pm:187 standalone/drakconnect:53
+#: network/netconnect.pm:193 standalone/drakconnect:53
#, c-format
msgid "Network & Internet Configuration"
msgstr ""
-#: network/netconnect.pm:193
+#: network/netconnect.pm:199
#, c-format
msgid "(detected on port %s)"
msgstr ""
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:195
+#: network/netconnect.pm:201
#, c-format
msgid "(detected %s)"
msgstr ""
-#: network/netconnect.pm:195
+#: network/netconnect.pm:201
#, c-format
msgid "(detected)"
msgstr ""
-#: network/netconnect.pm:197
+#: network/netconnect.pm:203
#, c-format
msgid "Modem connection"
msgstr ""
-#: network/netconnect.pm:198
+#: network/netconnect.pm:204
#, c-format
msgid "ISDN connection"
msgstr ""
-#: network/netconnect.pm:199
+#: network/netconnect.pm:205
#, c-format
msgid "ADSL connection"
msgstr ""
-#: network/netconnect.pm:200
+#: network/netconnect.pm:206
#, c-format
msgid "Cable connection"
msgstr ""
-#: network/netconnect.pm:201
+#: network/netconnect.pm:207
#, c-format
msgid "LAN connection"
msgstr ""
-#: network/netconnect.pm:202 network/netconnect.pm:216
+#: network/netconnect.pm:208 network/netconnect.pm:222
#, c-format
msgid "Wireless connection"
msgstr ""
-#: network/netconnect.pm:212
+#: network/netconnect.pm:218
#, c-format
msgid "Choose the connection you want to configure"
msgstr ""
-#: network/netconnect.pm:229
+#: network/netconnect.pm:235
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -7996,254 +8066,254 @@ msgid ""
"Press \"%s\" to continue."
msgstr ""
-#: network/netconnect.pm:237 network/netconnect.pm:693
+#: network/netconnect.pm:243 network/netconnect.pm:699
#, c-format
msgid "Connection Configuration"
msgstr ""
-#: network/netconnect.pm:238 network/netconnect.pm:694
+#: network/netconnect.pm:244 network/netconnect.pm:700
#, c-format
msgid "Please fill or check the field below"
msgstr ""
-#: network/netconnect.pm:244 standalone/drakconnect:439 standalone/drakconnect:833
+#: network/netconnect.pm:250 standalone/drakconnect:439 standalone/drakconnect:833
#, c-format
msgid "Card IRQ"
msgstr ""
-#: network/netconnect.pm:245 standalone/drakconnect:440 standalone/drakconnect:834
+#: network/netconnect.pm:251 standalone/drakconnect:440 standalone/drakconnect:834
#, c-format
msgid "Card mem (DMA)"
msgstr ""
-#: network/netconnect.pm:246 standalone/drakconnect:441 standalone/drakconnect:835
+#: network/netconnect.pm:252 standalone/drakconnect:441 standalone/drakconnect:835
#, c-format
msgid "Card IO"
msgstr ""
-#: network/netconnect.pm:247 standalone/drakconnect:442 standalone/drakconnect:836
+#: network/netconnect.pm:253 standalone/drakconnect:442 standalone/drakconnect:836
#, c-format
msgid "Card IO_0"
msgstr ""
-#: network/netconnect.pm:248 standalone/drakconnect:837
+#: network/netconnect.pm:254 standalone/drakconnect:837
#, c-format
msgid "Card IO_1"
msgstr ""
-#: network/netconnect.pm:249 standalone/drakconnect:838
+#: network/netconnect.pm:255 standalone/drakconnect:838
#, c-format
msgid "Your personal phone number"
msgstr ""
-#: network/netconnect.pm:250 network/netconnect.pm:697 standalone/drakconnect:839
+#: network/netconnect.pm:256 network/netconnect.pm:703 standalone/drakconnect:839
#, c-format
msgid "Provider name (ex provider.net)"
msgstr ""
-#: network/netconnect.pm:251 standalone/drakconnect:423 standalone/drakconnect:840
+#: network/netconnect.pm:257 standalone/drakconnect:423 standalone/drakconnect:840
#, c-format
msgid "Provider phone number"
msgstr ""
-#: network/netconnect.pm:252
+#: network/netconnect.pm:258
#, c-format
msgid "Provider DNS 1 (optional)"
msgstr ""
-#: network/netconnect.pm:253
+#: network/netconnect.pm:259
#, c-format
msgid "Provider DNS 2 (optional)"
msgstr ""
-#: network/netconnect.pm:254 standalone/drakconnect:379 standalone/drakconnect:845
+#: network/netconnect.pm:260 standalone/drakconnect:379 standalone/drakconnect:845
#, c-format
msgid "Dialing mode"
msgstr ""
-#: network/netconnect.pm:255 standalone/drakconnect:384 standalone/drakconnect:857
+#: network/netconnect.pm:261 standalone/drakconnect:384 standalone/drakconnect:857
#, c-format
msgid "Connection speed"
msgstr ""
-#: network/netconnect.pm:256 standalone/drakconnect:389 standalone/drakconnect:858
+#: network/netconnect.pm:262 standalone/drakconnect:389 standalone/drakconnect:858
#, c-format
msgid "Connection timeout (in sec)"
msgstr ""
-#: network/netconnect.pm:259 network/netconnect.pm:700 standalone/drakconnect:421 standalone/drakconnect:843
+#: network/netconnect.pm:265 network/netconnect.pm:706 standalone/drakconnect:421 standalone/drakconnect:843
#, c-format
msgid "Account Login (user name)"
msgstr ""
-#: network/netconnect.pm:260 network/netconnect.pm:701 standalone/drakconnect:422 standalone/drakconnect:844 standalone/drakconnect:878
+#: network/netconnect.pm:266 network/netconnect.pm:707 standalone/drakconnect:422 standalone/drakconnect:844 standalone/drakconnect:878
#, c-format
msgid "Account Password"
msgstr ""
-#: network/netconnect.pm:288
+#: network/netconnect.pm:294
#, c-format
msgid "What kind is your ISDN connection?"
msgstr ""
-#: network/netconnect.pm:289
+#: network/netconnect.pm:295
#, c-format
msgid "Internal ISDN card"
msgstr ""
-#: network/netconnect.pm:289
+#: network/netconnect.pm:295
#, c-format
msgid "External ISDN modem"
msgstr ""
-#: network/netconnect.pm:320
+#: network/netconnect.pm:326
#, c-format
msgid "Do you want to start a new configuration ?"
msgstr ""
-#: network/netconnect.pm:323
+#: network/netconnect.pm:329
#, c-format
msgid "I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen."
msgstr ""
-#: network/netconnect.pm:332
+#: network/netconnect.pm:338
#, c-format
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
-#: network/netconnect.pm:341
+#: network/netconnect.pm:347
#, c-format
msgid ""
"Your modem isn't supported by the system.\n"
"Take a look at http://www.linmodems.org"
msgstr ""
-#: network/netconnect.pm:352
+#: network/netconnect.pm:358
#, c-format
msgid "Select the modem to configure:"
msgstr ""
-#: network/netconnect.pm:391
+#: network/netconnect.pm:397
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: network/netconnect.pm:415
+#: network/netconnect.pm:421
#, c-format
msgid "Select your provider:"
msgstr ""
-#: network/netconnect.pm:417 network/netconnect.pm:587
+#: network/netconnect.pm:423 network/netconnect.pm:593
#, c-format
msgid "Provider:"
msgstr ""
-#: network/netconnect.pm:469 network/netconnect.pm:470 network/netconnect.pm:471 network/netconnect.pm:496 network/netconnect.pm:513 network/netconnect.pm:529
+#: network/netconnect.pm:475 network/netconnect.pm:476 network/netconnect.pm:477 network/netconnect.pm:502 network/netconnect.pm:519 network/netconnect.pm:535
#, c-format
msgid "Manual"
msgstr ""
-#: network/netconnect.pm:473
+#: network/netconnect.pm:479
#, c-format
msgid "Dialup: account options"
msgstr ""
-#: network/netconnect.pm:476 standalone/drakconnect:847
+#: network/netconnect.pm:482 standalone/drakconnect:847
#, c-format
msgid "Connection name"
msgstr ""
-#: network/netconnect.pm:477 standalone/drakconnect:848
+#: network/netconnect.pm:483 standalone/drakconnect:848
#, c-format
msgid "Phone number"
msgstr ""
-#: network/netconnect.pm:478 standalone/drakconnect:849
+#: network/netconnect.pm:484 standalone/drakconnect:849
#, c-format
msgid "Login ID"
msgstr ""
-#: network/netconnect.pm:493 network/netconnect.pm:526
+#: network/netconnect.pm:499 network/netconnect.pm:532
#, c-format
msgid "Dialup: IP parameters"
msgstr ""
-#: network/netconnect.pm:496
+#: network/netconnect.pm:502
#, c-format
msgid "IP parameters"
msgstr ""
-#: network/netconnect.pm:497 network/netconnect.pm:803 printer/printerdrake.pm:431 standalone/drakconnect:112 standalone/drakconnect:292 standalone/drakconnect:698 standalone/drakups:266
+#: network/netconnect.pm:503 network/netconnect.pm:809 printer/printerdrake.pm:431 standalone/drakconnect:112 standalone/drakconnect:292 standalone/drakconnect:698 standalone/drakups:266
#, c-format
msgid "IP address"
msgstr ""
-#: network/netconnect.pm:498
+#: network/netconnect.pm:504
#, c-format
msgid "Subnet mask"
msgstr ""
-#: network/netconnect.pm:510
+#: network/netconnect.pm:516
#, c-format
msgid "Dialup: DNS parameters"
msgstr ""
-#: network/netconnect.pm:513
+#: network/netconnect.pm:519
#, c-format
msgid "DNS"
msgstr ""
-#: network/netconnect.pm:514 standalone/drakconnect:852
+#: network/netconnect.pm:520 standalone/drakconnect:852
#, c-format
msgid "Domain name"
msgstr ""
-#: network/netconnect.pm:515 network/netconnect.pm:698 standalone/drakconnect:853
+#: network/netconnect.pm:521 network/netconnect.pm:704 standalone/drakconnect:853
#, c-format
msgid "First DNS Server (optional)"
msgstr ""
-#: network/netconnect.pm:516 network/netconnect.pm:699 standalone/drakconnect:854
+#: network/netconnect.pm:522 network/netconnect.pm:705 standalone/drakconnect:854
#, c-format
msgid "Second DNS Server (optional)"
msgstr ""
-#: network/netconnect.pm:517
+#: network/netconnect.pm:523
#, c-format
msgid "Set hostname from IP"
msgstr ""
-#: network/netconnect.pm:529 standalone/drakconnect:303 standalone/drakconnect:846
+#: network/netconnect.pm:535 standalone/drakconnect:303 standalone/drakconnect:846
#, c-format
msgid "Gateway"
msgstr ""
-#: network/netconnect.pm:530
+#: network/netconnect.pm:536
#, c-format
msgid "Gateway IP address"
msgstr ""
-#: network/netconnect.pm:555
+#: network/netconnect.pm:561
#, c-format
msgid "ADSL configuration"
msgstr ""
-#: network/netconnect.pm:555 network/netconnect.pm:729
+#: network/netconnect.pm:561 network/netconnect.pm:735
#, c-format
msgid "Select the network interface to configure:"
msgstr ""
-#: network/netconnect.pm:556 network/netconnect.pm:731 network/shorewall.pm:77 standalone/drakconnect:533 standalone/drakgw:218
+#: network/netconnect.pm:562 network/netconnect.pm:737 network/shorewall.pm:77 standalone/drakconnect:533 standalone/drakgw:218
#, c-format
msgid "Net Device"
msgstr ""
-#: network/netconnect.pm:585
+#: network/netconnect.pm:591
#, c-format
msgid "Please choose your ADSL provider"
msgstr ""
-#: network/netconnect.pm:604
+#: network/netconnect.pm:610
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -8251,32 +8321,32 @@ msgid ""
"or skip and do it later."
msgstr ""
-#: network/netconnect.pm:608 network/netconnect.pm:613
+#: network/netconnect.pm:614 network/netconnect.pm:619
#, c-format
msgid "Use a floppy"
msgstr ""
-#: network/netconnect.pm:608 network/netconnect.pm:617
+#: network/netconnect.pm:614 network/netconnect.pm:623
#, c-format
msgid "Use my Windows partition"
msgstr ""
-#: network/netconnect.pm:608 network/netconnect.pm:621
+#: network/netconnect.pm:614 network/netconnect.pm:627
#, c-format
msgid "Do it later"
msgstr ""
-#: network/netconnect.pm:628
+#: network/netconnect.pm:634
#, c-format
msgid "Firmware copy failed, file %s not found"
msgstr ""
-#: network/netconnect.pm:635
+#: network/netconnect.pm:641
#, c-format
msgid "Firmware copy succeeded"
msgstr ""
-#: network/netconnect.pm:650
+#: network/netconnect.pm:656
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -8285,22 +8355,22 @@ msgid ""
"and copy the mgmt.o in /usr/share/speedtouch"
msgstr ""
-#: network/netconnect.pm:702
+#: network/netconnect.pm:708
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr ""
-#: network/netconnect.pm:703
+#: network/netconnect.pm:709
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr ""
-#: network/netconnect.pm:704
+#: network/netconnect.pm:710
#, c-format
msgid "Encapsulation :"
msgstr ""
-#: network/netconnect.pm:719
+#: network/netconnect.pm:725
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution problem.\n"
@@ -8308,7 +8378,7 @@ msgid ""
"You can find a driver on http://eciadsl.flashtux.org/"
msgstr ""
-#: network/netconnect.pm:742
+#: network/netconnect.pm:748
#, c-format
msgid ""
"WARNING: this device has been previously configured to connect to the Internet.\n"
@@ -8316,22 +8386,22 @@ msgid ""
"Modifying the fields below will override this configuration."
msgstr ""
-#: network/netconnect.pm:760
+#: network/netconnect.pm:766
#, c-format
msgid "Zeroconf hostname resolution"
msgstr ""
-#: network/netconnect.pm:761 network/netconnect.pm:790
+#: network/netconnect.pm:767 network/netconnect.pm:796
#, c-format
msgid "Configuring network device %s (driver %s)"
msgstr ""
-#: network/netconnect.pm:762
+#: network/netconnect.pm:768
#, c-format
msgid "The following protocols can be used to configure an ethernet connection. Please choose the one you want to use"
msgstr ""
-#: network/netconnect.pm:791
+#: network/netconnect.pm:797
#, c-format
msgid ""
"Please enter the IP configuration for this machine.\n"
@@ -8339,92 +8409,102 @@ msgid ""
"notation (for example, 1.2.3.4)."
msgstr ""
-#: network/netconnect.pm:798
+#: network/netconnect.pm:804
#, c-format
msgid "Assign host name from DHCP address"
msgstr ""
-#: network/netconnect.pm:799
+#: network/netconnect.pm:805
#, c-format
msgid "DHCP host name"
msgstr ""
-#: network/netconnect.pm:804 standalone/drakconnect:297 standalone/drakconnect:699 standalone/drakgw:313
+#: network/netconnect.pm:810 standalone/drakconnect:297 standalone/drakconnect:699 standalone/drakgw:313
#, c-format
msgid "Netmask"
msgstr ""
-#: network/netconnect.pm:806 standalone/drakconnect:372
+#: network/netconnect.pm:812 standalone/drakconnect:372
#, c-format
msgid "Track network card id (useful for laptops)"
msgstr ""
-#: network/netconnect.pm:807 standalone/drakconnect:373
+#: network/netconnect.pm:813 standalone/drakconnect:373
#, c-format
msgid "Network Hotplugging"
msgstr ""
-#: network/netconnect.pm:808 standalone/drakconnect:367
+#: network/netconnect.pm:814 standalone/drakconnect:367
#, c-format
msgid "Start at boot"
msgstr ""
-#: network/netconnect.pm:810 standalone/drakconnect:702
+#: network/netconnect.pm:816 standalone/drakconnect:702
#, c-format
msgid "DHCP client"
msgstr ""
-#: network/netconnect.pm:820 printer/printerdrake.pm:1345
+#: network/netconnect.pm:826 printer/printerdrake.pm:1345
#, c-format
msgid "IP address should be in format 1.2.3.4"
msgstr ""
-#: network/netconnect.pm:823
+#: network/netconnect.pm:829
#, c-format
msgid "Warning : IP address %s is usually reserved !"
msgstr ""
-#: network/netconnect.pm:853
+#: network/netconnect.pm:859 network/netconnect.pm:888
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr ""
-#: network/netconnect.pm:855 standalone/drakconnect:338
+#: network/netconnect.pm:862 standalone/drakconnect:338
#, c-format
msgid "Operating Mode"
msgstr ""
-#: network/netconnect.pm:857 standalone/drakconnect:339
+#: network/netconnect.pm:864 standalone/drakconnect:339
#, c-format
msgid "Network name (ESSID)"
msgstr ""
-#: network/netconnect.pm:858 standalone/drakconnect:340
+#: network/netconnect.pm:865 standalone/drakconnect:340
#, c-format
msgid "Network ID"
msgstr ""
-#: network/netconnect.pm:859 standalone/drakconnect:341
+#: network/netconnect.pm:866 standalone/drakconnect:341
#, c-format
msgid "Operating frequency"
msgstr ""
-#: network/netconnect.pm:860 standalone/drakconnect:342
+#: network/netconnect.pm:867 standalone/drakconnect:342
#, c-format
msgid "Sensitivity threshold"
msgstr ""
-#: network/netconnect.pm:861 standalone/drakconnect:343
+#: network/netconnect.pm:868 standalone/drakconnect:343
#, c-format
msgid "Bitrate (in b/s)"
msgstr ""
-#: network/netconnect.pm:863 standalone/drakconnect:354
+#: network/netconnect.pm:874
+#, c-format
+msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."
+msgstr ""
+
+#: network/netconnect.pm:878
+#, c-format
+msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
+msgstr ""
+
+#: network/netconnect.pm:891 standalone/drakconnect:354
#, c-format
msgid "RTS/CTS"
msgstr ""
-#: network/netconnect.pm:864
+#: network/netconnect.pm:892
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
@@ -8435,17 +8515,17 @@ msgid ""
"or off."
msgstr ""
-#: network/netconnect.pm:871 standalone/drakconnect:355
+#: network/netconnect.pm:899 standalone/drakconnect:355
#, c-format
msgid "Fragmentation"
msgstr ""
-#: network/netconnect.pm:872 standalone/drakconnect:356
+#: network/netconnect.pm:900 standalone/drakconnect:356
#, c-format
msgid "Iwconfig command extra arguments"
msgstr ""
-#: network/netconnect.pm:873
+#: network/netconnect.pm:901
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
@@ -8454,12 +8534,13 @@ msgid ""
"See iwpconfig(8) man page for further information."
msgstr ""
-#: network/netconnect.pm:878 standalone/drakconnect:357
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: network/netconnect.pm:908 standalone/drakconnect:357
#, c-format
msgid "Iwspy command extra arguments"
msgstr ""
-#: network/netconnect.pm:879
+#: network/netconnect.pm:909
#, c-format
msgid ""
"Iwspy is used to set a list of addresses in a wireless network\n"
@@ -8471,12 +8552,12 @@ msgid ""
"See iwpspy(8) man page for further information."
msgstr ""
-#: network/netconnect.pm:887 standalone/drakconnect:358
+#: network/netconnect.pm:917 standalone/drakconnect:358
#, c-format
msgid "Iwpriv command extra arguments"
msgstr ""
-#: network/netconnect.pm:888
+#: network/netconnect.pm:918
#, c-format
msgid ""
"Iwpriv enable to set up optionals (private) parameters of a wireless network\n"
@@ -8491,34 +8572,24 @@ msgid ""
"See iwpriv(8) man page for further information."
msgstr ""
-#: network/netconnect.pm:902
-#, c-format
-msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."
-msgstr ""
-
-#: network/netconnect.pm:906
-#, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr ""
-
-#: network/netconnect.pm:924
+#: network/netconnect.pm:945
#, c-format
msgid ""
"No ethernet network adapter has been detected on your system.\n"
"I cannot set up this connection type."
msgstr ""
-#: network/netconnect.pm:928 standalone/drakgw:254 standalone/drakpxe:142
+#: network/netconnect.pm:949 standalone/drakgw:254 standalone/drakpxe:142
#, c-format
msgid "Choose the network interface"
msgstr ""
-#: network/netconnect.pm:929
+#: network/netconnect.pm:950
#, c-format
msgid "Please choose which network adapter you want to use to connect to Internet."
msgstr ""
-#: network/netconnect.pm:947
+#: network/netconnect.pm:968
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -8527,77 +8598,77 @@ msgid ""
"You may also enter the IP address of the gateway if you have one."
msgstr ""
-#: network/netconnect.pm:952
+#: network/netconnect.pm:973
#, c-format
msgid "Host name (optional)"
msgstr ""
-#: network/netconnect.pm:952
+#: network/netconnect.pm:973
#, c-format
msgid "Host name"
msgstr ""
-#: network/netconnect.pm:953
+#: network/netconnect.pm:974
#, c-format
msgid "DNS server 1"
msgstr ""
-#: network/netconnect.pm:954
+#: network/netconnect.pm:975
#, c-format
msgid "DNS server 2"
msgstr ""
-#: network/netconnect.pm:955
+#: network/netconnect.pm:976
#, c-format
msgid "DNS server 3"
msgstr ""
-#: network/netconnect.pm:956
+#: network/netconnect.pm:977
#, c-format
msgid "Search domain"
msgstr ""
-#: network/netconnect.pm:957
+#: network/netconnect.pm:978
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
msgstr ""
-#: network/netconnect.pm:958
+#: network/netconnect.pm:979
#, c-format
msgid "Gateway (e.g. %s)"
msgstr ""
-#: network/netconnect.pm:960
+#: network/netconnect.pm:981
#, c-format
msgid "Gateway device"
msgstr ""
-#: network/netconnect.pm:968
+#: network/netconnect.pm:989
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr ""
-#: network/netconnect.pm:973
+#: network/netconnect.pm:994
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr ""
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1005
#, c-format
msgid "Enter a Zeroconf host name which will be the one that your machine will get back to other machines on the network:"
msgstr ""
-#: network/netconnect.pm:985
+#: network/netconnect.pm:1006
#, c-format
msgid "Zeroconf Host name"
msgstr ""
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1009
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr ""
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1019
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -8606,32 +8677,32 @@ msgid ""
""
msgstr ""
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1020
#, c-format
msgid "Internet connection"
msgstr ""
-#: network/netconnect.pm:1006
+#: network/netconnect.pm:1027
#, c-format
msgid "Configuration is complete, do you want to apply settings ?"
msgstr ""
-#: network/netconnect.pm:1020
+#: network/netconnect.pm:1041
#, c-format
msgid "Do you want to start the connection at boot?"
msgstr ""
-#: network/netconnect.pm:1043
+#: network/netconnect.pm:1064
#, c-format
msgid "The network needs to be restarted. Do you want to restart it ?"
msgstr ""
-#: network/netconnect.pm:1048 network/netconnect.pm:1113
+#: network/netconnect.pm:1069 network/netconnect.pm:1134
#, c-format
msgid "Network Configuration"
msgstr ""
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1070
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -8639,34 +8710,34 @@ msgid ""
"%s"
msgstr ""
-#: network/netconnect.pm:1058
+#: network/netconnect.pm:1079
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr ""
-#: network/netconnect.pm:1066 standalone/drakconnect:892
+#: network/netconnect.pm:1087 standalone/drakconnect:892
#, c-format
msgid "Testing your connection..."
msgstr ""
-#: network/netconnect.pm:1082
+#: network/netconnect.pm:1103
#, c-format
msgid "The system is now connected to the Internet."
msgstr ""
-#: network/netconnect.pm:1083
+#: network/netconnect.pm:1104
#, c-format
msgid "For security reasons, it will be disconnected now."
msgstr ""
-#: network/netconnect.pm:1084
+#: network/netconnect.pm:1105
#, c-format
msgid ""
"The system doesn't seem to be connected to the Internet.\n"
"Try to reconfigure your connection."
msgstr ""
-#: network/netconnect.pm:1098
+#: network/netconnect.pm:1119
#, c-format
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
@@ -8674,19 +8745,19 @@ msgid ""
""
msgstr ""
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1122
#, c-format
msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
msgstr ""
-#: network/netconnect.pm:1102
+#: network/netconnect.pm:1123
#, c-format
msgid ""
"Problems occured during configuration.\n"
"Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."
msgstr ""
-#: network/netconnect.pm:1114
+#: network/netconnect.pm:1135
#, c-format
msgid ""
"Because you are doing a network installation, your network is already configured.\n"
@@ -9791,7 +9862,7 @@ msgstr ""
msgid "Remote printer name missing!"
msgstr ""
-#: printer/printerdrake.pm:1196 printer/printerdrake.pm:1710 standalone/drakTermServ:441 standalone/drakTermServ:726 standalone/drakTermServ:752 standalone/drakTermServ:1321 standalone/drakTermServ:1333 standalone/drakbackup:767 standalone/drakbackup:872 standalone/drakbackup:906 standalone/drakbackup:1025 standalone/drakbackup:1873 standalone/drakbackup:1877 standalone/drakconnect:250 standalone/drakconnect:273 standalone/drakconnect:456 standalone/drakconnect:460 standalone/drakconnect:484 standalone/harddrake2:160
+#: printer/printerdrake.pm:1196 printer/printerdrake.pm:1710 standalone/drakTermServ:441 standalone/drakTermServ:726 standalone/drakTermServ:752 standalone/drakTermServ:1321 standalone/drakTermServ:1333 standalone/drakbackup:768 standalone/drakbackup:873 standalone/drakbackup:907 standalone/drakbackup:1026 standalone/drakbackup:1896 standalone/drakbackup:1900 standalone/drakconnect:250 standalone/drakconnect:273 standalone/drakconnect:456 standalone/drakconnect:460 standalone/drakconnect:484 standalone/harddrake2:160
#, c-format
msgid "Information"
msgstr ""
@@ -10443,7 +10514,7 @@ msgstr ""
msgid "Printing on the printer \"%s\""
msgstr ""
-#: printer/printerdrake.pm:3107 printer/printerdrake.pm:3110 printer/printerdrake.pm:3111 printer/printerdrake.pm:3112 printer/printerdrake.pm:4165 standalone/drakTermServ:320 standalone/drakbackup:4514 standalone/drakbug:177 standalone/drakfont:497 standalone/drakfont:588 standalone/net_monitor:106 standalone/printerdrake:508
+#: printer/printerdrake.pm:3107 printer/printerdrake.pm:3110 printer/printerdrake.pm:3111 printer/printerdrake.pm:3112 printer/printerdrake.pm:4165 standalone/drakTermServ:320 standalone/drakbackup:4537 standalone/drakbug:177 standalone/drakfont:497 standalone/drakfont:588 standalone/net_monitor:106 standalone/printerdrake:508
#, c-format
msgid "Close"
msgstr ""
@@ -12022,7 +12093,7 @@ msgstr ""
msgid "You will immediately appreciate this collection of handy utilities for easily configuring hardware devices, defining mount points, setting up Network and Internet, adjusting the security level of your computer, and just about everything related to the system."
msgstr ""
-#: share/advertising/dis-09.pl:13
+#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
#, c-format
msgid "<b>MandrakeStore</b>"
msgstr ""
@@ -12032,7 +12103,7 @@ msgstr ""
msgid "Find all MandrakeSoft products and services at MandrakeStore -- our full service e-commerce platform."
msgstr ""
-#: share/advertising/dis-09.pl:17 share/advertising/ppp-09.pl:15 share/advertising/pwp-08.pl:15
+#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19 share/advertising/ppp-09.pl:15 share/advertising/pwp-08.pl:15
#, c-format
msgid "Stop by today at <b>www.mandrakestore.com</b>"
msgstr ""
@@ -12072,12 +12143,12 @@ msgstr ""
msgid "\t- Plus much more"
msgstr ""
-#: share/advertising/dis-10.pl:22 share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22 share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
#, c-format
msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
msgstr ""
-#: share/advertising/dis-11.pl:13 share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13 share/advertising/pwp-10.pl:13
+#: share/advertising/dis-11.pl:13 share/advertising/ppp-11.pl:13 share/advertising/pwp-10.pl:13
#, c-format
msgid "Do you require assistance?"
msgstr ""
@@ -12087,7 +12158,7 @@ msgstr ""
msgid "MandrakeExpert is the primary source for technical support."
msgstr ""
-#: share/advertising/dis-11.pl:17 share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18 share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
#, c-format
msgid "If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>"
msgstr ""
@@ -12109,7 +12180,7 @@ msgstr ""
#: share/advertising/dwd-02.pl:17
#, c-format
-msgid "To learn more about our dynamic community, please visit www.mandrake-linux.com!"
+msgid "To learn more about our dynamic community, please visit <b>www.mandrake-linux.com</b>!"
msgstr ""
#: share/advertising/dwd-03.pl:13
@@ -12129,12 +12200,12 @@ msgstr ""
#: share/advertising/dwd-04.pl:13
#, c-format
-msgid "Mandrake Linux is widely known as the most user-friendly and the easiest to install and to use Linux distribution."
+msgid "Mandrake Linux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."
msgstr ""
#: share/advertising/dwd-04.pl:15
#, c-format
-msgid "Find out about our personal solutions:"
+msgid "Find out about our <b>Personal Solutions</b>:"
msgstr ""
#: share/advertising/dwd-04.pl:16
@@ -12159,7 +12230,7 @@ msgstr ""
#: share/advertising/dwd-05.pl:13
#, c-format
-msgid "Find out also our business solutions!"
+msgid "Find out also our <b>Business Solutions</b>!"
msgstr ""
#: share/advertising/dwd-05.pl:15
@@ -12177,19 +12248,14 @@ msgstr ""
msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance."
msgstr ""
-#: share/advertising/dwd-06.pl:13
-#, c-format
-msgid "Find all MandrakeSoft products <b>at MandrakeStore</b> - our full service e-commerce platform."
-msgstr ""
-
#: share/advertising/dwd-06.pl:15
#, c-format
-msgid "Find out also support incidents if you have any problems, from standard to professional support, from 1 to 50 incidents, take the one which meets perfectly your needs!"
+msgid "Find all MandrakeSoft products <b>at MandrakeStore</b> - our full service e-commerce platform."
msgstr ""
#: share/advertising/dwd-06.pl:17
#, c-format
-msgid "Stop by today at www.mandrakestore.com"
+msgid "Find out also support incidents if you have any problems, from standard to professional support, from 1 to 50 incidents, take the one which meets perfectly your needs!"
msgstr ""
#: share/advertising/dwd-07.pl:13
@@ -12202,9 +12268,9 @@ msgstr ""
msgid "Take advantage of valuable benefits, products and services by joining Mandrake Club, such as:"
msgstr ""
-#: share/advertising/dwd-07.pl:22
+#: share/advertising/dwd-08.pl:14
#, c-format
-msgid "For more information, please visit www.mandrakeclub.com"
+msgid "<b>Do you require assistance?</b>"
msgstr ""
#: share/advertising/dwd-08.pl:16 share/advertising/pwp-10.pl:15
@@ -12212,11 +12278,6 @@ msgstr ""
msgid "<b>MandrakeExpert</b> is the primary source for technical support."
msgstr ""
-#: share/advertising/dwd-08.pl:18
-#, c-format
-msgid "If you have Linux questions, subscribe to MandrakeExpert at www.mandrakeexpert.com"
-msgstr ""
-
#: share/advertising/dwd-09.pl:13
#, c-format
msgid "<b>Note</b>"
@@ -12224,12 +12285,12 @@ msgstr ""
#: share/advertising/dwd-09.pl:15
#, c-format
-msgid "This is the Mandrake Linux \"Download version\"."
+msgid "This is the Mandrake Linux <b>Download version</b>."
msgstr ""
#: share/advertising/dwd-09.pl:17
#, c-format
-msgid "The free download version does not include commercial software, and therefore may not work with certain proprietary network cards and video cards such as NVIDA(r) nForce. To avoid possible compatibiity issues with these devices, we recommend the purchase of one of our retail products that includes commercial drivers and additional software."
+msgid "The free download version does not include commercial software, and therefore may not work with certain proprietary network cards and video cards such as NVIDIA(r) nForce. To avoid possible compatibiity issues with these devices, we recommend the purchase of one of our retail products that includes commercial drivers and additional software."
msgstr ""
#: share/advertising/ppp-01.pl:17
@@ -12679,6 +12740,11 @@ msgid ""
""
msgstr ""
+#: standalone/drakTermServ:217 standalone/drakTermServ:487 standalone/drakfont:572
+#, c-format
+msgid "OK"
+msgstr ""
+
#: standalone/drakTermServ:233
#, c-format
msgid "Terminal Server Configuration"
@@ -13381,91 +13447,91 @@ msgstr ""
msgid "No devices found"
msgstr ""
-#: standalone/drakbackup:194
+#: standalone/drakbackup:195
#, c-format
msgid "Expect is an extension to the Tcl scripting language that allows interactive sessions without user intervention."
msgstr ""
-#: standalone/drakbackup:195
+#: standalone/drakbackup:196
#, c-format
msgid "Store the password for this system in drakbackup configuration."
msgstr ""
-#: standalone/drakbackup:196
+#: standalone/drakbackup:197
#, c-format
msgid "For a multisession CD, only the first session will erase the cdrw. Otherwise the cdrw is erased before each backup."
msgstr ""
-#: standalone/drakbackup:197
+#: standalone/drakbackup:198
#, c-format
msgid "This uses the same syntax as the command line program 'cdrecord'. 'cdrecord -scanbus' would also show you the device number."
msgstr ""
-#: standalone/drakbackup:198
+#: standalone/drakbackup:199
#, c-format
msgid "This option will save files that have changed. Exact behavior depends on whether incremental or differential mode is used."
msgstr ""
-#: standalone/drakbackup:199
+#: standalone/drakbackup:200
#, c-format
msgid "Incremental backups only save files that have changed or are new since the last backup."
msgstr ""
-#: standalone/drakbackup:200
+#: standalone/drakbackup:201
#, c-format
msgid "Differential backups only save files that have changed or are new since the original 'base' backup."
msgstr ""
-#: standalone/drakbackup:201
+#: standalone/drakbackup:202
#, c-format
msgid "This should be a comma-separated list of local users or email addresses that you want the backup results sent to. You will need a functioning mail transfer agent setup on your system."
msgstr ""
-#: standalone/drakbackup:202
+#: standalone/drakbackup:203
#, c-format
msgid "Files or wildcards listed in a .backupignore file at the top of a directory tree will not be backed up."
msgstr ""
-#: standalone/drakbackup:203
+#: standalone/drakbackup:204
#, c-format
msgid "For backups to other media, files are still created on the hard drive, then moved to the other media. Enabling this option will remove the hard drive tar files after the backup."
msgstr ""
-#: standalone/drakbackup:204
+#: standalone/drakbackup:205
#, c-format
msgid "Some protocols, like rsync, may be configured at the server end. Rather than using a directory path, you would use the 'module' name for the service path."
msgstr ""
-#: standalone/drakbackup:205
+#: standalone/drakbackup:206
#, c-format
msgid "Custom allows you to specify your own day and time. The other options use run-parts in /etc/crontab."
msgstr ""
-#: standalone/drakbackup:601
+#: standalone/drakbackup:602
#, c-format
msgid "Interval cron not available as non-root"
msgstr ""
-#: standalone/drakbackup:728
+#: standalone/drakbackup:729
#, c-format
msgid "Valid user list changed, rewriting config file."
msgstr ""
-#: standalone/drakbackup:730
+#: standalone/drakbackup:731
#, c-format
msgid ""
"Old user list:\n"
""
msgstr ""
-#: standalone/drakbackup:732
+#: standalone/drakbackup:733
#, c-format
msgid ""
"New user list:\n"
""
msgstr ""
-#: standalone/drakbackup:779
+#: standalone/drakbackup:780
#, c-format
msgid ""
"\n"
@@ -13473,7 +13539,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:780
+#: standalone/drakbackup:781
#, c-format
msgid ""
"\n"
@@ -13481,7 +13547,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:786
+#: standalone/drakbackup:787
#, c-format
msgid ""
"\n"
@@ -13491,12 +13557,12 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:808 standalone/drakbackup:881 standalone/drakbackup:937
+#: standalone/drakbackup:809 standalone/drakbackup:882 standalone/drakbackup:938
#, c-format
msgid "Total progress"
msgstr ""
-#: standalone/drakbackup:863
+#: standalone/drakbackup:864
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -13505,42 +13571,42 @@ msgid ""
" need to purge the entry from authorized_keys on the server."
msgstr ""
-#: standalone/drakbackup:872
+#: standalone/drakbackup:873
#, c-format
msgid "This may take a moment to generate the keys."
msgstr ""
-#: standalone/drakbackup:879
+#: standalone/drakbackup:880
#, c-format
msgid "Cannot spawn %s."
msgstr ""
-#: standalone/drakbackup:896
+#: standalone/drakbackup:897
#, c-format
msgid "No password prompt on %s at port %s"
msgstr ""
-#: standalone/drakbackup:897
+#: standalone/drakbackup:898
#, c-format
msgid "Bad password on %s"
msgstr ""
-#: standalone/drakbackup:898
+#: standalone/drakbackup:899
#, c-format
msgid "Permission denied transferring %s to %s"
msgstr ""
-#: standalone/drakbackup:899
+#: standalone/drakbackup:900
#, c-format
msgid "Can't find %s on %s"
msgstr ""
-#: standalone/drakbackup:902
+#: standalone/drakbackup:903
#, c-format
msgid "%s not responding"
msgstr ""
-#: standalone/drakbackup:906
+#: standalone/drakbackup:907
#, c-format
msgid ""
"Transfer successful\n"
@@ -13551,84 +13617,84 @@ msgid ""
"without being prompted for a password."
msgstr ""
-#: standalone/drakbackup:951
+#: standalone/drakbackup:952
#, c-format
msgid "WebDAV remote site already in sync!"
msgstr ""
-#: standalone/drakbackup:955
+#: standalone/drakbackup:956
#, c-format
msgid "WebDAV transfer failed!"
msgstr ""
-#: standalone/drakbackup:976
+#: standalone/drakbackup:977
#, c-format
msgid "No CD-R/DVD-R in drive!"
msgstr ""
-#: standalone/drakbackup:980
+#: standalone/drakbackup:981
#, c-format
msgid "Does not appear to be recordable media!"
msgstr ""
-#: standalone/drakbackup:984
+#: standalone/drakbackup:985
#, c-format
msgid "Not erasable media!"
msgstr ""
-#: standalone/drakbackup:1025
+#: standalone/drakbackup:1026
#, c-format
msgid "This may take a moment to erase the media."
msgstr ""
-#: standalone/drakbackup:1100
+#: standalone/drakbackup:1101
#, c-format
msgid "Permission problem accessing CD."
msgstr ""
-#: standalone/drakbackup:1127
+#: standalone/drakbackup:1128
#, c-format
msgid "No tape in %s!"
msgstr ""
-#: standalone/drakbackup:1230
+#: standalone/drakbackup:1231
#, c-format
msgid ""
"Backup quota exceeded!\n"
"%d MB used vs %d MB allocated."
msgstr ""
-#: standalone/drakbackup:1249 standalone/drakbackup:1308
+#: standalone/drakbackup:1250 standalone/drakbackup:1306
#, c-format
msgid "Backup system files..."
msgstr ""
-#: standalone/drakbackup:1309 standalone/drakbackup:1376
+#: standalone/drakbackup:1307 standalone/drakbackup:1371
#, c-format
msgid "Hard Disk Backup files..."
msgstr ""
-#: standalone/drakbackup:1375
+#: standalone/drakbackup:1370
#, c-format
msgid "Backup User files..."
msgstr ""
-#: standalone/drakbackup:1439
+#: standalone/drakbackup:1426
#, c-format
msgid "Backup Other files..."
msgstr ""
-#: standalone/drakbackup:1440
+#: standalone/drakbackup:1427
#, c-format
msgid "Hard Disk Backup Progress..."
msgstr ""
-#: standalone/drakbackup:1445
+#: standalone/drakbackup:1432
#, c-format
msgid "No changes to backup!"
msgstr ""
-#: standalone/drakbackup:1463 standalone/drakbackup:1486
+#: standalone/drakbackup:1450 standalone/drakbackup:1473
#, c-format
msgid ""
"\n"
@@ -13637,14 +13703,14 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1470
+#: standalone/drakbackup:1457
#, c-format
msgid ""
"file list sent by FTP: %s\n"
" "
msgstr ""
-#: standalone/drakbackup:1473
+#: standalone/drakbackup:1460
#, c-format
msgid ""
"\n"
@@ -13652,12 +13718,12 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1461
#, c-format
msgid "Error during sending file via FTP. Please correct your FTP configuration."
msgstr ""
-#: standalone/drakbackup:1491
+#: standalone/drakbackup:1478
#, c-format
msgid ""
"\n"
@@ -13666,7 +13732,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1496
+#: standalone/drakbackup:1483
#, c-format
msgid ""
"\n"
@@ -13675,39 +13741,39 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1505
+#: standalone/drakbackup:1492
#, c-format
msgid "Error during sendmail. Your report mail was not sent. Please configure sendmail"
msgstr ""
-#: standalone/drakbackup:1506
+#: standalone/drakbackup:1493
#, c-format
msgid ""
" Error while sending mail. \n"
""
msgstr ""
-#: standalone/drakbackup:1535
+#: standalone/drakbackup:1522
#, c-format
msgid "Can't create catalog!"
msgstr ""
-#: standalone/drakbackup:1621
+#: standalone/drakbackup:1644
#, c-format
msgid "Can't create log file!"
msgstr ""
-#: standalone/drakbackup:1638 standalone/drakbackup:1649 standalone/drakfont:584
+#: standalone/drakbackup:1661 standalone/drakbackup:1672 standalone/drakfont:584
#, c-format
msgid "File Selection"
msgstr ""
-#: standalone/drakbackup:1677
+#: standalone/drakbackup:1700
#, c-format
msgid "Select the files or directories and click on 'OK'"
msgstr ""
-#: standalone/drakbackup:1705
+#: standalone/drakbackup:1728
#, c-format
msgid ""
"\n"
@@ -13715,520 +13781,520 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1706
+#: standalone/drakbackup:1729
#, c-format
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
""
msgstr ""
-#: standalone/drakbackup:1707
+#: standalone/drakbackup:1730
#, c-format
msgid "Backup your System files. (/etc directory)"
msgstr ""
-#: standalone/drakbackup:1708 standalone/drakbackup:1772 standalone/drakbackup:1838
+#: standalone/drakbackup:1731 standalone/drakbackup:1795 standalone/drakbackup:1861
#, c-format
msgid "Use Incremental/Differential Backups (do not replace old backups)"
msgstr ""
-#: standalone/drakbackup:1710 standalone/drakbackup:1774 standalone/drakbackup:1840
+#: standalone/drakbackup:1733 standalone/drakbackup:1797 standalone/drakbackup:1863
#, c-format
msgid "Use Incremental Backups"
msgstr ""
-#: standalone/drakbackup:1710 standalone/drakbackup:1774 standalone/drakbackup:1840
+#: standalone/drakbackup:1733 standalone/drakbackup:1797 standalone/drakbackup:1863
#, c-format
msgid "Use Differential Backups"
msgstr ""
-#: standalone/drakbackup:1712
+#: standalone/drakbackup:1735
#, c-format
msgid "Do not include critical files (passwd, group, fstab)"
msgstr ""
-#: standalone/drakbackup:1713
+#: standalone/drakbackup:1736
#, c-format
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr ""
-#: standalone/drakbackup:1744
+#: standalone/drakbackup:1767
#, c-format
msgid "Please check all users that you want to include in your backup."
msgstr ""
-#: standalone/drakbackup:1771
+#: standalone/drakbackup:1794
#, c-format
msgid "Do not include the browser cache"
msgstr ""
-#: standalone/drakbackup:1826 standalone/drakfont:650
+#: standalone/drakbackup:1849 standalone/drakfont:650
#, c-format
msgid "Remove Selected"
msgstr ""
-#: standalone/drakbackup:1873 standalone/drakbackup:1877
+#: standalone/drakbackup:1896 standalone/drakbackup:1900
#, c-format
msgid "Under Devel ... please wait."
msgstr ""
-#: standalone/drakbackup:1891
+#: standalone/drakbackup:1914
#, c-format
msgid "Windows (FAT32)"
msgstr ""
-#: standalone/drakbackup:1924
+#: standalone/drakbackup:1947
#, c-format
msgid "Users"
msgstr ""
-#: standalone/drakbackup:1943
+#: standalone/drakbackup:1966
#, c-format
msgid "Use network connection to backup"
msgstr ""
-#: standalone/drakbackup:1945
+#: standalone/drakbackup:1968
#, c-format
msgid "Net Method:"
msgstr ""
-#: standalone/drakbackup:1949
+#: standalone/drakbackup:1972
#, c-format
msgid "Use Expect for SSH"
msgstr ""
-#: standalone/drakbackup:1950
+#: standalone/drakbackup:1973
#, c-format
msgid "Create/Transfer backup keys for SSH"
msgstr ""
-#: standalone/drakbackup:1952
+#: standalone/drakbackup:1975
#, c-format
msgid "Transfer Now"
msgstr ""
-#: standalone/drakbackup:1954
+#: standalone/drakbackup:1977
#, c-format
msgid "Other (not drakbackup) keys in place already"
msgstr ""
-#: standalone/drakbackup:1957
+#: standalone/drakbackup:1980
#, c-format
msgid "Host name or IP."
msgstr ""
-#: standalone/drakbackup:1962
+#: standalone/drakbackup:1985
#, c-format
msgid "Directory (or module) to put the backup on this host."
msgstr ""
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1990
#, c-format
msgid "Login name"
msgstr ""
-#: standalone/drakbackup:1974
+#: standalone/drakbackup:1997
#, c-format
msgid "Remember this password"
msgstr ""
-#: standalone/drakbackup:1986
+#: standalone/drakbackup:2009
#, c-format
msgid "Need hostname, username and password!"
msgstr ""
-#: standalone/drakbackup:2087
+#: standalone/drakbackup:2110
#, c-format
msgid "Use CD-R/DVD-R to backup"
msgstr ""
-#: standalone/drakbackup:2090
+#: standalone/drakbackup:2113
#, c-format
msgid "Choose your CD/DVD device"
msgstr ""
-#: standalone/drakbackup:2095
+#: standalone/drakbackup:2118
#, c-format
msgid "Choose your CD/DVD media size"
msgstr ""
-#: standalone/drakbackup:2102
+#: standalone/drakbackup:2125
#, c-format
msgid "Multisession CD"
msgstr ""
-#: standalone/drakbackup:2104
+#: standalone/drakbackup:2127
#, c-format
msgid "CDRW media"
msgstr ""
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:2132
#, c-format
msgid "Erase your RW media (1st Session)"
msgstr ""
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2133
#, c-format
msgid " Erase Now "
msgstr ""
-#: standalone/drakbackup:2117
+#: standalone/drakbackup:2140
#, c-format
msgid "DVD+RW media"
msgstr ""
-#: standalone/drakbackup:2119
+#: standalone/drakbackup:2142
#, c-format
msgid "DVD-R media"
msgstr ""
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:2144
#, c-format
msgid "DVDRAM device"
msgstr ""
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2149
#, c-format
msgid ""
"Enter your CD Writer device name\n"
" ex: 0,1,0"
msgstr ""
-#: standalone/drakbackup:2158
+#: standalone/drakbackup:2181
#, c-format
msgid "No CD device defined!"
msgstr ""
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2230
#, c-format
msgid "Use tape to backup"
msgstr ""
-#: standalone/drakbackup:2210
+#: standalone/drakbackup:2233
#, c-format
msgid "Device name to use for backup"
msgstr ""
-#: standalone/drakbackup:2217
+#: standalone/drakbackup:2240
#, c-format
msgid "Don't rewind tape after backup"
msgstr ""
-#: standalone/drakbackup:2223
+#: standalone/drakbackup:2246
#, c-format
msgid "Erase tape before backup"
msgstr ""
-#: standalone/drakbackup:2229
+#: standalone/drakbackup:2252
#, c-format
msgid "Eject tape after the backup"
msgstr ""
-#: standalone/drakbackup:2296
+#: standalone/drakbackup:2319
#, c-format
msgid "Enter the directory to save to:"
msgstr ""
-#: standalone/drakbackup:2305
+#: standalone/drakbackup:2328
#, c-format
msgid ""
"Maximum size\n"
" allowed for Drakbackup (MB)"
msgstr ""
-#: standalone/drakbackup:2377
+#: standalone/drakbackup:2400
#, c-format
msgid "CD-R / DVD-R"
msgstr ""
-#: standalone/drakbackup:2382
+#: standalone/drakbackup:2405
#, c-format
msgid "HardDrive / NFS"
msgstr ""
-#: standalone/drakbackup:2398 standalone/drakbackup:2403 standalone/drakbackup:2408
+#: standalone/drakbackup:2421 standalone/drakbackup:2426 standalone/drakbackup:2431
#, c-format
msgid "hourly"
msgstr ""
-#: standalone/drakbackup:2399 standalone/drakbackup:2404 standalone/drakbackup:2408
+#: standalone/drakbackup:2422 standalone/drakbackup:2427 standalone/drakbackup:2431
#, c-format
msgid "daily"
msgstr ""
-#: standalone/drakbackup:2400 standalone/drakbackup:2405 standalone/drakbackup:2408
+#: standalone/drakbackup:2423 standalone/drakbackup:2428 standalone/drakbackup:2431
#, c-format
msgid "weekly"
msgstr ""
-#: standalone/drakbackup:2401 standalone/drakbackup:2406 standalone/drakbackup:2408
+#: standalone/drakbackup:2424 standalone/drakbackup:2429 standalone/drakbackup:2431
#, c-format
msgid "monthly"
msgstr ""
-#: standalone/drakbackup:2402 standalone/drakbackup:2407 standalone/drakbackup:2408
+#: standalone/drakbackup:2425 standalone/drakbackup:2430 standalone/drakbackup:2431
#, c-format
msgid "custom"
msgstr ""
-#: standalone/drakbackup:2413
+#: standalone/drakbackup:2436
#, c-format
msgid "January"
msgstr ""
-#: standalone/drakbackup:2413
+#: standalone/drakbackup:2436
#, c-format
msgid "February"
msgstr ""
-#: standalone/drakbackup:2413
+#: standalone/drakbackup:2436
#, c-format
msgid "March"
msgstr ""
-#: standalone/drakbackup:2414
+#: standalone/drakbackup:2437
#, c-format
msgid "April"
msgstr ""
-#: standalone/drakbackup:2414
+#: standalone/drakbackup:2437
#, c-format
msgid "May"
msgstr ""
-#: standalone/drakbackup:2414
+#: standalone/drakbackup:2437
#, c-format
msgid "June"
msgstr ""
-#: standalone/drakbackup:2414
+#: standalone/drakbackup:2437
#, c-format
msgid "July"
msgstr ""
-#: standalone/drakbackup:2414
+#: standalone/drakbackup:2437
#, c-format
msgid "August"
msgstr ""
-#: standalone/drakbackup:2414
+#: standalone/drakbackup:2437
#, c-format
msgid "September"
msgstr ""
-#: standalone/drakbackup:2415
+#: standalone/drakbackup:2438
#, c-format
msgid "October"
msgstr ""
-#: standalone/drakbackup:2415
+#: standalone/drakbackup:2438
#, c-format
msgid "November"
msgstr ""
-#: standalone/drakbackup:2415
+#: standalone/drakbackup:2438
#, c-format
msgid "December"
msgstr ""
-#: standalone/drakbackup:2420
+#: standalone/drakbackup:2443
#, c-format
msgid "Sunday"
msgstr ""
-#: standalone/drakbackup:2420
+#: standalone/drakbackup:2443
#, c-format
msgid "Monday"
msgstr ""
-#: standalone/drakbackup:2420
+#: standalone/drakbackup:2443
#, c-format
msgid "Tuesday"
msgstr ""
-#: standalone/drakbackup:2421
+#: standalone/drakbackup:2444
#, c-format
msgid "Wednesday"
msgstr ""
-#: standalone/drakbackup:2421
+#: standalone/drakbackup:2444
#, c-format
msgid "Thursday"
msgstr ""
-#: standalone/drakbackup:2421
+#: standalone/drakbackup:2444
#, c-format
msgid "Friday"
msgstr ""
-#: standalone/drakbackup:2421
+#: standalone/drakbackup:2444
#, c-format
msgid "Saturday"
msgstr ""
-#: standalone/drakbackup:2456
+#: standalone/drakbackup:2479
#, c-format
msgid "Use daemon"
msgstr ""
-#: standalone/drakbackup:2461
+#: standalone/drakbackup:2484
#, c-format
msgid "Please choose the time interval between each backup"
msgstr ""
-#: standalone/drakbackup:2467
+#: standalone/drakbackup:2490
#, c-format
msgid "Custom setup/crontab entry:"
msgstr ""
-#: standalone/drakbackup:2472
+#: standalone/drakbackup:2495
#, c-format
msgid "Minute"
msgstr ""
-#: standalone/drakbackup:2476
+#: standalone/drakbackup:2499
#, c-format
msgid "Hour"
msgstr ""
-#: standalone/drakbackup:2480
+#: standalone/drakbackup:2503
#, c-format
msgid "Day"
msgstr ""
-#: standalone/drakbackup:2484
+#: standalone/drakbackup:2507
#, c-format
msgid "Month"
msgstr ""
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2511
#, c-format
msgid "Weekday"
msgstr ""
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2517
#, c-format
msgid "Please choose the media for backup."
msgstr ""
-#: standalone/drakbackup:2501
+#: standalone/drakbackup:2524
#, c-format
msgid "Please be sure that the cron daemon is included in your services."
msgstr ""
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2525
#, c-format
msgid "Note that currently all 'net' media also use the hard drive."
msgstr ""
-#: standalone/drakbackup:2549
+#: standalone/drakbackup:2572
#, c-format
msgid "Use tar and bzip2 (rather than tar and gzip)"
msgstr ""
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2573
#, c-format
msgid "Use .backupignore files"
msgstr ""
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2575
#, c-format
msgid "Send mail report after each backup to:"
msgstr ""
-#: standalone/drakbackup:2557
+#: standalone/drakbackup:2580
#, c-format
msgid "Delete Hard Drive tar files after backup to other media."
msgstr ""
-#: standalone/drakbackup:2594
+#: standalone/drakbackup:2617
#, c-format
msgid "What"
msgstr ""
-#: standalone/drakbackup:2599
+#: standalone/drakbackup:2622
#, c-format
msgid "Where"
msgstr ""
-#: standalone/drakbackup:2604
+#: standalone/drakbackup:2627
#, c-format
msgid "When"
msgstr ""
-#: standalone/drakbackup:2609
+#: standalone/drakbackup:2632
#, c-format
msgid "More Options"
msgstr ""
-#: standalone/drakbackup:2630 standalone/drakbackup:4662
+#: standalone/drakbackup:2653 standalone/drakbackup:4685
#, c-format
msgid "Drakbackup Configuration"
msgstr ""
-#: standalone/drakbackup:2647
+#: standalone/drakbackup:2670
#, c-format
msgid "Please choose where you want to backup"
msgstr ""
-#: standalone/drakbackup:2649
+#: standalone/drakbackup:2672
#, c-format
msgid "On Hard Drive"
msgstr ""
-#: standalone/drakbackup:2659
+#: standalone/drakbackup:2682
#, c-format
msgid "Across Network"
msgstr ""
-#: standalone/drakbackup:2669
+#: standalone/drakbackup:2692
#, c-format
msgid "On CD-R"
msgstr ""
-#: standalone/drakbackup:2679
+#: standalone/drakbackup:2702
#, c-format
msgid "On Tape Device"
msgstr ""
-#: standalone/drakbackup:2712
+#: standalone/drakbackup:2735
#, c-format
msgid "Please select media for backup..."
msgstr ""
-#: standalone/drakbackup:2734
+#: standalone/drakbackup:2757
#, c-format
msgid "Backup Users"
msgstr ""
-#: standalone/drakbackup:2735
+#: standalone/drakbackup:2758
#, c-format
msgid " (Default is all users)"
msgstr ""
-#: standalone/drakbackup:2747
+#: standalone/drakbackup:2770
#, c-format
msgid "Please choose what you want to backup"
msgstr ""
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2771
#, c-format
msgid "Backup System"
msgstr ""
-#: standalone/drakbackup:2750
+#: standalone/drakbackup:2773
#, c-format
msgid "Select user manually"
msgstr ""
-#: standalone/drakbackup:2779
+#: standalone/drakbackup:2802
#, c-format
msgid "Please select data to backup..."
msgstr ""
-#: standalone/drakbackup:2853
+#: standalone/drakbackup:2876
#, c-format
msgid ""
"\n"
@@ -14236,7 +14302,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2854
+#: standalone/drakbackup:2877
#, c-format
msgid ""
"\n"
@@ -14244,7 +14310,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2856
+#: standalone/drakbackup:2879
#, c-format
msgid ""
"\n"
@@ -14252,7 +14318,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2858
+#: standalone/drakbackup:2881
#, c-format
msgid ""
"\n"
@@ -14260,7 +14326,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2860
+#: standalone/drakbackup:2883
#, c-format
msgid ""
"\n"
@@ -14268,14 +14334,14 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2861
+#: standalone/drakbackup:2884
#, c-format
msgid ""
"\tLimit disk usage to %s MB\n"
""
msgstr ""
-#: standalone/drakbackup:2864
+#: standalone/drakbackup:2887
#, c-format
msgid ""
"\n"
@@ -14283,51 +14349,51 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2868
+#: standalone/drakbackup:2891
#, c-format
msgid "NO"
msgstr ""
-#: standalone/drakbackup:2869
+#: standalone/drakbackup:2892
#, c-format
msgid "YES"
msgstr ""
-#: standalone/drakbackup:2870
+#: standalone/drakbackup:2893
#, c-format
msgid ""
"\n"
"- Burn to CD"
msgstr ""
-#: standalone/drakbackup:2871
+#: standalone/drakbackup:2894
#, c-format
msgid "RW"
msgstr ""
-#: standalone/drakbackup:2872
+#: standalone/drakbackup:2895
#, c-format
msgid " on device: %s"
msgstr ""
-#: standalone/drakbackup:2873
+#: standalone/drakbackup:2896
#, c-format
msgid " (multi-session)"
msgstr ""
-#: standalone/drakbackup:2874
+#: standalone/drakbackup:2897
#, c-format
msgid ""
"\n"
"- Save to Tape on device: %s"
msgstr ""
-#: standalone/drakbackup:2875
+#: standalone/drakbackup:2898
#, c-format
msgid "\t\tErase=%s"
msgstr ""
-#: standalone/drakbackup:2878
+#: standalone/drakbackup:2901
#, c-format
msgid ""
"\n"
@@ -14335,7 +14401,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2902
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -14343,7 +14409,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2903
#, c-format
msgid ""
"\n"
@@ -14351,42 +14417,42 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2881
+#: standalone/drakbackup:2904
#, c-format
msgid ""
"\tDo not include System Files\n"
""
msgstr ""
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2907
#, c-format
msgid ""
"\tBackups use tar and bzip2\n"
""
msgstr ""
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2909
#, c-format
msgid ""
"\tBackups use tar and gzip\n"
""
msgstr ""
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2912
#, c-format
msgid ""
"\tUse .backupignore files\n"
""
msgstr ""
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2913
#, c-format
msgid ""
"\tSend mail to %s\n"
""
msgstr ""
-#: standalone/drakbackup:2892
+#: standalone/drakbackup:2915
#, c-format
msgid ""
"\n"
@@ -14394,63 +14460,63 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2893
+#: standalone/drakbackup:2916
#, c-format
msgid ""
"\t-Hard drive.\n"
""
msgstr ""
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2917
#, c-format
msgid ""
"\t-CD-R.\n"
""
msgstr ""
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2918
#, c-format
msgid ""
"\t-Tape \n"
""
msgstr ""
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2919
#, c-format
msgid ""
"\t-Network by FTP.\n"
""
msgstr ""
-#: standalone/drakbackup:2897
+#: standalone/drakbackup:2920
#, c-format
msgid ""
"\t-Network by SSH.\n"
""
msgstr ""
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2921
#, c-format
msgid ""
"\t-Network by rsync.\n"
""
msgstr ""
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2922
#, c-format
msgid ""
"\t-Network by webdav.\n"
""
msgstr ""
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2924
#, c-format
msgid ""
"No configuration, please click Wizard or Advanced.\n"
""
msgstr ""
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2929
#, c-format
msgid ""
"List of data to restore:\n"
@@ -14458,35 +14524,35 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2908
+#: standalone/drakbackup:2931
#, c-format
msgid ""
"- Restore System Files.\n"
""
msgstr ""
-#: standalone/drakbackup:2910 standalone/drakbackup:2920
+#: standalone/drakbackup:2933 standalone/drakbackup:2943
#, c-format
msgid ""
" - from date: %s %s\n"
""
msgstr ""
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2936
#, c-format
msgid ""
"- Restore User Files: \n"
""
msgstr ""
-#: standalone/drakbackup:2918
+#: standalone/drakbackup:2941
#, c-format
msgid ""
"- Restore Other Files: \n"
""
msgstr ""
-#: standalone/drakbackup:3094
+#: standalone/drakbackup:3117
#, c-format
msgid ""
"List of data corrupted:\n"
@@ -14494,378 +14560,378 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:3096
+#: standalone/drakbackup:3119
#, c-format
msgid "Please uncheck or remove it on next time."
msgstr ""
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3129
#, c-format
msgid "Backup files are corrupted"
msgstr ""
-#: standalone/drakbackup:3127
+#: standalone/drakbackup:3150
#, c-format
msgid " All of your selected data have been "
msgstr ""
-#: standalone/drakbackup:3128
+#: standalone/drakbackup:3151
#, c-format
msgid " Successfuly Restored on %s "
msgstr ""
-#: standalone/drakbackup:3243
+#: standalone/drakbackup:3266
#, c-format
msgid " Restore Configuration "
msgstr ""
-#: standalone/drakbackup:3271
+#: standalone/drakbackup:3294
#, c-format
msgid "OK to restore the other files."
msgstr ""
-#: standalone/drakbackup:3289
+#: standalone/drakbackup:3312
#, c-format
msgid "User list to restore (only the most recent date per user is important)"
msgstr ""
-#: standalone/drakbackup:3357
+#: standalone/drakbackup:3380
#, c-format
msgid "please choose the date to restore"
msgstr ""
-#: standalone/drakbackup:3395
+#: standalone/drakbackup:3418
#, c-format
msgid "Restore from Hard Disk."
msgstr ""
-#: standalone/drakbackup:3397
+#: standalone/drakbackup:3420
#, c-format
msgid "Enter the directory where backups are stored"
msgstr ""
-#: standalone/drakbackup:3453
+#: standalone/drakbackup:3476
#, c-format
msgid "Select another media to restore from"
msgstr ""
-#: standalone/drakbackup:3455
+#: standalone/drakbackup:3478
#, c-format
msgid "Other Media"
msgstr ""
-#: standalone/drakbackup:3460
+#: standalone/drakbackup:3483
#, c-format
msgid "Restore system"
msgstr ""
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3484
#, c-format
msgid "Restore Users"
msgstr ""
-#: standalone/drakbackup:3462
+#: standalone/drakbackup:3485
#, c-format
msgid "Restore Other"
msgstr ""
-#: standalone/drakbackup:3464
+#: standalone/drakbackup:3487
#, c-format
msgid "select path to restore (instead of /)"
msgstr ""
-#: standalone/drakbackup:3468
+#: standalone/drakbackup:3491
#, c-format
msgid "Do new backup before restore (only for incremental backups.)"
msgstr ""
-#: standalone/drakbackup:3470
+#: standalone/drakbackup:3493
#, c-format
msgid "Remove user directories before restore."
msgstr ""
-#: standalone/drakbackup:3544
+#: standalone/drakbackup:3567
#, c-format
msgid "Filename text to search for:"
msgstr ""
-#: standalone/drakbackup:3547
+#: standalone/drakbackup:3570
#, c-format
msgid "Search Backups"
msgstr ""
-#: standalone/drakbackup:3564
+#: standalone/drakbackup:3587
#, c-format
msgid "Restore Selected"
msgstr ""
-#: standalone/drakbackup:3687
+#: standalone/drakbackup:3710
#, c-format
msgid ""
"Restore Selected\n"
"Catalog Entry"
msgstr ""
-#: standalone/drakbackup:3696
+#: standalone/drakbackup:3719
#, c-format
msgid ""
"Restore Selected\n"
"Files"
msgstr ""
-#: standalone/drakbackup:3712
+#: standalone/drakbackup:3735
#, c-format
msgid ""
"Change\n"
"Restore Path"
msgstr ""
-#: standalone/drakbackup:3778
+#: standalone/drakbackup:3801
#, c-format
msgid "Backup files not found at %s."
msgstr ""
-#: standalone/drakbackup:3791
+#: standalone/drakbackup:3814
#, c-format
msgid "Restore From CD"
msgstr ""
-#: standalone/drakbackup:3791
+#: standalone/drakbackup:3814
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
" in the CD drive under mount point /mnt/cdrom"
msgstr ""
-#: standalone/drakbackup:3793
+#: standalone/drakbackup:3816
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr ""
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3826
#, c-format
msgid "Restore From Tape"
msgstr ""
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3826
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
" in the tape drive device %s"
msgstr ""
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3828
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr ""
-#: standalone/drakbackup:3816
+#: standalone/drakbackup:3839
#, c-format
msgid "Restore Via Network"
msgstr ""
-#: standalone/drakbackup:3816
+#: standalone/drakbackup:3839
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr ""
-#: standalone/drakbackup:3817
+#: standalone/drakbackup:3840
#, c-format
msgid "Host Name"
msgstr ""
-#: standalone/drakbackup:3818
+#: standalone/drakbackup:3841
#, c-format
msgid "Host Path or Module"
msgstr ""
-#: standalone/drakbackup:3825
+#: standalone/drakbackup:3848
#, c-format
msgid "Password required"
msgstr ""
-#: standalone/drakbackup:3831
+#: standalone/drakbackup:3854
#, c-format
msgid "Username required"
msgstr ""
-#: standalone/drakbackup:3834
+#: standalone/drakbackup:3857
#, c-format
msgid "Hostname required"
msgstr ""
-#: standalone/drakbackup:3839
+#: standalone/drakbackup:3862
#, c-format
msgid "Path or Module required"
msgstr ""
-#: standalone/drakbackup:3852
+#: standalone/drakbackup:3875
#, c-format
msgid "Files Restored..."
msgstr ""
-#: standalone/drakbackup:3855
+#: standalone/drakbackup:3878
#, c-format
msgid "Restore Failed..."
msgstr ""
-#: standalone/drakbackup:4090 standalone/drakbackup:4159
+#: standalone/drakbackup:4113 standalone/drakbackup:4182
#, c-format
msgid "Search for files to restore"
msgstr ""
-#: standalone/drakbackup:4095
+#: standalone/drakbackup:4118
#, c-format
msgid "Restore all backups"
msgstr ""
-#: standalone/drakbackup:4104
+#: standalone/drakbackup:4127
#, c-format
msgid "Custom Restore"
msgstr ""
-#: standalone/drakbackup:4127
+#: standalone/drakbackup:4150
#, c-format
msgid ""
"Unable to find backups to restore...\n"
""
msgstr ""
-#: standalone/drakbackup:4128
+#: standalone/drakbackup:4151
#, c-format
msgid "Verify that %s is the correct path"
msgstr ""
-#: standalone/drakbackup:4129
+#: standalone/drakbackup:4152
#, c-format
msgid " and the CD is in the drive"
msgstr ""
-#: standalone/drakbackup:4131
+#: standalone/drakbackup:4154
#, c-format
msgid "Backups on unmountable media - Use Catalog to restore"
msgstr ""
-#: standalone/drakbackup:4147
+#: standalone/drakbackup:4170
#, c-format
msgid "CD in place - continue."
msgstr ""
-#: standalone/drakbackup:4152
+#: standalone/drakbackup:4175
#, c-format
msgid "Browse to new restore repository."
msgstr ""
-#: standalone/drakbackup:4155
+#: standalone/drakbackup:4178
#, c-format
msgid "Restore From Catalog"
msgstr ""
-#: standalone/drakbackup:4189
+#: standalone/drakbackup:4212
#, c-format
msgid "Restore Progress"
msgstr ""
-#: standalone/drakbackup:4223 standalone/drakbackup:4335 standalone/logdrake:175
+#: standalone/drakbackup:4246 standalone/drakbackup:4358 standalone/logdrake:175
#, c-format
msgid "Save"
msgstr ""
-#: standalone/drakbackup:4309
+#: standalone/drakbackup:4332
#, c-format
msgid "Build Backup"
msgstr ""
-#: standalone/drakbackup:4361 standalone/drakbackup:4760
+#: standalone/drakbackup:4384 standalone/drakbackup:4783
#, c-format
msgid "Restore"
msgstr ""
-#: standalone/drakbackup:4531
+#: standalone/drakbackup:4554
#, c-format
msgid ""
"The following packages need to be installed:\n"
""
msgstr ""
-#: standalone/drakbackup:4553
+#: standalone/drakbackup:4576
#, c-format
msgid "Please select data to restore..."
msgstr ""
-#: standalone/drakbackup:4593
+#: standalone/drakbackup:4616
#, c-format
msgid "Backup system files"
msgstr ""
-#: standalone/drakbackup:4596
+#: standalone/drakbackup:4619
#, c-format
msgid "Backup user files"
msgstr ""
-#: standalone/drakbackup:4599
+#: standalone/drakbackup:4622
#, c-format
msgid "Backup other files"
msgstr ""
-#: standalone/drakbackup:4602 standalone/drakbackup:4638
+#: standalone/drakbackup:4625 standalone/drakbackup:4661
#, c-format
msgid "Total Progress"
msgstr ""
-#: standalone/drakbackup:4630
+#: standalone/drakbackup:4653
#, c-format
msgid "Sending files by FTP"
msgstr ""
-#: standalone/drakbackup:4633
+#: standalone/drakbackup:4656
#, c-format
msgid "Sending files..."
msgstr ""
-#: standalone/drakbackup:4703
+#: standalone/drakbackup:4726
#, c-format
msgid "Backup Now from configuration file"
msgstr ""
-#: standalone/drakbackup:4708
+#: standalone/drakbackup:4731
#, c-format
msgid "View Backup Configuration."
msgstr ""
-#: standalone/drakbackup:4734
+#: standalone/drakbackup:4757
#, c-format
msgid "Wizard Configuration"
msgstr ""
-#: standalone/drakbackup:4739
+#: standalone/drakbackup:4762
#, c-format
msgid "Advanced Configuration"
msgstr ""
-#: standalone/drakbackup:4744
+#: standalone/drakbackup:4767
#, c-format
msgid "View Configuration"
msgstr ""
-#: standalone/drakbackup:4748
+#: standalone/drakbackup:4771
#, c-format
msgid "View Last Log"
msgstr ""
-#: standalone/drakbackup:4753
+#: standalone/drakbackup:4776
#, c-format
msgid "Backup Now"
msgstr ""
-#: standalone/drakbackup:4757
+#: standalone/drakbackup:4780
#, c-format
msgid ""
"No configuration file found \n"
"please click Wizard or Advanced."
msgstr ""
-#: standalone/drakbackup:4789 standalone/drakbackup:4795
+#: standalone/drakbackup:4812 standalone/drakbackup:4818
#, c-format
msgid "Drakbackup"
msgstr ""
@@ -17813,7 +17879,7 @@ msgstr ""
#: standalone/logdrake:384
#, c-format
-msgid "What do you wan to do?"
+msgid "What do you want to do?"
msgstr ""
#: standalone/logdrake:391
diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot
index 7d2d745b9..4da222d9f 100644
--- a/perl-install/share/po/help-it.pot
+++ b/perl-install/share/po/help-it.pot
@@ -232,71 +232,6 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-msgstr ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Be careful to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ''C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ''N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
"This step is activated only if an existing GNU/Linux partition has been\n"
"found on your machine.\n"
"\n"
@@ -1041,101 +976,6 @@ msgstr ""
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-" video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-" video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ''/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-" video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-" video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ''live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ''novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ''*'' if you press [Tab] to see the boot selections."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
"Your choice of preferred language will affect the language of the\n"
"documentation, the installer and the system in general. Select first the\n"
"region you are located in, and then the language you speak.\n"
diff --git a/perl-install/share/po/help-zh_CN.pot b/perl-install/share/po/help-zh_CN.pot
index 43d29355d..c19a2cb28 100644
--- a/perl-install/share/po/help-zh_CN.pot
+++ b/perl-install/share/po/help-zh_CN.pot
@@ -80,7 +80,7 @@ msgstr ""
"分区。如果您想要使用这些分区,请选择此选项。稍后,安装程序会让您选择与每个分区关联的挂载点。先前的挂载点默认已经选中了,而您所需要做的仅仅是保留这些选项。\n"
"\n"
" * \"%s\":如果在您的硬盘上安装了 Microsoft Windows,而该操作系统占用了所有的空间,您就需要为 GNU/Linux\n"
-"创建剩余空间。要完成这一操作,您可以删除您的 Microsoft Windows 分区和数据(参看``删除整个磁盘''方案),或者更改\n"
+"创建剩余空间。要完成这一操作,您可以删除您的 Microsoft Windows 分区和数据(参看“删除整个磁盘”方案),或者更改\n"
"Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢失,但您必须事先对 Windows\n"
"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrake Linux 和 Microsoft\n"
"Windows,则推荐使用此选项。\n"
@@ -99,7 +99,7 @@ msgstr ""
"\n"
" *\n"
"\"%s\":如果您想要手动对您的硬盘进行分区,请选择此选项。请额外小心——该功能十分强大,但也很危险,您可能在不经意之间毁掉您的全部数据。这也正是为什么我们只对那些以前执行过类似操作并有些经验的用户才推荐此选项的原因。要获得关于如何使用\n"
-"DiskDrake 工具的更多说明,请参阅 ``初学者指南'' 一书中的 ``管理您的分区''一节。"
+"DiskDrake 工具的更多说明,请参阅 “初学者指南” 一书中的 “管理您的分区”一节。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
diff --git a/perl-install/share/po/help_xml2pm.pl b/perl-install/share/po/help_xml2pm.pl
index e4e2eba76..7eaa15498 100755
--- a/perl-install/share/po/help_xml2pm.pl
+++ b/perl-install/share/po/help_xml2pm.pl
@@ -135,20 +135,22 @@ sub rewrite2 {
fr => "« ",
de => "„",
es => "\\\"",
- it => "''",
+ it => "\\\"",
+ zh_CN => "“"
}}{$lang};
our $i18ned_close_text_quote = $ {{
fr => " »",
de => "“",
es => "\\\"",
- it => "''",
+ it => "\\\"",
+ zh_CN => "”"
}}{$lang};
- our $i18ned_open_label_quote = $ {{ fr => "« ", de => "„"}}{$lang};
- our $i18ned_close_label_quote = $ {{ fr => " »", de => "“"}}{$lang};
- our $i18ned_open_command_quote = $ {{ fr => "« ", de => "„"}}{$lang};
- our $i18ned_close_command_quote = $ {{ fr => " »", de => "“"}}{$lang};
- our $i18ned_open_input_quote = $ {{ fr => "« ", de => "»"}}{$lang};
- our $i18ned_close_input_quote = $ {{ fr => " »", de => "«"}}{$lang};
+ our $i18ned_open_label_quote = $ {{ fr => "« ", de => "„", zh_CN => "“"}}{$lang};
+ our $i18ned_close_label_quote = $ {{ fr => " »", de => "“", zh_CN => "”"}}{$lang};
+ our $i18ned_open_command_quote = $ {{ fr => "« ", de => "„", zh_CN => "“"}}{$lang};
+ our $i18ned_close_command_quote = $ {{ fr => " »", de => "“", zh_CN => "”"}}{$lang};
+ our $i18ned_open_input_quote = $ {{ fr => "« ", de => "»", zh_CN => "“"}}{$lang};
+ our $i18ned_close_input_quote = $ {{ fr => " »", de => "«", zh_CN => "”"}}{$lang};
our $i18ned_open_key_quote = $ {{ de => "["}}{$lang};
our $i18ned_close_key_quote = $ {{ de => "]"}}{$lang};
# rewrite2_ fills in $help