From 7e8ff9d936a7fa1108c82910d9b4bb6ac6fd94f0 Mon Sep 17 00:00:00 2001 From: Pablo Saratxaga Date: Thu, 12 Aug 2004 18:09:37 +0000 Subject: updated pot file --- perl-install/share/po/DrakX.pot | 1631 +++++++++++++++------------------- perl-install/share/po/help-de.pot | 10 +- perl-install/share/po/help-es.pot | 15 +- perl-install/share/po/help-fr.pot | 4 +- perl-install/share/po/help-it.pot | 6 +- perl-install/share/po/help-ru.pot | 27 +- perl-install/share/po/help-zh_CN.pot | 8 +- 7 files changed, 762 insertions(+), 939 deletions(-) diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index f5d0a9276..812cedd2b 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-08-11 14:05+0200\n" +"POT-Creation-Date: 2004-08-12 18:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -60,7 +60,7 @@ msgid "" "plug the key again, and launch Mandrake Move again." msgstr "" -#: ../move/move.pm:468 help.pm:418 install_steps_interactive.pm:1316 +#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1316 #, c-format msgid "Reboot" msgstr "" @@ -131,7 +131,7 @@ msgstr "" msgid "Please wait, detecting and configuring devices..." msgstr "" -#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:221 diskdrake/interactive.pm:234 diskdrake/interactive.pm:375 diskdrake/interactive.pm:390 diskdrake/interactive.pm:513 diskdrake/interactive.pm:518 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:161 install_steps.pm:82 install_steps_interactive.pm:39 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:939 network/netconnect.pm:942 network/netconnect.pm:980 network/netconnect.pm:984 network/netconnect.pm:1051 network/netconnect.pm:1101 network/netconnect.pm:1106 network/netconnect.pm:1124 network/netconnect.pm:1313 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:1067 printer/printerdrake.pm:1114 printer/printerdrake.pm:1151 printer/printerdrake.pm:1195 printer/printerdrake.pm:1199 printer/printerdrake.pm:1213 printer/printerdrake.pm:1303 printer/printerdrake.pm:1383 printer/printerdrake.pm:1387 printer/printerdrake.pm:1391 printer/printerdrake.pm:1440 printer/printerdrake.pm:1497 printer/printerdrake.pm:1501 printer/printerdrake.pm:1515 printer/printerdrake.pm:1625 printer/printerdrake.pm:1629 printer/printerdrake.pm:1666 printer/printerdrake.pm:1731 printer/printerdrake.pm:1749 printer/printerdrake.pm:1758 printer/printerdrake.pm:1767 printer/printerdrake.pm:1778 printer/printerdrake.pm:1840 printer/printerdrake.pm:2285 printer/printerdrake.pm:2551 printer/printerdrake.pm:2557 printer/printerdrake.pm:3010 printer/printerdrake.pm:3014 printer/printerdrake.pm:3018 printer/printerdrake.pm:3421 printer/printerdrake.pm:3665 printer/printerdrake.pm:3678 printer/printerdrake.pm:3818 printer/printerdrake.pm:3910 standalone/drakTermServ:400 standalone/drakTermServ:753 standalone/drakTermServ:760 standalone/drakTermServ:955 standalone/drakTermServ:1425 standalone/drakTermServ:1430 standalone/drakTermServ:1437 standalone/drakTermServ:1448 standalone/drakTermServ:1470 standalone/drakauth:36 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1822 standalone/drakbackup:2431 standalone/drakbackup:4121 standalone/drakbackup:4341 standalone/drakboot:244 standalone/drakbug:231 standalone/drakbug:250 standalone/drakbug:256 standalone/drakconnect:620 standalone/drakconnect:623 standalone/drakconnect:642 standalone/drakfloppy:296 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:259 standalone/drakfont:602 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:105 standalone/logdrake:168 standalone/logdrake:436 standalone/logdrake:441 standalone/scannerdrake:58 standalone/scannerdrake:200 standalone/scannerdrake:259 standalone/scannerdrake:688 standalone/scannerdrake:699 standalone/scannerdrake:838 standalone/scannerdrake:849 standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121 +#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:221 diskdrake/interactive.pm:234 diskdrake/interactive.pm:375 diskdrake/interactive.pm:390 diskdrake/interactive.pm:513 diskdrake/interactive.pm:518 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:161 install_steps.pm:82 install_steps_interactive.pm:39 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:927 network/netconnect.pm:930 network/netconnect.pm:969 network/netconnect.pm:973 network/netconnect.pm:1066 network/netconnect.pm:1071 network/netconnect.pm:1089 network/netconnect.pm:1278 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:1067 printer/printerdrake.pm:1114 printer/printerdrake.pm:1151 printer/printerdrake.pm:1195 printer/printerdrake.pm:1199 printer/printerdrake.pm:1213 printer/printerdrake.pm:1303 printer/printerdrake.pm:1383 printer/printerdrake.pm:1387 printer/printerdrake.pm:1391 printer/printerdrake.pm:1440 printer/printerdrake.pm:1497 printer/printerdrake.pm:1501 printer/printerdrake.pm:1515 printer/printerdrake.pm:1625 printer/printerdrake.pm:1629 printer/printerdrake.pm:1666 printer/printerdrake.pm:1731 printer/printerdrake.pm:1749 printer/printerdrake.pm:1758 printer/printerdrake.pm:1767 printer/printerdrake.pm:1778 printer/printerdrake.pm:1840 printer/printerdrake.pm:2285 printer/printerdrake.pm:2551 printer/printerdrake.pm:2557 printer/printerdrake.pm:3010 printer/printerdrake.pm:3014 printer/printerdrake.pm:3018 printer/printerdrake.pm:3421 printer/printerdrake.pm:3665 printer/printerdrake.pm:3678 printer/printerdrake.pm:3818 printer/printerdrake.pm:3910 standalone/drakTermServ:400 standalone/drakTermServ:753 standalone/drakTermServ:760 standalone/drakTermServ:955 standalone/drakTermServ:1425 standalone/drakTermServ:1430 standalone/drakTermServ:1437 standalone/drakTermServ:1448 standalone/drakTermServ:1470 standalone/drakauth:36 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1822 standalone/drakbackup:2431 standalone/drakbackup:4121 standalone/drakbackup:4341 standalone/drakboot:244 standalone/drakbug:236 standalone/drakbug:255 standalone/drakbug:261 standalone/drakconnect:620 standalone/drakconnect:623 standalone/drakconnect:642 standalone/drakfloppy:296 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:259 standalone/drakfont:602 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:105 standalone/logdrake:168 standalone/logdrake:436 standalone/logdrake:441 standalone/scannerdrake:58 standalone/scannerdrake:200 standalone/scannerdrake:259 standalone/scannerdrake:688 standalone/scannerdrake:699 standalone/scannerdrake:838 standalone/scannerdrake:849 standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121 #, c-format msgid "Error" msgstr "" @@ -470,17 +470,17 @@ msgstr "" msgid "Graphics card: %s" msgstr "" -#: Xconfig/resolution_and_depth.pm:283 interactive.pm:403 interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:3978 standalone/drakbackup:4038 standalone/drakbackup:4082 standalone/drakconnect:164 standalone/drakconnect:797 standalone/drakconnect:884 standalone/drakconnect:983 standalone/drakups:194 standalone/net_monitor:353 ugtk2.pm:417 ugtk2.pm:515 ugtk2.pm:1117 ugtk2.pm:1140 +#: Xconfig/resolution_and_depth.pm:283 interactive.pm:403 interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:3978 standalone/drakbackup:4038 standalone/drakbackup:4082 standalone/drakconnect:164 standalone/drakconnect:797 standalone/drakconnect:884 standalone/drakconnect:983 standalone/drakroam:346 standalone/drakups:194 standalone/net_monitor:353 ugtk2.pm:417 ugtk2.pm:515 ugtk2.pm:1117 ugtk2.pm:1140 #, c-format msgid "Ok" msgstr "" -#: Xconfig/resolution_and_depth.pm:283 any.pm:910 diskdrake/smbnfs_gtk.pm:81 help.pm:197 help.pm:457 install_steps_gtk.pm:487 install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:764 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:307 interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3088 standalone/drakautoinst:217 standalone/drakbackup:3904 standalone/drakbackup:3908 standalone/drakbackup:3966 standalone/drakconnect:163 standalone/drakconnect:882 standalone/drakconnect:982 standalone/drakfont:665 standalone/drakfont:742 standalone/drakups:201 standalone/logdrake:173 standalone/net_monitor:352 ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1117 +#: Xconfig/resolution_and_depth.pm:283 any.pm:910 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:487 install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:764 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:307 interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3088 standalone/drakautoinst:217 standalone/drakbackup:3904 standalone/drakbackup:3908 standalone/drakbackup:3966 standalone/drakconnect:163 standalone/drakconnect:882 standalone/drakconnect:982 standalone/drakfont:665 standalone/drakfont:742 standalone/drakups:201 standalone/logdrake:173 standalone/net_monitor:352 ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1117 #, c-format msgid "Cancel" msgstr "" -#: Xconfig/resolution_and_depth.pm:283 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:266 install_steps_gtk.pm:673 interactive.pm:498 interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:300 standalone/drakbackup:3900 standalone/drakbug:128 standalone/drakconnect:159 standalone/drakconnect:238 standalone/drakfont:512 standalone/drakperm:133 standalone/draksec:308 standalone/harddrake2:261 ugtk2.pm:1230 ugtk2.pm:1231 +#: Xconfig/resolution_and_depth.pm:283 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:266 install_steps_gtk.pm:673 interactive.pm:498 interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:300 standalone/drakbackup:3900 standalone/drakbug:129 standalone/drakconnect:159 standalone/drakconnect:238 standalone/drakfont:512 standalone/drakperm:133 standalone/draksec:309 standalone/harddrake2:261 ugtk2.pm:1230 ugtk2.pm:1231 #, c-format msgid "Help" msgstr "" @@ -624,7 +624,7 @@ msgstr "" msgid "What norm is your TV using?" msgstr "" -#: any.pm:97 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:223 standalone/drakconnect:166 standalone/draksec:64 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:211 standalone/service_harddrake:163 +#: any.pm:97 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:228 standalone/drakconnect:166 standalone/draksec:64 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:211 standalone/service_harddrake:163 #, c-format msgid "Please wait" msgstr "" @@ -643,7 +643,7 @@ msgid "" "On which drive are you booting?" msgstr "" -#: any.pm:159 help.pm:800 +#: any.pm:159 help.pm:739 #, c-format msgid "First sector of drive (MBR)" msgstr "" @@ -658,7 +658,7 @@ msgstr "" msgid "On Floppy" msgstr "" -#: any.pm:164 help.pm:768 help.pm:800 printer/printerdrake.pm:3418 +#: any.pm:164 help.pm:739 printer/printerdrake.pm:3418 #, c-format msgid "Skip" msgstr "" @@ -703,12 +703,12 @@ msgstr "" msgid "Please try again" msgstr "" -#: any.pm:209 any.pm:235 help.pm:768 +#: any.pm:209 any.pm:235 #, c-format msgid "Bootloader to use" msgstr "" -#: any.pm:211 any.pm:237 help.pm:768 +#: any.pm:211 any.pm:237 #, c-format msgid "Boot device" msgstr "" @@ -718,12 +718,12 @@ msgstr "" msgid "Delay before booting default image" msgstr "" -#: any.pm:214 help.pm:768 +#: any.pm:214 #, c-format msgid "Enable ACPI" msgstr "" -#: any.pm:216 help.pm:768 +#: any.pm:216 #, c-format msgid "Force no APIC" msgstr "" @@ -733,7 +733,7 @@ msgstr "" msgid "Force No Local APIC" msgstr "" -#: any.pm:220 any.pm:559 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1168 network/netconnect.pm:577 printer/printerdrake.pm:1374 printer/printerdrake.pm:1494 standalone/drakbackup:1647 standalone/drakbackup:3506 standalone/drakups:278 +#: any.pm:220 any.pm:559 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1168 network/netconnect.pm:565 printer/printerdrake.pm:1374 printer/printerdrake.pm:1494 standalone/drakbackup:1647 standalone/drakbackup:3506 standalone/drakups:278 #, c-format msgid "Password" msgstr "" @@ -967,12 +967,12 @@ msgid "" "%s" msgstr "" -#: any.pm:545 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:544 interactive/http.pm:151 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:4077 standalone/drakbackup:2719 standalone/scannerdrake:641 standalone/scannerdrake:791 +#: any.pm:545 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:4077 standalone/drakbackup:2719 standalone/scannerdrake:641 standalone/scannerdrake:791 #, c-format msgid "Done" msgstr "" -#: any.pm:546 help.pm:52 +#: any.pm:546 help.pm:51 #, c-format msgid "Accept user" msgstr "" @@ -982,7 +982,7 @@ msgstr "" msgid "Real name" msgstr "" -#: any.pm:558 help.pm:52 printer/printerdrake.pm:1373 printer/printerdrake.pm:1493 +#: any.pm:558 help.pm:51 printer/printerdrake.pm:1373 printer/printerdrake.pm:1493 #, c-format msgid "User name" msgstr "" @@ -1007,7 +1007,7 @@ msgstr "" msgid "I can set up your computer to automatically log on one user." msgstr "" -#: any.pm:612 help.pm:52 +#: any.pm:612 help.pm:51 #, c-format msgid "Do you want to use this feature?" msgstr "" @@ -1035,17 +1035,17 @@ msgid "" "when your installation is complete and you restart your system." msgstr "" -#: any.pm:671 help.pm:660 +#: any.pm:671 help.pm:647 #, c-format msgid "Use Unicode by default" msgstr "" -#: any.pm:672 help.pm:660 +#: any.pm:672 help.pm:647 #, c-format msgid "All languages" msgstr "" -#: any.pm:711 help.pm:581 help.pm:991 install_steps_interactive.pm:907 +#: any.pm:711 help.pm:566 help.pm:855 install_steps_interactive.pm:907 #, c-format msgid "Country / Region" msgstr "" @@ -1070,7 +1070,7 @@ msgstr "" msgid "Input method:" msgstr "" -#: any.pm:724 install_any.pm:377 printer/printerdrake.pm:93 +#: any.pm:724 install_any.pm:376 printer/printerdrake.pm:93 #, c-format msgid "None" msgstr "" @@ -1252,7 +1252,7 @@ msgstr "" msgid "Domain" msgstr "" -#: authentication.pm:86 diskdrake/dav.pm:63 help.pm:137 +#: authentication.pm:86 diskdrake/dav.pm:63 help.pm:146 #, c-format msgid "Server" msgstr "" @@ -1349,12 +1349,12 @@ msgid "" "" msgstr "" -#: bootloader.pm:758 help.pm:768 +#: bootloader.pm:758 #, c-format msgid "LILO with graphical menu" msgstr "" -#: bootloader.pm:759 help.pm:768 +#: bootloader.pm:759 #, c-format msgid "LILO with text menu" msgstr "" @@ -1577,7 +1577,7 @@ msgid "" "at the beginning of the disk" msgstr "" -#: diskdrake/hd_gtk.pm:155 help.pm:544 +#: diskdrake/hd_gtk.pm:155 help.pm:530 #, c-format msgid "Wizard" msgstr "" @@ -1696,7 +1696,7 @@ msgstr "" msgid "Exit" msgstr "" -#: diskdrake/interactive.pm:247 help.pm:544 +#: diskdrake/interactive.pm:247 help.pm:530 #, c-format msgid "Undo" msgstr "" @@ -1736,17 +1736,17 @@ msgstr "" msgid "You need to reboot for the partition table modifications to take place" msgstr "" -#: diskdrake/interactive.pm:296 help.pm:544 +#: diskdrake/interactive.pm:296 help.pm:530 #, c-format msgid "Clear all" msgstr "" -#: diskdrake/interactive.pm:297 help.pm:544 +#: diskdrake/interactive.pm:297 help.pm:530 #, c-format msgid "Auto allocate" msgstr "" -#: diskdrake/interactive.pm:298 help.pm:544 help.pm:581 help.pm:621 help.pm:991 install_steps_interactive.pm:117 +#: diskdrake/interactive.pm:298 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:117 #, c-format msgid "More" msgstr "" @@ -1771,22 +1771,22 @@ msgstr "" msgid "To have more partitions, please delete one to be able to create an extended partition" msgstr "" -#: diskdrake/interactive.pm:348 help.pm:544 +#: diskdrake/interactive.pm:348 help.pm:530 #, c-format msgid "Save partition table" msgstr "" -#: diskdrake/interactive.pm:349 help.pm:544 +#: diskdrake/interactive.pm:349 help.pm:530 #, c-format msgid "Restore partition table" msgstr "" -#: diskdrake/interactive.pm:350 help.pm:544 +#: diskdrake/interactive.pm:350 help.pm:530 #, c-format msgid "Rescue partition table" msgstr "" -#: diskdrake/interactive.pm:352 help.pm:544 +#: diskdrake/interactive.pm:352 help.pm:530 #, c-format msgid "Reload partition table" msgstr "" @@ -1808,7 +1808,7 @@ msgid "" "Still continue?" msgstr "" -#: diskdrake/interactive.pm:384 harddrake/sound.pm:246 keyboard.pm:340 network/netconnect.pm:456 network/netconnect.pm:475 printer/printerdrake.pm:936 printer/printerdrake.pm:1891 printer/printerdrake.pm:1953 printer/printerdrake.pm:1987 printer/printerdrake.pm:2291 printer/printerdrake.pm:3149 printer/printerdrake.pm:3426 printer/printerdrake.pm:3546 printer/printerdrake.pm:4544 standalone/drakTermServ:336 standalone/drakTermServ:1067 standalone/drakTermServ:1123 standalone/drakTermServ:1796 standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:154 standalone/drakclock:218 standalone/drakconnect:919 standalone/drakfloppy:290 standalone/drakups:27 standalone/scannerdrake:50 standalone/scannerdrake:913 +#: diskdrake/interactive.pm:384 harddrake/sound.pm:246 keyboard.pm:340 network/netconnect.pm:444 network/netconnect.pm:463 printer/printerdrake.pm:936 printer/printerdrake.pm:1891 printer/printerdrake.pm:1953 printer/printerdrake.pm:1987 printer/printerdrake.pm:2291 printer/printerdrake.pm:3149 printer/printerdrake.pm:3426 printer/printerdrake.pm:3546 printer/printerdrake.pm:4544 standalone/drakTermServ:336 standalone/drakTermServ:1067 standalone/drakTermServ:1123 standalone/drakTermServ:1796 standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:154 standalone/drakclock:218 standalone/drakconnect:919 standalone/drakfloppy:290 standalone/drakups:27 standalone/scannerdrake:50 standalone/scannerdrake:913 #, c-format msgid "Warning" msgstr "" @@ -2380,7 +2380,7 @@ msgstr "" msgid "The encryption keys do not match" msgstr "" -#: diskdrake/interactive.pm:1262 network/netconnect.pm:975 standalone/drakconnect:403 +#: diskdrake/interactive.pm:1262 network/netconnect.pm:964 standalone/drakconnect:403 #, c-format msgid "Encryption key" msgstr "" @@ -2747,7 +2747,7 @@ msgstr "" msgid "Ethernetcard" msgstr "" -#: harddrake/data.pm:214 network/netconnect.pm:470 +#: harddrake/data.pm:214 network/netconnect.pm:458 #, c-format msgid "Modem" msgstr "" @@ -2767,12 +2767,12 @@ msgstr "" msgid "Bridges and system controllers" msgstr "" -#: harddrake/data.pm:254 help.pm:203 help.pm:991 install_steps_interactive.pm:939 printer/printerdrake.pm:687 printer/printerdrake.pm:4176 +#: harddrake/data.pm:254 help.pm:186 help.pm:855 install_steps_interactive.pm:939 printer/printerdrake.pm:687 printer/printerdrake.pm:4176 #, c-format msgid "Printer" msgstr "" -#: harddrake/data.pm:263 help.pm:991 install_steps_interactive.pm:932 +#: harddrake/data.pm:263 help.pm:855 install_steps_interactive.pm:932 #, c-format msgid "Mouse" msgstr "" @@ -3049,9 +3049,9 @@ msgstr "" #, c-format msgid "" "Before continuing, you should carefully read the terms of the license. It\n" -"covers the entire Mandrakelinux distribution. If you do agree with all the\n" -"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n" -"will reboot your computer." +"covers the entire Mandrakelinux distribution. If you agree with all the\n" +"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n" +"button will reboot your computer." msgstr "" #: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:87 install_steps_interactive.pm:700 standalone/drakautoinst:216 @@ -3062,55 +3062,54 @@ msgstr "" #: help.pm:17 #, c-format msgid "" -"GNU/Linux is a multi-user system, meaning each user may have their own\n" -"preferences, their own files and so on. You can read the ``Starter Guide''\n" -"to learn more about multi-user systems. But unlike \"root\", who is the\n" -"system administrator, the users you add at this point will not be\n" -"authorized to change anything except their own files and their own\n" -"configurations, protecting the system from unintentional or malicious\n" -"changes that impact on the system as a whole. You will have to create at\n" -"least one regular user for yourself -- this is the account which you should\n" -"use for routine, day-to-day use. Although it is very easy to log in as\n" -"\"root\" to do anything and everything, it may also be very dangerous! A\n" -"very simple mistake could mean that your system will not work any more. If\n" -"you make a serious mistake as a regular user, the worst that will happen is\n" -"that you will lose some information, but not affect the entire system.\n" +"GNU/Linux is a multi-user system which means each user can have his or her\n" +"own preferences, own files and so on. But unlike \"root\", who is the\n" +"system administrator, the users you add at this point won't be authorized\n" +"to change anything except their own files and their own configurations,\n" +"protecting the system from unintentional or malicious changes which could\n" +"impact on the system as a whole. You'll have to create at least one regular\n" +"user for yourself -- this is the account which you should use for routine,\n" +"day-to-day usage. Although it's very easy to log in as \"root\" to do\n" +"anything and everything, it may also be very dangerous! A very simple\n" +"mistake could mean that your system won't work any more. If you make a\n" +"serious mistake as a regular user, the worst that can happen is that you'll\n" +"lose some information, but you won't affect the entire system.\n" "\n" "The first field asks you for a real name. Of course, this is not mandatory\n" "-- 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" +"you type in this field and copy it to the \"%s\" one, 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 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" -"ones at risk.\n" +"not as crucial as the \"root\" password, but that's no reason to neglect it\n" +"by making it blank or too simple: after all, your files could be the ones\n" +"at risk.\n" "\n" "Once you click on \"%s\", you can add other users. Add a user for each one\n" -"of your friends: your father or your sister, for example. Click \"%s\" when\n" -"you have finished adding users.\n" +"of your friends, your father, your sister, etc. Click \"%s\" when you're\n" +"finished adding users.\n" "\n" "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 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." +"When you're finished adding users, you'll be asked to choose a user who\n" +"will be automatically logged into the system when the computer boots up. If\n" +"you're interested in that feature (and don't care much about local\n" +"security), choose the desired user and window manager, then click on\n" +"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box." msgstr "" -#: help.pm:52 help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005 help.pm:1005 install_steps_gtk.pm:274 interactive.pm:403 interactive/newt.pm:308 network/netconnect.pm:277 network/tools.pm:178 printer/printerdrake.pm:3090 standalone/drakTermServ:393 standalone/drakbackup:3957 standalone/drakbackup:4051 standalone/drakbackup:4068 standalone/drakbackup:4086 ugtk2.pm:515 +#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:274 interactive.pm:403 interactive/newt.pm:308 network/netconnect.pm:277 network/tools.pm:178 printer/printerdrake.pm:3090 standalone/drakTermServ:393 standalone/drakbackup:3957 standalone/drakbackup:4051 standalone/drakbackup:4068 standalone/drakbackup:4086 ugtk2.pm:515 #, c-format msgid "Next" msgstr "" -#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768 interactive.pm:371 +#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722 interactive.pm:371 #, c-format msgid "Advanced" msgstr "" -#: help.pm:55 +#: help.pm:54 #, c-format msgid "" "Listed here are the existing Linux partitions detected on your hard drive.\n" @@ -3144,33 +3143,41 @@ msgid "" "\"second lowest SCSI ID\", etc." msgstr "" -#: help.pm:86 +#: help.pm:85 #, c-format msgid "" "The Mandrakelinux 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." +"CD and ask you to insert the required one. If you do not have the requested\n" +"CD at hand, just click on \"%s\", the corresponding packages will not be\n" +"installed." msgstr "" -#: help.pm:91 +#: help.pm:92 #, c-format msgid "" -"It is now time to specify which programs you wish to install on your\n" -"system. There are thousands of packages available for Mandrakelinux, and\n" -"to make it simpler to manage the packages have been placed into groups of\n" -"similar applications.\n" +"It's now time to specify which programs you wish to install on your system.\n" +"There are thousands of packages available for Mandrakelinux, and to make it\n" +"simpler to manage, they have been placed into groups of similar\n" +"applications.\n" "\n" -"Packages are sorted into groups corresponding to a particular use of your\n" -"machine. Mandrakelinux 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'' category installed.\n" +"Mandrakelinux sorts package groups in four categories. You can mix and\n" +"match applications from the various categories, so a ``Workstation''\n" +"installation can still have applications from the ``Server'' category\n" +"installed.\n" "\n" " * \"%s\": if you plan to use your machine as a workstation, select one or\n" -"more of the groups that are in the workstation category.\n" +"more of the groups in the workstation category.\n" "\n" " * \"%s\": if you plan on using your machine for programming, select the\n" -"appropriate groups from that category.\n" +"appropriate groups from that category. The special \"LSB\" group will\n" +"configure your system so that it complies as much as possible with the\n" +"Linux Standard Base specifications.\n" +"\n" +" Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" +"of the system. However, if you do not select the \"LSB\" group you will\n" +"still have a system which is nearly 100%% LSB-compliant.\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" @@ -3180,9 +3187,19 @@ msgid "" "interface available.\n" "\n" "Moving the mouse cursor over a group name will display a short explanatory\n" -"text about that group. If you unselect all groups when performing a regular\n" -"installation (as opposed to an upgrade), a dialog will pop up proposing\n" -"different options for a minimal installation:\n" +"text about that group.\n" +"\n" +"You can check the \"%s\" box, which is useful if you're familiar with the\n" +"packages being offered or if you want to have total control over what will\n" +"be installed.\n" +"\n" +"If you start the installation in \"%s\" mode, you can deselect all groups\n" +"and prevent the installation of any new packages. This is useful for\n" +"repairing or updating an existing system.\n" +"\n" +"If you deselect all groups when performing a regular installation (as\n" +"opposed to an upgrade), a dialog will pop up suggesting different options\n" +"for a minimal installation:\n" "\n" " * \"%s\": install the minimum number of packages possible to have a\n" "working graphical desktop.\n" @@ -3192,180 +3209,137 @@ msgid "" "\n" " * \"%s\": will install the absolute minimum number of packages necessary\n" "to get a working Linux system. With this installation you will only have a\n" -"command line interface. The total size of this installation is about 65\n" -"megabytes.\n" -"\n" -"You can check the \"%s\" box, which is useful if you are familiar with the\n" -"packages being offered or if you want to have total control over what will\n" -"be installed.\n" -"\n" -"If you started the installation in \"%s\" mode, you can unselect all groups\n" -"to avoid installing any new package. This is useful for repairing or\n" -"updating an existing system." +"command-line interface. The total size of this installation is about 65\n" +"megabytes." msgstr "" -#: help.pm:137 +#: help.pm:146 #, c-format msgid "Workstation" msgstr "" -#: help.pm:137 +#: help.pm:146 #, c-format msgid "Development" msgstr "" -#: help.pm:137 +#: help.pm:146 #, c-format msgid "Graphical Environment" msgstr "" -#: help.pm:137 install_steps_interactive.pm:557 +#: help.pm:146 install_steps_gtk.pm:269 install_steps_interactive.pm:603 #, c-format -msgid "With X" +msgid "Individual package selection" msgstr "" -#: help.pm:137 +#: help.pm:146 help.pm:588 #, c-format -msgid "With basic documentation" +msgid "Upgrade" msgstr "" -#: help.pm:137 +#: help.pm:146 install_steps_interactive.pm:557 #, c-format -msgid "Truly minimal install" +msgid "With X" msgstr "" -#: help.pm:137 install_steps_gtk.pm:269 install_steps_interactive.pm:603 +#: help.pm:146 #, c-format -msgid "Individual package selection" +msgid "With basic documentation" msgstr "" -#: help.pm:137 help.pm:602 +#: help.pm:146 #, c-format -msgid "Upgrade" +msgid "Truly minimal install" msgstr "" -#: help.pm:140 +#: help.pm:149 #, c-format msgid "" -"If you told the installer that you wanted to individually select packages,\n" -"it will present a tree containing all packages classified by groups and\n" -"subgroups. While browsing the tree, you can select entire groups,\n" -"subgroups, or individual packages.\n" +"If you choose to install packages individually, the installer will present\n" +"a tree containing all packages classified by groups and subgroups. While\n" +"browsing the tree, you can select entire groups, subgroups, or individual\n" +"packages.\n" "\n" -"Whenever you select a package on the tree, a description appears on the\n" -"right to let you know the purpose of the package.\n" +"Whenever you select a package on the tree, a description will appear on the\n" +"right to let you know the purpose of that package.\n" "\n" "!! If a server package has been selected, either because you specifically\n" "chose the individual package or because it was part of a group of packages,\n" -"you will be asked to confirm that you really want those servers to be\n" +"you'll be asked to confirm that you really want those servers to be\n" "installed. By default Mandrakelinux will automatically start any installed\n" "services at boot time. Even if they are safe and have no known issues at\n" -"the time the distribution was shipped, it is entirely possible that that\n" +"the time the distribution was shipped, it is entirely possible that\n" "security holes were discovered after this version of Mandrakelinux was\n" -"finalized. If you do not know what a particular service is supposed to do\n" -"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n" -"install the listed services and they will be started automatically by\n" -"default during boot. !!\n" +"finalized. If you don't know what a particular service is supposed to do or\n" +"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n" +"the listed services and they will be started automatically at boot time. !!\n" "\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 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" +"dependency issue. Some packages depend on others and the installation of\n" +"one particular package may require the installation of another package. The\n" +"installer can determine which packages are required to satisfy a dependency\n" +"to successfully complete the installation.\n" "\n" "The tiny floppy disk icon at the bottom of the list allows you to load a\n" "package list created during a previous installation. This is useful if you\n" "have a number of machines that you wish to configure identically. Clicking\n" -"on this icon will ask you to insert a floppy disk previously created at the\n" -"end of another installation. See the second tip of last step on how to\n" -"create such a floppy." +"on this icon will ask you to insert the floppy disk created at the end of\n" +"another installation. See the second tip of the last step on how to create\n" +"such a floppy." msgstr "" -#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:611 interactive.pm:149 modules/interactive.pm:71 standalone/draksec:50 standalone/harddrake2:299 ugtk2.pm:1116 wizards.pm:156 +#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:612 interactive.pm:149 modules/interactive.pm:71 standalone/draksec:50 standalone/harddrake2:299 ugtk2.pm:1116 wizards.pm:156 #, c-format msgid "No" msgstr "" -#: help.pm:172 help.pm:301 help.pm:457 help.pm:457 install_any.pm:611 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:51 standalone/harddrake2:298 ugtk2.pm:1116 wizards.pm:156 +#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:612 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:51 standalone/harddrake2:298 ugtk2.pm:1116 wizards.pm:156 #, c-format msgid "Yes" msgstr "" -#: help.pm:172 +#: help.pm:180 #, c-format msgid "Automatic dependencies" msgstr "" -#: help.pm:175 -#, c-format -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" -"Mandrakelinux 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" -"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 Mandrakelinux, 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:197 -#, c-format -msgid "Use auto detection" -msgstr "" - -#: help.pm:200 +#: help.pm:183 #, c-format msgid "" "\"%s\": clicking on the \"%s\" button will open the printer configuration\n" "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n" -"information on how to setup a new printer. The interface presented there is\n" -"similar to the one used during installation." +"information on how to set up a new printer. The interface presented in our\n" +"manual is similar to the one used during installation." msgstr "" -#: 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:651 standalone/drakbackup:2325 standalone/drakbackup:2333 standalone/drakbackup:2341 standalone/drakbackup:2349 +#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:651 standalone/drakbackup:2325 standalone/drakbackup:2333 standalone/drakbackup:2341 standalone/drakbackup:2349 #, c-format msgid "Configure" msgstr "" -#: help.pm:206 +#: help.pm:189 #, c-format msgid "" -"This dialog is used to choose which services you wish to start at boot\n" +"This dialog is used to select which services you wish to start at boot\n" "time.\n" "\n" -"DrakX will list all the services available on the current installation.\n" -"Review each one carefully and uncheck those which are not needed at boot\n" +"DrakX will list all services available on the current installation. Review\n" +"each one of them carefully and uncheck those which aren't needed at boot\n" "time.\n" "\n" "A short explanatory text will be displayed about a service when it is\n" -"selected. However, if you are not sure whether a service is useful or not,\n" +"selected. However, if you're not sure whether a service is useful or not,\n" "it is safer to leave the default behavior.\n" "\n" "!! At this stage, be very careful if you intend to use your machine as a\n" -"server: you will probably not want to start any services that you do not\n" -"need. Please remember that several services can be dangerous if they are\n" -"enabled on a server. In general, select only the services you really need.\n" -"!!" +"server: you probably don't want to start any services which you don't need.\n" +"Please remember that some services can be dangerous if they're enabled on a\n" +"server. In general, select only those services you really need. !!" msgstr "" -#: help.pm:224 +#: help.pm:206 #, c-format msgid "" "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n" @@ -3373,72 +3347,74 @@ msgid "" "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 time zone. This is useful when the machine\n" -"also hosts another operating system like Windows.\n" +"also hosts another operating system.\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 be used by\n" -"other machines on your local network as well." +"The \"%s\" option will automatically regulate the system clock by\n" +"connecting to a remote time server on the Internet. For this feature to\n" +"work, you must have a working Internet connection. We recommend that you\n" +"choose a time server located near you. This option actually installs a time\n" +"server which can be used by other machines on your local network as well." msgstr "" -#: help.pm:235 install_steps_interactive.pm:834 +#: help.pm:217 install_steps_interactive.pm:834 #, c-format msgid "Hardware clock set to GMT" msgstr "" -#: help.pm:235 +#: help.pm:217 #, c-format msgid "Automatic time synchronization" msgstr "" -#: help.pm:238 +#: help.pm:220 #, c-format msgid "" "Graphic Card\n" "\n" " The installer will normally automatically detect and configure the\n" -"graphic card installed on your machine. If it is not the case, you can\n" +"graphic card installed on your machine. If this is not correct, you can\n" "choose from this list the card you actually have installed.\n" "\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" +"with or without 3D acceleration, you're asked to choose the server which\n" "best suits your needs." msgstr "" -#: help.pm:249 +#: help.pm:231 #, c-format msgid "" "X (for X Window System) is the heart of the GNU/Linux graphical interface\n" "on which all the graphical environments (KDE, GNOME, AfterStep,\n" "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n" "\n" -"You will be presented with a list of different parameters to change to get\n" -"an optimal graphical display: Graphic Card\n" +"You'll see a list of different parameters to change to get an optimal\n" +"graphical display.\n" +"\n" +"Graphic Card\n" "\n" " The installer will normally automatically detect and configure the\n" -"graphic card installed on your machine. If it is not the case, you can\n" +"graphic card installed on your machine. If this is not correct, you can\n" "choose from this list the card you actually have installed.\n" "\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" +"with or without 3D acceleration, you're asked to choose the server which\n" "best suits your needs.\n" "\n" "\n" "\n" "Monitor\n" "\n" -" The installer will normally automatically detect and configure the\n" -"monitor connected to your machine. If it is incorrect, you can choose from\n" -"this list the monitor you actually have connected to your computer.\n" +" Normally the installer will automatically detect and configure the\n" +"monitor connected to your machine. If it is not correct, you can choose\n" +"from this list the monitor which is connected to your computer.\n" "\n" "\n" "\n" "Resolution\n" "\n" " 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" +"graphics hardware. Choose the one which best suits your needs (you will be\n" +"able to make changes after the installation). A sample of the chosen\n" "configuration is shown in the monitor picture.\n" "\n" "\n" @@ -3447,119 +3423,120 @@ msgid "" "\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" +" The system will try to open a graphical screen at the desired\n" +"resolution. If you see the test message during the test and answer \"%s\",\n" +"then DrakX will proceed to the next step. If you do not see it, then it\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" +"the test will automatically end after 12 seconds and return you to the\n" "menu. Change settings until you get a correct graphical display.\n" "\n" "\n" "\n" "Options\n" "\n" -" Here you can choose whether you want to have your machine automatically\n" -"switch to a graphical interface at boot. Obviously, you want to check\n" -"\"%s\" if your machine is to act as a server, or if you were not successful\n" -"in getting the display configured." +" This steps allows you to choose whether you want your machine to\n" +"automatically switch to a graphical interface at boot. Obviously, you may\n" +"want to check \"%s\" if your machine is to act as a server, or if you were\n" +"not successful in getting the display configured." msgstr "" -#: help.pm:304 +#: help.pm:288 #, c-format msgid "" "Monitor\n" "\n" -" The installer will normally automatically detect and configure the\n" -"monitor connected to your machine. If it is incorrect, you can choose from\n" -"this list the monitor you actually have connected to your computer." +" Normally the installer will automatically detect and configure the\n" +"monitor connected to your machine. If it is not correct, you can choose\n" +"from this list the monitor which is connected to your computer." msgstr "" -#: help.pm:311 +#: help.pm:295 #, c-format msgid "" "Resolution\n" "\n" " 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" +"graphics hardware. Choose the one which best suits your needs (you will be\n" +"able to make changes after the installation). A sample of the chosen\n" "configuration is shown in the monitor picture." msgstr "" -#: help.pm:319 +#: help.pm:303 #, c-format msgid "" "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" +"or without 3D acceleration, you're asked to choose the server which best\n" "suits your needs." msgstr "" -#: help.pm:324 +#: help.pm:308 #, c-format msgid "" "Options\n" "\n" -" Here you can choose whether you want to have your machine automatically\n" -"switch to a graphical interface at boot. Obviously, you want to check\n" -"\"%s\" if your machine is to act as a server, or if you were not successful\n" -"in getting the display configured." +" This steps allows you to choose whether you want your machine to\n" +"automatically switch to a graphical interface at boot. Obviously, you may\n" +"want to check \"%s\" if your machine is to act as a server, or if you were\n" +"not successful in getting the display configured." msgstr "" -#: help.pm:332 +#: help.pm:316 #, c-format msgid "" -"At this point, you need to decide where you want to install the Mandrake\n" -"Linux operating system on your hard drive. If your hard drive is empty or\n" -"if an existing operating system is using all the available space you will\n" -"have to partition the drive. Basically, partitioning a hard drive consists\n" -"of logically dividing it to create the space needed to install your new\n" +"You now need to decide where you want to install the Mandrakelinux\n" +"operating system on your hard drive. If your hard drive is empty or if an\n" +"existing operating system is using all the available space you will have to\n" +"partition the drive. Basically, partitioning a hard drive means to\n" +"logically divide it to create the space needed to install your new\n" "Mandrakelinux system.\n" "\n" "Because the process of partitioning a hard drive is usually irreversible\n" -"and can lead to lost data if there is an existing operating system already\n" -"installed on the drive, partitioning can be intimidating and stressful if\n" -"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n" +"and can lead to data losses, partitioning can be intimidating and stressful\n" +"for the inexperienced user. Fortunately, DrakX includes a wizard which\n" "simplifies this process. Before continuing with this step, read through the\n" "rest of this section and above all, take your time.\n" "\n" -"Depending on your hard drive configuration, several options are available:\n" +"Depending on the configuration of your hard drive, several options are\n" +"available:\n" "\n" -" * \"%s\": this option will perform an automatic partitioning of your blank\n" +" * \"%s\". This option will perform an automatic partitioning of your blank\n" "drive(s). If you use this option there will be no further prompts.\n" "\n" -" * \"%s\": the wizard has detected one or more existing Linux partitions on\n" +" * \"%s\". The wizard has detected one or more existing Linux partitions on\n" "your hard drive. If you want to use them, choose this option. You will then\n" "be asked to choose the mount points associated with each of the partitions.\n" "The legacy mount points are selected by default, and for the most part it's\n" "a good idea to keep them.\n" "\n" -" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\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" "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" +"data, provided you've 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 Mandrakelinux 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" -"then when you started. You will have less free space under Microsoft\n" -"Windows to store your data or to install new software.\n" +"than when you started. You'll have less free space under Microsoft Windows\n" +"to store your data or to install new software.\n" "\n" -" * \"%s\": if you want to delete all data and all partitions present on\n" -"your hard drive and replace them with your new Mandrakelinux system,\n" -"choose this option. Be careful, because you will not be able to undo your\n" -"choice after you confirm.\n" +" * \"%s\". If you want to delete all data and all partitions present on\n" +"your hard drive and replace them with your new Mandrakelinux system, choose\n" +"this option. Be careful, because you won't be able to undo this operation\n" +"after you confirm.\n" "\n" " !! If you choose this option, all data on your disk will be deleted. !!\n" "\n" -" * \"%s\": this will simply erase everything on the drive and begin fresh,\n" -"partitioning everything from scratch. All data on your disk will be lost.\n" +" * \"%s\". This option appears when the hard drive is entirely taken by\n" +"Microsoft Windows. Choosing this option will simply erase everything on the\n" +"drive and begin fresh, partitioning everything from scratch.\n" "\n" " !! If you choose this option, all data on your disk will be lost. !!\n" "\n" -" * \"%s\": choose this option if you want to manually partition your hard\n" +" * \"%s\". Choose this option if you want to manually partition your hard\n" "drive. Be careful -- it is a powerful but dangerous choice and you can very\n" "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" @@ -3567,52 +3544,53 @@ msgid "" "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''." msgstr "" -#: help.pm:389 install_interactive.pm:95 +#: help.pm:374 install_interactive.pm:95 #, c-format msgid "Use free space" msgstr "" -#: help.pm:389 +#: help.pm:374 #, c-format msgid "Use existing partition" msgstr "" -#: help.pm:389 install_interactive.pm:137 +#: help.pm:374 install_interactive.pm:137 #, c-format msgid "Use the free space on the Windows partition" msgstr "" -#: help.pm:389 install_interactive.pm:213 +#: help.pm:374 install_interactive.pm:213 #, c-format msgid "Erase entire disk" msgstr "" -#: help.pm:389 +#: help.pm:374 #, c-format msgid "Remove Windows" msgstr "" -#: help.pm:389 install_interactive.pm:228 +#: help.pm:374 install_interactive.pm:228 #, c-format msgid "Custom disk partitioning" msgstr "" -#: help.pm:392 +#: help.pm:377 #, 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. Don't forget to\n" -"remove the installation media (CD-ROM or floppy). The first thing you\n" +"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n" +"to 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" +"boot-loader menu, giving you the choice of which operating system to start.\n" "\n" "The \"%s\" button shows two more buttons to:\n" "\n" -" * \"%s\": to create an installation floppy disk that will automatically\n" -"perform a whole installation without the help of an operator, similar to\n" -"the installation you just configured.\n" +" * \"%s\": enables you to create an installation floppy disk which will\n" +"automatically perform a whole installation without the help of an operator,\n" +"similar to the installation you've just configured.\n" "\n" -" Note that two different options are available after clicking the button:\n" +" Note that two different options are available after clicking on that\n" +"button:\n" "\n" " * \"%s\". This is a partially automated installation. The partitioning\n" "step is the only interactive procedure.\n" @@ -3620,114 +3598,114 @@ msgid "" " * \"%s\". Fully automated installation: the hard disk is completely\n" "rewritten, all data is lost.\n" "\n" -" 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" +" This feature is very handy when installing on a number of similar\n" +"machines. See the Auto install section on our web site for more\n" +"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, type >>linux\n" +"defcfg=\"floppy\"<< and press the [Enter] key.\n" "\n" -" * \"%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\" <<." +"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n" +"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n" +"/dev/fd0\"." msgstr "" -#: help.pm:418 +#: help.pm:409 #, c-format msgid "Generate auto-install floppy" msgstr "" -#: help.pm:418 install_steps_interactive.pm:1326 +#: help.pm:409 install_steps_interactive.pm:1326 #, c-format msgid "Replay" msgstr "" -#: help.pm:418 install_steps_interactive.pm:1326 +#: help.pm:409 install_steps_interactive.pm:1326 #, c-format msgid "Automated" msgstr "" -#: help.pm:418 install_steps_interactive.pm:1329 +#: help.pm:409 install_steps_interactive.pm:1329 #, c-format msgid "Save packages selection" msgstr "" -#: help.pm:421 +#: help.pm:412 #, c-format msgid "" -"Any partitions that have been newly defined must be formatted for use\n" -"(formatting means creating a file system).\n" +"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n" +"reformat some of them and erase any data they contain. To do so, please\n" +"select those partitions as well.\n" "\n" -"At this time, you may wish to reformat some already existing partitions to\n" -"erase any data they contain. If you wish to do that, please select those\n" -"partitions as well.\n" -"\n" -"Please note that it is not necessary to reformat all pre-existing\n" +"Please note that it's not necessary to reformat all pre-existing\n" "partitions. You must reformat the partitions containing the operating\n" -"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n" -"reformat partitions containing data that you wish to keep (typically\n" -"\"/home\").\n" +"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n" +"partitions containing data that you wish to keep (typically \"/home\").\n" "\n" -"Please be careful when selecting partitions. After formatting, all data on\n" -"the selected partitions will be deleted and you will not be able to recover\n" -"it.\n" +"Please be careful when selecting partitions. After the formatting is\n" +"completed, all data on the selected partitions will be deleted and you\n" +"won't be able to recover it.\n" "\n" -"Click on \"%s\" when you are ready to format the partitions.\n" +"Click on \"%s\" when you're ready to format the partitions.\n" "\n" "Click on \"%s\" if you want to choose another partition for your new\n" "Mandrakelinux operating system installation.\n" "\n" -"Click on \"%s\" if you wish to select partitions that will be checked for\n" +"Click on \"%s\" if you wish to select partitions which will be checked for\n" "bad blocks on the disk." msgstr "" -#: help.pm:444 help.pm:1005 install_steps_gtk.pm:430 interactive.pm:404 interactive/newt.pm:307 printer/printerdrake.pm:3088 standalone/drakTermServ:372 standalone/drakbackup:3917 standalone/drakbackup:3956 standalone/drakbackup:4067 standalone/drakbackup:4082 ugtk2.pm:513 +#: help.pm:431 install_steps_gtk.pm:430 interactive.pm:404 interactive/newt.pm:307 printer/printerdrake.pm:3088 standalone/drakTermServ:372 standalone/drakbackup:3917 standalone/drakbackup:3956 standalone/drakbackup:4067 standalone/drakbackup:4082 ugtk2.pm:513 #, c-format msgid "Previous" msgstr "" -#: help.pm:447 +#: help.pm:434 #, c-format msgid "" -"At the time you are installing Mandrakelinux, it is likely that some\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" +"By the time you install Mandrakelinux, it's likely that some packages will\n" +"have been updated since the initial release. Bugs may have been fixed,\n" +"security issues resolved. To allow you to benefit from these updates,\n" +"you're now able to download them from the Internet. Check \"%s\" if you\n" +"have a working Internet connection, or \"%s\" if you prefer to install\n" +"updated packages later.\n" "\n" -"Choosing \"%s\" will display a list of places from which updates can be\n" -"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." +"Choosing \"%s\" will display a list of web locations from which updates can\n" +"be retrieved. You should choose one near 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." msgstr "" -#: help.pm:457 help.pm:602 install_steps_gtk.pm:429 install_steps_interactive.pm:151 standalone/drakbackup:4114 +#: help.pm:444 help.pm:588 install_steps_gtk.pm:429 install_steps_interactive.pm:151 standalone/drakbackup:4114 #, c-format msgid "Install" msgstr "" -#: help.pm:460 +#: help.pm:447 #, c-format msgid "" -"At this point, DrakX will allow you to choose the security level desired\n" -"for the machine. As a rule of thumb, the security level should be set\n" -"higher if the machine will contain crucial data, or if it will be a machine\n" -"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" +"At this point, DrakX will allow you to choose the security level you desire\n" +"for your machine. As a rule of thumb, the security level should be set\n" +"higher if the machine is to contain crucial data, or if it's to be directly\n" +"exposed to the Internet. The trade-off that a higher security level is\n" +"generally obtained at the expense of ease of use.\n" "\n" -"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" +"If you don't know what to choose, keep the default option. You'll be able\n" +"to change it later with the draksec tool, which is part of Mandrakelinux\n" +"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." +"Fill the \"%s\" field with the e-mail address of the person responsible for\n" +"security. Security messages will be sent to that address." msgstr "" -#: help.pm:472 +#: help.pm:458 #, c-format msgid "Security Administrator" msgstr "" -#: help.pm:475 +#: help.pm:461 #, c-format msgid "" "At this point, you need to choose which partition(s) will be used for the\n" @@ -3802,17 +3780,17 @@ msgid "" "emergency boot situations." msgstr "" -#: help.pm:544 +#: help.pm:530 #, c-format msgid "Removable media auto-mounting" msgstr "" -#: help.pm:544 +#: help.pm:530 #, c-format msgid "Toggle between normal/expert mode" msgstr "" -#: help.pm:547 +#: help.pm:533 #, c-format msgid "" "More than one Microsoft partition has been detected on your hard drive.\n" @@ -3846,80 +3824,81 @@ msgid "" "disk or partition is called \"C:\")." msgstr "" -#: help.pm:578 +#: help.pm:564 #, c-format msgid "" -"\"%s\": check the current country selection. If you are not in this\n" -"country, click on the \"%s\" button and choose another one. If your country\n" -"is not in the first list shown, click the \"%s\" button to get the complete\n" -"country list." +"\"%s\": check the current country selection. If you're not in this country,\n" +"click on the \"%s\" button and choose another. If your country isn't in the\n" +"list shown, click on the \"%s\" button to get the complete country list." msgstr "" -#: help.pm:584 +#: help.pm:569 #, c-format msgid "" "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 Mandrakelinux system:\n" +"DrakX now needs to know if you want to perform a new installation or an\n" +"upgrade of an existing Mandrakelinux system:\n" "\n" -" * \"%s\": For the most part, this completely wipes out the old system. If\n" -"you wish to change how your hard drives are partitioned, or change the file\n" -"system, you should use this option. However, depending on your partitioning\n" -"scheme, you can prevent some of your existing data from being over-written.\n" +" * \"%s\". For the most part, this completely wipes out the old system.\n" +"However, depending on your partitioning scheme, you can prevent some of\n" +"your existing data (notably \"home\" directories) from being over-written.\n" +"If you wish to change how your hard drives are partitioned, or to change\n" +"the file system, you should use this option.\n" "\n" -" * \"%s\": this installation class allows you to update the packages\n" -"currently installed on your Mandrakelinux system. Your current\n" -"partitioning scheme and user data is not altered. Most of other\n" -"configuration steps remain available, similar to a standard installation.\n" +" * \"%s\". This installation class allows you to update the packages\n" +"currently installed on your Mandrakelinux system. Your current partitioning\n" +"scheme and user data won't be altered. Most of the other configuration\n" +"steps remain available and are similar to a standard installation.\n" "\n" "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n" -"running version \"8.1\" or later. Performing an Upgrade on versions prior\n" +"running version \"8.1\" or later. Performing an upgrade on versions prior\n" "to Mandrakelinux version \"8.1\" is not recommended." msgstr "" -#: help.pm:605 +#: help.pm:591 #, c-format msgid "" -"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" +"Depending on the language you chose (), DrakX will automatically select a\n" +"particular type of keyboard configuration. Check that the selection suits\n" +"you or choose another keyboard layout.\n" "\n" -"Also, you may not have a keyboard that corresponds exactly to your\n" +"Also, you may not have a keyboard which 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" +"country-set keyboard don't 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" +"Click on the \"%s\" button to be shown a list of supported keyboards.\n" "\n" "If you choose a keyboard layout based on a non-Latin alphabet, the next\n" -"dialog will allow you to choose the key binding that will switch the\n" +"dialog will allow you to choose the key binding which will switch the\n" "keyboard between the Latin and non-Latin layouts." msgstr "" -#: help.pm:624 +#: help.pm:609 #, c-format 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" +"The first step is to choose your preferred language.\n" +"\n" +"Your choice of preferred language will affect the installer, the\n" +"documentation, and the system in general. First select the region you're\n" +"located in, then the language you speak.\n" "\n" "Clicking on the \"%s\" button will allow you to select other languages to\n" "be installed on your workstation, thereby installing the language-specific\n" -"files for system documentation and applications. For example, if you will\n" -"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" +"files for system documentation and applications. For example, if Spanish\n" +"users are to use your machine, select English as the default language in\n" +"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, Mandrakelinux will be using it\n" -"or not depending on the user choices:\n" +"cover all existing languages. However full support for it in GNU/Linux is\n" +"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n" +"depend on the user's choices:\n" "\n" -" * If you choose a languages with a strong legacy encoding (latin1\n" +" * If you choose a language 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" @@ -3928,82 +3907,90 @@ msgid "" " * 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" +" * Finally, unicode can also be forced for use throughout the system at a\n" +"user's request by selecting the \"%s\" option independently of which\n" +"languages were been 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 also be installed.\n" +"may choose several, or even install them all by selecting the \"%s\" box.\n" +"Selecting support for a language means translations, fonts, spell checkers,\n" +"etc. will also be installed for that language.\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" -"language used by the entire system. Running the command as a regular user\n" -"will only change the language settings for that particular user." +"To switch between the various languages installed on your system, you can\n" +"launch the \"localedrake\" command as \"root\" to change the language used\n" +"by the entire system. Running the command as a regular user will only\n" +"change the language settings for that particular user." msgstr "" -#: help.pm:660 +#: help.pm:647 #, c-format msgid "Espanol" msgstr "" -#: help.pm:663 +#: help.pm:650 #, c-format msgid "" "Usually, DrakX has no problems detecting the number of buttons on your\n" "mouse. If it does, it assumes you have a two-button mouse and will\n" "configure it for third-button emulation. The third-button mouse button of a\n" -"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n" +"two-button mouse can be obtained by simultaneously clicking the left and\n" "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" +"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n" +"mouse. DrakX will then configure your mouse so that you can simulate the\n" +"wheel with it: to do so, press the middle button and move your mouse\n" +"pointer 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" -"If you choose a mouse other than the default, a test screen will be\n" +"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n" +"will work with nearly all mice.\n" +"\n" +"If you choose a mouse other than the default one, a test screen will be\n" "displayed. Use the buttons and wheel to verify that the settings are\n" "correct and that the mouse is working correctly. If the mouse is not\n" -"working well, press the space bar or [Return] key to cancel the test and to\n" -"go back to the list of choices.\n" +"working well, press the space bar or [Return] key to cancel the test and\n" +"you will be returned to the mouse list.\n" "\n" -"Wheel mice are occasionally not detected automatically, so you will need to\n" +"Occasionally wheel mice are not detected automatically, so you will need to\n" "select your mouse from a list. Be sure to select the one corresponding to\n" "the port that your mouse is attached to. After selecting a mouse and\n" -"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n" -"the mouse wheel to ensure that it is activated correctly. Once you see the\n" -"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n" -"buttons and check that the mouse pointer moves on-screen as you move your\n" -"mouse." +"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n" +"Scroll the mouse wheel to ensure that it is activating correctly. As you\n" +"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n" +"Test the buttons and check that the mouse pointer moves on-screen as you\n" +"move your mouse about." msgstr "" -#: help.pm:691 +#: help.pm:681 #, c-format msgid "with Wheel emulation" msgstr "" -#: help.pm:694 +#: help.pm:681 +#, c-format +msgid "Universal | Any PS/2 & USB mice" +msgstr "" + +#: help.pm:684 #, 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:698 +#: help.pm:688 #, c-format msgid "" "This is the most crucial decision point for the security of your GNU/Linux\n" -"system: you have to enter the \"root\" password. \"Root\" is the system\n" +"system: you must enter the \"root\" password. \"Root\" is the system\n" "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 you chose is too easy. As you\n" -"can see, you are not forced to enter a password, but we strongly advise you\n" +"do everything! That's why you must choose a password which is difficult to\n" +"guess: DrakX will tell you if the password you chose is too simple. As you\n" +"can see, you're not forced to enter a password, but we strongly advise\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" "unintentionally erase all data on partitions by carelessly accessing the\n" @@ -4012,196 +3999,104 @@ msgid "" "\n" "The password should be a mixture of alphanumeric characters and at least 8\n" "characters long. Never write down the \"root\" password -- it makes it far\n" -"too easy to compromise a system.\n" +"too easy to compromise your system.\n" "\n" -"One caveat -- do not make the password too long or complicated because you\n" +"One caveat: don't make the password too long or too complicated because you\n" "must be able to remember it!\n" "\n" -"The password will not be displayed on screen as you type it in. To reduce\n" -"the chance of a blind typing error you will need to enter the password\n" -"twice. If you do happen to make the same typing error twice, this\n" -"``incorrect'' password will be the one you will have use the first time you\n" -"connect.\n" +"The password won't be displayed on screen as you type it. To reduce the\n" +"chance of a blind typing error you'll need to enter the password twice. If\n" +"you do happen to make the same typing error twice, you'll have to use this\n" +"``incorrect'' password the first time you'll try to connect as \"root\".\n" "\n" -"If you wish access to this computer to be controlled by an authentication\n" -"server, click the \"%s\" button.\n" +"If you want an authentication server to control access to your computer,\n" +"click on the \"%s\" button.\n" "\n" "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n" -"services, select the appropriate one for \"%s\". If you do not know which\n" +"services, select the appropriate one for \"%s\". If you don't know which\n" "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 and you absolutely trust everybody\n" -"who uses your computer, you can choose to have \"%s\"." +"If you happen to have problems with remembering passwords, or if your\n" +"computer will never be connected to the Internet and you absolutely trust\n" +"everybody who uses your computer, you can choose to have \"%s\"." msgstr "" -#: help.pm:733 +#: help.pm:722 #, c-format msgid "authentication" msgstr "" #. -PO: keep this short or else the buttons will not fit in the window -#: help.pm:733 install_steps_interactive.pm:1159 +#: help.pm:722 install_steps_interactive.pm:1159 #, c-format msgid "No password" msgstr "" -#: help.pm:736 +#: help.pm:725 #, 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" -"\n" -" * \"%s\": if you prefer LILO with its text menu interface.\n" -"\n" -" * \"%s\": if you prefer LILO with its graphical interface.\n" -"\n" -" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n" -"you prefer, the bootloader can be installed on the second hard drive\n" -"(\"%s\"), or even on a floppy disk (\"%s\");\n" -"\n" -" * \"%s\": after a boot or a reboot of the computer, this is the delay\n" -"given to the user at the console to select a boot entry other than the\n" -"default.\n" -"\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 Mandrakelinux\n" -"system! Be sure you know what you are doing before changing any of the\n" -"options. !!\n" -"\n" -"Clicking the \"%s\" button in this dialog will offer advanced options which\n" -"are normally reserved for the expert user." -msgstr "" - -#: help.pm:768 -#, c-format -msgid "GRUB" -msgstr "" - -#: help.pm:768 -#, c-format -msgid "/dev/hda" -msgstr "" - -#: help.pm:768 -#, c-format -msgid "/dev/hdb" -msgstr "" - -#: help.pm:768 -#, c-format -msgid "/dev/fd0" -msgstr "" - -#: help.pm:768 -#, c-format -msgid "Delay before booting the default image" -msgstr "" - -#: help.pm:771 -#, c-format -msgid "" -"After you have configured the general bootloader parameters, the list of\n" -"boot options that will be available at boot time will be displayed.\n" -"\n" -"If there are other operating systems installed on your machine they will\n" -"automatically be added to the boot menu. You can fine-tune the existing\n" -"options by clicking \"%s\" to create a new entry; selecting an entry and\n" -"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n" -"changes.\n" -"\n" -"You may also not want to give access to these other operating systems to\n" -"anyone who goes to the console and reboots the machine. You can delete the\n" -"corresponding entries for the operating systems to remove them from the\n" -"bootloader menu, but you will need a boot disk in order to boot those other\n" -"operating systems!" -msgstr "" - -#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakbackup:1534 standalone/drakfont:591 standalone/drakfont:657 standalone/drakups:280 standalone/drakups:329 standalone/drakups:349 standalone/drakvpn:333 standalone/drakvpn:694 -#, c-format -msgid "Add" -msgstr "" - -#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 -#, c-format -msgid "Modify" -msgstr "" - -#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480 standalone/drakups:282 standalone/drakups:331 standalone/drakups:351 standalone/drakvpn:333 standalone/drakvpn:694 -#, c-format -msgid "Remove" -msgstr "" - -#: help.pm:787 -#, c-format -msgid "" -"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" +"A boot loader is a little program which is started by the computer at boot\n" +"time. It's responsible for starting up the whole system. Normally, the boot\n" +"loader installation is totally automated. DrakX will analyze the disk boot\n" +"sector and act according to 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 any\n" -"other OS installed on your machine.\n" +"boot sector. This way you'll be able to load either GNU/Linux or any other\n" +"OS installed on your machine.\n" "\n" -" * if a GRUB or LILO boot sector is found, it will replace it with a new\n" -"one.\n" +" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n" "\n" -"If it cannot make a determination, DrakX will ask you where to place the\n" -"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." +"If DrakX can't determine where to place the boot sector, it'll ask you\n" +"where it should place it. Generally, the \"%s\" is the safest place.\n" +"Choosing \"%s\" won't install any boot loader. Use this option only if you\n" +"know what you're doing." msgstr "" -#: help.pm:803 +#: help.pm:742 #, c-format msgid "" -"Now, it's time to select a printing system for your computer. Other OSs may\n" -"offer you one, but Mandrakelinux offers two. Each of the printing systems\n" -"is best suited to particular types of configuration.\n" +"Now, it's time to select a printing system for your computer. Other\n" +"operating systems may offer you one, but Mandrakelinux offers two. Each of\n" +"the printing systems is best suited to particular types of configuration.\n" "\n" " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n" "if you have a direct connection to your printer, you want to be able to\n" -"panic out of printer jams, and you do not have networked printers. (\"%s\"\n" +"panic out of printer jams, and you don't have networked printers. (\"%s\"\n" "will handle only very simple network cases and is somewhat slow when used\n" -"with networks.) It's recommended that you use \"pdq\" if this is your first\n" -"experience with GNU/Linux.\n" -"\n" -" * \"%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 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" -"front-ends for printing or choosing printer options and for managing the\n" -"printer.\n" +"within networks.) It's recommended that you use \"pdq\" if this is your\n" +"first experience with GNU/Linux.\n" +"\n" +" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n" +"choice for printing to your local printer or to one halfway around the\n" +"planet. It's simple to configure and can act as a server or a client for\n" +"the ancient \"lpd\" printing system, so it's compatible with older\n" +"operating systems which may still need print services. While quite\n" +"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n" +"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n" +"\"%s\" includes graphical front-ends for printing or choosing printer\n" +"options and for managing the printer.\n" "\n" "If you make a choice now, and later find that you don't like your printing\n" -"system you may change it by running PrinterDrake from the Mandrake Control\n" -"Center and clicking the expert button." +"system you may change it by running PrinterDrake from the Mandrakelinux\n" +"Control Center and clicking on the \"%s\" button." msgstr "" -#: help.pm:826 help.pm:826 +#: help.pm:765 help.pm:765 #, c-format msgid "pdq" msgstr "" -#: help.pm:826 help.pm:826 printer/cups.pm:115 printer/data.pm:83 +#: help.pm:765 help.pm:765 printer/cups.pm:115 printer/data.pm:83 #, c-format msgid "CUPS" msgstr "" -#: help.pm:829 +#: help.pm:765 +#, c-format +msgid "Expert" +msgstr "" + +#: help.pm:768 #, c-format msgid "" "DrakX will first detect any IDE devices present in your computer. It will\n" @@ -4222,153 +4117,70 @@ msgid "" "configure the driver." msgstr "" -#: help.pm:847 +#: help.pm:786 #, c-format 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" -" \t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n" -"hda=autotune\n" -"\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" -"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." +"\"%s\": if a sound card is detected on your system, it'll be displayed\n" +"here. If you notice the sound card isn't the one actually present on your\n" +"system, you can click on the button and choose a different driver." msgstr "" -#: 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. 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 "" - -#: help.pm:926 -#, c-format -msgid "" -"\"%s\": if a sound card is detected on your system, it is displayed here.\n" -"If you notice the sound card displayed is not the one that is actually\n" -"present on your system, you can click on the button and choose another\n" -"driver." -msgstr "" - -#: help.pm:929 help.pm:991 install_steps_interactive.pm:966 install_steps_interactive.pm:983 +#: help.pm:788 help.pm:855 install_steps_interactive.pm:966 install_steps_interactive.pm:983 #, c-format msgid "Sound card" msgstr "" -#: help.pm:932 +#: help.pm:791 #, c-format msgid "" -"As a review, DrakX will present a summary of information it has about your\n" -"system. Depending on your installed hardware, you may have some or all of\n" -"the following entries. Each entry is made up of the configuration item to\n" -"be configured, followed by a quick summary of the current configuration.\n" -"Click on the corresponding \"%s\" button to change that.\n" +"As a review, DrakX will present a summary of information it has gathered\n" +"about your system. Depending on the hardware installed on your machine, you\n" +"may have some or all of the following entries. Each entry is made up of the\n" +"hardware item to be configured, followed by a quick summary of the current\n" +"configuration. Click on the corresponding \"%s\" button to make the change.\n" "\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" -"country, click on the \"%s\" button and choose another one. If your country\n" -"is not in the first list shown, click the \"%s\" button to get the complete\n" +" * \"%s\": check the current country selection. If you're not in this\n" +"country, click on the \"%s\" button and choose another. If your country\n" +"isn't in the list shown, click on the \"%s\" button to get the complete\n" "country list.\n" "\n" -" * \"%s\": By default, DrakX deduces your time zone based on the country\n" +" * \"%s\": by default, DrakX deduces your time zone based on the country\n" "you have chosen. You can click on the \"%s\" button here if this is not\n" "correct.\n" "\n" -" * \"%s\": check the current mouse configuration and click on the button to\n" -"change it if necessary.\n" +" * \"%s\": verify the current mouse configuration and click on the button\n" +"to change it if necessary.\n" "\n" " * \"%s\": clicking on the \"%s\" button will open the printer\n" "configuration wizard. Consult the corresponding chapter of the ``Starter\n" -"Guide'' for more information on how to setup a new printer. The interface\n" -"presented there is similar to the one used during installation.\n" +"Guide'' for more information on how to set up a new printer. The interface\n" +"presented in our manual is similar to the one used during installation.\n" +"\n" +" * \"%s\": if a sound card is detected on your system, it'll be displayed\n" +"here. If you notice the sound card isn't the one actually present on your\n" +"system, you can click on the button and choose a different driver.\n" "\n" -" * \"%s\": if a sound card is detected on your system, it is displayed\n" -"here. If you notice the sound card displayed is not the one that is\n" -"actually present on your system, you can click on the button and choose\n" -"another driver.\n" +" * \"%s\": if you have a TV card, this is where information about its\n" +"configuration will be displayed. If you have a TV card and it isn't\n" +"detected, click on \"%s\" to try to configure it manually.\n" +"\n" +" * \"%s\": you can click on \"%s\" to change the parameters associated with\n" +"the card if you feel the configuration is wrong.\n" "\n" " * \"%s\": by default, DrakX configures your graphical interface in\n" -"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n" +"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n" "\"%s\" to reconfigure your graphical interface.\n" "\n" -" * \"%s\": if a TV card is detected on your system, it is displayed here.\n" -"If you have a TV card and it is not detected, click on \"%s\" to try to\n" -"configure it manually.\n" -"\n" -" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n" -"here. You can click on \"%s\" to change the parameters associated with the\n" -"card.\n" +" * \"%s\": if you wish to configure your Internet or local network access,\n" +"you can do so now. Refer to the printed documentation or use the\n" +"Mandrakelinux Control Center after the installation has finished to benefit\n" +"from full in-line help.\n" "\n" -" * \"%s\": If you wish to configure your Internet or local network access\n" -"now.\n" +" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n" +"you're installing on is to be located behind a proxy server.\n" "\n" " * \"%s\": this entry allows you to redefine the security level as set in a\n" "previous step ().\n" @@ -4378,65 +4190,72 @@ msgid "" "the corresponding section of the ``Starter Guide'' for details about\n" "firewall settings.\n" "\n" -" * \"%s\": if you wish to change your bootloader configuration, click that\n" -"button. This should be reserved to advanced users.\n" +" * \"%s\": if you wish to change your bootloader configuration, click this\n" +"button. This should be reserved to advanced users. Refer to the printed\n" +"documentation or the in-line help about bootloader configuration in the\n" +"Mandrakelinux Control Center.\n" "\n" -" * \"%s\": here you'll be able to fine control which services will be run\n" +" * \"%s\": through this entry you can fine tune which services will be run\n" "on your machine. If you plan to use this machine as a server it's a good\n" "idea to review this setup." msgstr "" -#: help.pm:991 install_steps_interactive.pm:113 install_steps_interactive.pm:899 standalone/keyboarddrake:23 +#: help.pm:855 install_steps_interactive.pm:113 install_steps_interactive.pm:899 standalone/keyboarddrake:23 #, c-format msgid "Keyboard" msgstr "" -#: help.pm:991 install_steps_interactive.pm:925 standalone/drakclock:75 +#: help.pm:855 install_steps_interactive.pm:925 standalone/drakclock:75 #, c-format msgid "Timezone" msgstr "" -#: help.pm:991 +#: help.pm:855 install_steps_interactive.pm:999 #, c-format -msgid "Graphical Interface" +msgid "TV card" msgstr "" -#: help.pm:991 install_steps_interactive.pm:999 +#: help.pm:855 #, c-format -msgid "TV card" +msgid "ISDN card" msgstr "" -#: help.pm:991 +#: help.pm:855 #, c-format -msgid "ISDN card" +msgid "Graphical Interface" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1017 standalone/drakbackup:2031 +#: help.pm:855 install_steps_interactive.pm:1017 standalone/drakbackup:2031 #, c-format msgid "Network" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1043 +#: help.pm:855 install_steps_interactive.pm:1032 +#, c-format +msgid "Proxies" +msgstr "" + +#: help.pm:855 install_steps_interactive.pm:1043 #, c-format msgid "Security Level" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1057 +#: help.pm:855 install_steps_interactive.pm:1057 #, c-format msgid "Firewall" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1071 +#: help.pm:855 install_steps_interactive.pm:1071 #, c-format msgid "Bootloader" msgstr "" -#: help.pm:991 install_steps_interactive.pm:1081 services.pm:195 +#: help.pm:855 install_steps_interactive.pm:1081 services.pm:195 #, c-format msgid "Services" msgstr "" -#: help.pm:994 +#: help.pm:858 #, c-format msgid "" "Choose the hard drive you want to erase in order to install your new\n" @@ -4444,7 +4263,7 @@ msgid "" "and will not be recoverable!" msgstr "" -#: help.pm:999 +#: help.pm:863 #, c-format msgid "" "Click on \"%s\" if you want to delete all data and partitions present on\n" @@ -4456,6 +4275,16 @@ msgid "" "present on this hard drive." msgstr "" +#: help.pm:869 help.pm:869 +#, c-format +msgid "Next ->" +msgstr "" + +#: help.pm:869 +#, c-format +msgid "<- Previous" +msgstr "" + #: install2.pm:118 #, c-format msgid "Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)" @@ -4466,21 +4295,26 @@ msgstr "" msgid "You must also format %s" msgstr "" -#: install_any.pm:376 +#: install_any.pm:375 #, c-format msgid "Do you have a supplementary installation media to configure?" msgstr "" -#: install_any.pm:377 printer/printerdrake.pm:2531 printer/printerdrake.pm:2538 standalone/scannerdrake:180 standalone/scannerdrake:188 standalone/scannerdrake:239 standalone/scannerdrake:246 +#: install_any.pm:376 printer/printerdrake.pm:2531 printer/printerdrake.pm:2538 standalone/scannerdrake:180 standalone/scannerdrake:188 standalone/scannerdrake:239 standalone/scannerdrake:246 #, c-format msgid "CD-ROM" msgstr "" -#: install_any.pm:377 +#: install_any.pm:376 #, c-format msgid "Network (http)" msgstr "" +#: install_any.pm:376 +#, c-format +msgid "Network (ftp)" +msgstr "" + #: install_any.pm:395 #, c-format msgid "Insert the CD" @@ -4491,18 +4325,18 @@ msgstr "" msgid "URL of the mirror?" msgstr "" -#: install_any.pm:428 +#: install_any.pm:434 #, c-format msgid "Can't find hdlist file on this mirror" msgstr "" -#: install_any.pm:503 +#: install_any.pm:504 #, c-format msgid "Insert the CD 1 again" msgstr "" #. -PO: keep the doble empty lines between sections, this is formated a la LaTeX -#: install_any.pm:602 +#: install_any.pm:603 #, c-format msgid "" "You have selected the following server(s): %s\n" @@ -4518,7 +4352,7 @@ msgid "" msgstr "" #. -PO: keep the doble empty lines between sections, this is formated a la LaTeX -#: install_any.pm:625 +#: install_any.pm:626 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -4528,27 +4362,27 @@ msgid "" "" msgstr "" -#: install_any.pm:994 +#: install_any.pm:995 #, c-format msgid "Insert a FAT formatted floppy in drive %s" msgstr "" -#: install_any.pm:998 +#: install_any.pm:999 #, c-format msgid "This floppy is not FAT formatted" msgstr "" -#: install_any.pm:1010 +#: install_any.pm:1011 #, c-format msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''" msgstr "" -#: install_any.pm:1038 partition_table.pm:578 +#: install_any.pm:1039 partition_table.pm:578 #, c-format msgid "Error reading file %s" msgstr "" -#: install_any.pm:1175 +#: install_any.pm:1176 #, c-format msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem" msgstr "" @@ -5486,11 +5320,6 @@ msgstr "" msgid "Network & Internet" msgstr "" -#: install_steps_interactive.pm:1032 -#, c-format -msgid "Proxies" -msgstr "" - #: install_steps_interactive.pm:1033 #, c-format msgid "configured" @@ -5547,7 +5376,7 @@ msgstr "" msgid "This password is too short (it must be at least %d characters long)" msgstr "" -#: install_steps_interactive.pm:1170 network/netconnect.pm:578 standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:460 +#: install_steps_interactive.pm:1170 network/netconnect.pm:566 standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:460 #, c-format msgid "Authentication" msgstr "" @@ -5659,6 +5488,21 @@ msgstr "" msgid "Choose a file" msgstr "" +#: interactive.pm:295 interactive/gtk.pm:480 standalone/drakbackup:1534 standalone/drakfont:591 standalone/drakfont:657 standalone/drakups:280 standalone/drakups:329 standalone/drakups:349 standalone/drakvpn:333 standalone/drakvpn:694 +#, c-format +msgid "Add" +msgstr "" + +#: interactive.pm:295 interactive/gtk.pm:480 +#, c-format +msgid "Modify" +msgstr "" + +#: interactive.pm:295 interactive/gtk.pm:480 standalone/drakups:282 standalone/drakups:331 standalone/drakups:351 standalone/drakvpn:333 standalone/drakvpn:694 +#, c-format +msgid "Remove" +msgstr "" + #: interactive.pm:372 #, c-format msgid "Basic" @@ -7461,7 +7305,7 @@ msgstr "" msgid "Zimbabwe" msgstr "" -#: lang.pm:1057 +#: lang.pm:1056 #, c-format msgid "Welcome to %s" msgstr "" @@ -7635,7 +7479,7 @@ msgstr "" msgid "GlidePoint" msgstr "" -#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/modem.pm:58 network/modem.pm:72 network/modem.pm:77 network/modem.pm:108 network/netconnect.pm:589 network/netconnect.pm:594 network/netconnect.pm:606 network/netconnect.pm:611 network/netconnect.pm:627 network/netconnect.pm:629 +#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/modem.pm:58 network/modem.pm:72 network/modem.pm:77 network/modem.pm:108 network/netconnect.pm:577 network/netconnect.pm:582 network/netconnect.pm:594 network/netconnect.pm:599 network/netconnect.pm:615 network/netconnect.pm:617 #, c-format msgid "Automatic" msgstr "" @@ -7840,12 +7684,12 @@ msgstr "" msgid "Sagem (using DHCP) USB" msgstr "" -#: network/adsl.pm:35 network/netconnect.pm:764 +#: network/adsl.pm:35 network/netconnect.pm:752 #, c-format msgid "Connect to the Internet" msgstr "" -#: network/adsl.pm:36 network/netconnect.pm:765 +#: network/adsl.pm:36 network/netconnect.pm:753 #, c-format msgid "" "The most common way to connect with adsl is pppoe.\n" @@ -7853,7 +7697,7 @@ msgid "" "If you don't know, choose 'use pppoe'" msgstr "" -#: network/adsl.pm:41 network/netconnect.pm:769 +#: network/adsl.pm:41 network/netconnect.pm:757 #, c-format msgid "ADSL connection type :" msgstr "" @@ -7970,37 +7814,37 @@ msgstr "" msgid "Other ports" msgstr "" -#: network/isdn.pm:94 network/netconnect.pm:442 +#: network/isdn.pm:94 network/netconnect.pm:430 #, c-format msgid "Unlisted - edit manually" msgstr "" -#: network/isdn.pm:137 network/netconnect.pm:391 +#: network/isdn.pm:137 network/netconnect.pm:379 #, c-format msgid "ISA / PCMCIA" msgstr "" -#: network/isdn.pm:137 network/netconnect.pm:391 +#: network/isdn.pm:137 network/netconnect.pm:379 #, c-format msgid "I don't know" msgstr "" -#: network/isdn.pm:138 network/netconnect.pm:391 +#: network/isdn.pm:138 network/netconnect.pm:379 #, c-format msgid "PCI" msgstr "" -#: network/isdn.pm:139 network/netconnect.pm:391 +#: network/isdn.pm:139 network/netconnect.pm:379 #, c-format msgid "USB" msgstr "" -#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/netconnect.pm:594 network/netconnect.pm:611 network/netconnect.pm:627 +#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/netconnect.pm:582 network/netconnect.pm:599 network/netconnect.pm:615 #, c-format msgid "Manual" msgstr "" -#: network/netconnect.pm:89 network/netconnect.pm:471 network/netconnect.pm:481 +#: network/netconnect.pm:89 network/netconnect.pm:459 network/netconnect.pm:469 #, c-format msgid "Manual choice" msgstr "" @@ -8237,12 +8081,12 @@ msgid "" "Press \"%s\" to continue." msgstr "" -#: network/netconnect.pm:284 network/netconnect.pm:793 +#: network/netconnect.pm:284 network/netconnect.pm:781 #, c-format msgid "Connection Configuration" msgstr "" -#: network/netconnect.pm:285 network/netconnect.pm:794 +#: network/netconnect.pm:285 network/netconnect.pm:782 #, c-format msgid "Please fill or check the field below" msgstr "" @@ -8277,7 +8121,7 @@ msgstr "" msgid "Your personal phone number" msgstr "" -#: network/netconnect.pm:298 network/netconnect.pm:797 +#: network/netconnect.pm:298 network/netconnect.pm:785 #, c-format msgid "Provider name (ex provider.net)" msgstr "" @@ -8312,47 +8156,47 @@ msgstr "" msgid "Connection timeout (in sec)" msgstr "" -#: network/netconnect.pm:307 network/netconnect.pm:800 standalone/drakconnect:470 +#: network/netconnect.pm:307 network/netconnect.pm:788 standalone/drakconnect:470 #, c-format msgid "Account Login (user name)" msgstr "" -#: network/netconnect.pm:308 network/netconnect.pm:801 standalone/drakconnect:471 +#: network/netconnect.pm:308 network/netconnect.pm:789 standalone/drakconnect:471 #, c-format msgid "Account Password" msgstr "" -#: network/netconnect.pm:338 network/netconnect.pm:651 network/netconnect.pm:832 +#: network/netconnect.pm:326 network/netconnect.pm:639 network/netconnect.pm:820 #, c-format msgid "Select the network interface to configure:" msgstr "" -#: network/netconnect.pm:340 network/netconnect.pm:381 network/netconnect.pm:652 network/netconnect.pm:834 network/shorewall.pm:85 standalone/drakconnect:653 standalone/drakgw:227 standalone/drakvpn:221 +#: network/netconnect.pm:328 network/netconnect.pm:369 network/netconnect.pm:640 network/netconnect.pm:822 network/shorewall.pm:85 standalone/drakconnect:653 standalone/drakgw:227 standalone/drakvpn:221 #, c-format msgid "Net Device" msgstr "" -#: network/netconnect.pm:341 network/netconnect.pm:349 +#: network/netconnect.pm:329 network/netconnect.pm:337 #, c-format msgid "External ISDN modem" msgstr "" -#: network/netconnect.pm:380 standalone/harddrake2:192 +#: network/netconnect.pm:368 standalone/harddrake2:192 #, c-format msgid "Select a device!" msgstr "" -#: network/netconnect.pm:389 network/netconnect.pm:399 network/netconnect.pm:409 network/netconnect.pm:425 network/netconnect.pm:439 +#: network/netconnect.pm:377 network/netconnect.pm:387 network/netconnect.pm:397 network/netconnect.pm:413 network/netconnect.pm:427 #, c-format msgid "ISDN Configuration" msgstr "" -#: network/netconnect.pm:390 +#: network/netconnect.pm:378 #, c-format msgid "What kind of card do you have?" msgstr "" -#: network/netconnect.pm:400 +#: network/netconnect.pm:388 #, c-format msgid "" "\n" @@ -8362,161 +8206,161 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:404 +#: network/netconnect.pm:392 #, c-format msgid "Continue" msgstr "" -#: network/netconnect.pm:404 +#: network/netconnect.pm:392 #, c-format msgid "Abort" msgstr "" -#: network/netconnect.pm:410 +#: network/netconnect.pm:398 #, c-format msgid "Which of the following is your ISDN card?" msgstr "" -#: network/netconnect.pm:425 +#: network/netconnect.pm:413 #, c-format msgid "Which protocol do you want to use?" msgstr "" -#: network/netconnect.pm:427 standalone/drakconnect:115 standalone/drakconnect:317 standalone/drakconnect:539 standalone/drakvpn:1142 +#: network/netconnect.pm:415 standalone/drakconnect:115 standalone/drakconnect:317 standalone/drakconnect:539 standalone/drakvpn:1142 #, c-format msgid "Protocol" msgstr "" -#: network/netconnect.pm:439 +#: network/netconnect.pm:427 #, c-format msgid "" "Select your provider.\n" "If it isn't listed, choose Unlisted." msgstr "" -#: network/netconnect.pm:441 network/netconnect.pm:548 network/netconnect.pm:686 +#: network/netconnect.pm:429 network/netconnect.pm:536 network/netconnect.pm:674 #, c-format msgid "Provider:" msgstr "" -#: network/netconnect.pm:456 +#: network/netconnect.pm:444 #, c-format msgid "" "Your modem isn't supported by the system.\n" "Take a look at http://www.linmodems.org" msgstr "" -#: network/netconnect.pm:468 +#: network/netconnect.pm:456 #, c-format msgid "Select the modem to configure:" msgstr "" -#: network/netconnect.pm:475 standalone/drakgw:114 standalone/drakvpn:51 +#: network/netconnect.pm:463 standalone/drakgw:114 standalone/drakvpn:51 #, c-format msgid "Sorry, we support only 2.4 and above kernels." msgstr "" -#: network/netconnect.pm:516 +#: network/netconnect.pm:504 #, c-format msgid "Please choose which serial port your modem is connected to." msgstr "" -#: network/netconnect.pm:546 +#: network/netconnect.pm:534 #, c-format msgid "Select your provider:" msgstr "" -#: network/netconnect.pm:571 +#: network/netconnect.pm:559 #, c-format msgid "Dialup: account options" msgstr "" -#: network/netconnect.pm:574 +#: network/netconnect.pm:562 #, c-format msgid "Connection name" msgstr "" -#: network/netconnect.pm:575 +#: network/netconnect.pm:563 #, c-format msgid "Phone number" msgstr "" -#: network/netconnect.pm:576 +#: network/netconnect.pm:564 #, c-format msgid "Login ID" msgstr "" -#: network/netconnect.pm:591 network/netconnect.pm:624 +#: network/netconnect.pm:579 network/netconnect.pm:612 #, c-format msgid "Dialup: IP parameters" msgstr "" -#: network/netconnect.pm:594 +#: network/netconnect.pm:582 #, c-format msgid "IP parameters" msgstr "" -#: network/netconnect.pm:595 network/netconnect.pm:922 printer/printerdrake.pm:431 standalone/drakconnect:115 standalone/drakconnect:331 standalone/drakconnect:827 standalone/drakups:266 +#: network/netconnect.pm:583 network/netconnect.pm:910 printer/printerdrake.pm:431 standalone/drakconnect:115 standalone/drakconnect:331 standalone/drakconnect:827 standalone/drakups:266 #, c-format msgid "IP address" msgstr "" -#: network/netconnect.pm:596 +#: network/netconnect.pm:584 #, c-format msgid "Subnet mask" msgstr "" -#: network/netconnect.pm:608 +#: network/netconnect.pm:596 #, c-format msgid "Dialup: DNS parameters" msgstr "" -#: network/netconnect.pm:611 +#: network/netconnect.pm:599 #, c-format msgid "DNS" msgstr "" -#: network/netconnect.pm:612 +#: network/netconnect.pm:600 #, c-format msgid "Domain name" msgstr "" -#: network/netconnect.pm:613 network/netconnect.pm:798 standalone/drakconnect:945 +#: network/netconnect.pm:601 network/netconnect.pm:786 standalone/drakconnect:945 #, c-format msgid "First DNS Server (optional)" msgstr "" -#: network/netconnect.pm:614 network/netconnect.pm:799 standalone/drakconnect:946 +#: network/netconnect.pm:602 network/netconnect.pm:787 standalone/drakconnect:946 #, c-format msgid "Second DNS Server (optional)" msgstr "" -#: network/netconnect.pm:615 +#: network/netconnect.pm:603 #, c-format msgid "Set hostname from IP" msgstr "" -#: network/netconnect.pm:627 standalone/drakconnect:342 +#: network/netconnect.pm:615 standalone/drakconnect:342 #, c-format msgid "Gateway" msgstr "" -#: network/netconnect.pm:628 +#: network/netconnect.pm:616 #, c-format msgid "Gateway IP address" msgstr "" -#: network/netconnect.pm:651 +#: network/netconnect.pm:639 #, c-format msgid "ADSL configuration" msgstr "" -#: network/netconnect.pm:684 +#: network/netconnect.pm:672 #, c-format msgid "Please choose your ADSL provider" msgstr "" -#: network/netconnect.pm:702 +#: network/netconnect.pm:690 #, c-format msgid "" "You need the Alcatel microcode.\n" @@ -8524,32 +8368,32 @@ msgid "" "or skip and do it later." msgstr "" -#: network/netconnect.pm:706 network/netconnect.pm:711 +#: network/netconnect.pm:694 network/netconnect.pm:699 #, c-format msgid "Use a floppy" msgstr "" -#: network/netconnect.pm:706 network/netconnect.pm:715 +#: network/netconnect.pm:694 network/netconnect.pm:703 #, c-format msgid "Use my Windows partition" msgstr "" -#: network/netconnect.pm:706 network/netconnect.pm:718 +#: network/netconnect.pm:694 network/netconnect.pm:706 #, c-format msgid "Do it later" msgstr "" -#: network/netconnect.pm:725 +#: network/netconnect.pm:713 #, c-format msgid "Firmware copy failed, file %s not found" msgstr "" -#: network/netconnect.pm:732 +#: network/netconnect.pm:720 #, c-format msgid "Firmware copy succeeded" msgstr "" -#: network/netconnect.pm:747 +#: network/netconnect.pm:735 #, c-format msgid "" "You need the Alcatel microcode.\n" @@ -8558,22 +8402,22 @@ msgid "" "and copy the mgmt.o in /usr/share/speedtouch" msgstr "" -#: network/netconnect.pm:802 +#: network/netconnect.pm:790 #, c-format msgid "Virtual Path ID (VPI):" msgstr "" -#: network/netconnect.pm:803 +#: network/netconnect.pm:791 #, c-format msgid "Virtual Circuit ID (VCI):" msgstr "" -#: network/netconnect.pm:805 +#: network/netconnect.pm:793 #, c-format msgid "Encapsulation :" msgstr "" -#: network/netconnect.pm:822 +#: network/netconnect.pm:810 #, c-format msgid "" "The ECI Hi-Focus modem cannot be supported due to binary driver distribution problem.\n" @@ -8581,12 +8425,12 @@ msgid "" "You can find a driver on http://eciadsl.flashtux.org/" msgstr "" -#: network/netconnect.pm:834 +#: network/netconnect.pm:822 #, c-format msgid "Manually load a driver" msgstr "" -#: network/netconnect.pm:849 +#: network/netconnect.pm:837 #, c-format msgid "" "WARNING: this device has been previously configured to connect to the Internet.\n" @@ -8594,7 +8438,7 @@ msgid "" "Modifying the fields below will override this configuration." msgstr "" -#: network/netconnect.pm:862 network/netconnect.pm:1255 +#: network/netconnect.pm:850 network/netconnect.pm:1220 #, c-format msgid "" "Congratulations, the network and Internet configuration is finished.\n" @@ -8602,22 +8446,22 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:876 +#: network/netconnect.pm:864 #, c-format msgid "Zeroconf hostname resolution" msgstr "" -#: network/netconnect.pm:877 network/netconnect.pm:909 +#: network/netconnect.pm:865 network/netconnect.pm:897 #, c-format msgid "Configuring network device %s (driver %s)" msgstr "" -#: network/netconnect.pm:878 +#: network/netconnect.pm:866 #, 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:910 +#: network/netconnect.pm:898 #, c-format msgid "" "Please enter the IP configuration for this machine.\n" @@ -8625,102 +8469,102 @@ msgid "" "notation (for example, 1.2.3.4)." msgstr "" -#: network/netconnect.pm:917 +#: network/netconnect.pm:905 #, c-format msgid "Assign host name from DHCP address" msgstr "" -#: network/netconnect.pm:918 +#: network/netconnect.pm:906 #, c-format msgid "DHCP host name" msgstr "" -#: network/netconnect.pm:923 standalone/drakconnect:336 standalone/drakconnect:828 standalone/drakgw:323 +#: network/netconnect.pm:911 standalone/drakconnect:336 standalone/drakconnect:828 standalone/drakgw:323 #, c-format msgid "Netmask" msgstr "" -#: network/netconnect.pm:925 standalone/drakconnect:421 +#: network/netconnect.pm:913 standalone/drakconnect:421 #, c-format msgid "Track network card id (useful for laptops)" msgstr "" -#: network/netconnect.pm:926 standalone/drakconnect:422 +#: network/netconnect.pm:914 standalone/drakconnect:422 #, c-format msgid "Network Hotplugging" msgstr "" -#: network/netconnect.pm:927 standalone/drakconnect:416 +#: network/netconnect.pm:915 standalone/drakconnect:416 #, c-format msgid "Start at boot" msgstr "" -#: network/netconnect.pm:929 standalone/drakconnect:831 +#: network/netconnect.pm:917 standalone/drakconnect:831 #, c-format msgid "DHCP client" msgstr "" -#: network/netconnect.pm:939 printer/printerdrake.pm:1383 standalone/drakconnect:620 +#: network/netconnect.pm:927 printer/printerdrake.pm:1383 standalone/drakconnect:620 #, c-format msgid "IP address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:942 +#: network/netconnect.pm:930 #, c-format msgid "Warning : IP address %s is usually reserved !" msgstr "" -#: network/netconnect.pm:965 network/netconnect.pm:994 +#: network/netconnect.pm:954 network/netconnect.pm:983 #, c-format msgid "Please enter the wireless parameters for this card:" msgstr "" -#: network/netconnect.pm:968 standalone/drakconnect:388 +#: network/netconnect.pm:957 standalone/drakconnect:388 #, c-format msgid "Operating Mode" msgstr "" -#: network/netconnect.pm:970 standalone/drakconnect:389 +#: network/netconnect.pm:959 standalone/drakconnect:389 #, c-format msgid "Network name (ESSID)" msgstr "" -#: network/netconnect.pm:971 standalone/drakconnect:390 +#: network/netconnect.pm:960 standalone/drakconnect:390 #, c-format msgid "Network ID" msgstr "" -#: network/netconnect.pm:972 standalone/drakconnect:391 +#: network/netconnect.pm:961 standalone/drakconnect:391 #, c-format msgid "Operating frequency" msgstr "" -#: network/netconnect.pm:973 standalone/drakconnect:392 +#: network/netconnect.pm:962 standalone/drakconnect:392 #, c-format msgid "Sensitivity threshold" msgstr "" -#: network/netconnect.pm:974 standalone/drakconnect:393 +#: network/netconnect.pm:963 standalone/drakconnect:393 #, c-format msgid "Bitrate (in b/s)" msgstr "" -#: network/netconnect.pm:980 +#: network/netconnect.pm:969 #, 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:984 +#: network/netconnect.pm:973 #, 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:997 standalone/drakconnect:404 +#: network/netconnect.pm:986 standalone/drakconnect:404 #, c-format msgid "RTS/CTS" msgstr "" -#: network/netconnect.pm:998 +#: network/netconnect.pm:987 #, c-format msgid "" "RTS/CTS adds a handshake before each packet transmission to make sure that the\n" @@ -8731,17 +8575,17 @@ msgid "" "or off." msgstr "" -#: network/netconnect.pm:1005 standalone/drakconnect:405 +#: network/netconnect.pm:994 standalone/drakconnect:405 #, c-format msgid "Fragmentation" msgstr "" -#: network/netconnect.pm:1006 standalone/drakconnect:406 +#: network/netconnect.pm:995 standalone/drakconnect:406 #, c-format msgid "Iwconfig command extra arguments" msgstr "" -#: network/netconnect.pm:1007 +#: network/netconnect.pm:996 #, c-format msgid "" "Here, one can configure some extra wireless parameters such as:\n" @@ -8751,12 +8595,12 @@ msgid "" msgstr "" #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one -#: network/netconnect.pm:1014 standalone/drakconnect:407 +#: network/netconnect.pm:1003 standalone/drakconnect:407 #, c-format msgid "Iwspy command extra arguments" msgstr "" -#: network/netconnect.pm:1015 +#: network/netconnect.pm:1004 #, c-format msgid "" "Iwspy is used to set a list of addresses in a wireless network\n" @@ -8768,12 +8612,12 @@ msgid "" "See iwpspy(8) man page for further information." msgstr "" -#: network/netconnect.pm:1023 standalone/drakconnect:408 +#: network/netconnect.pm:1012 standalone/drakconnect:408 #, c-format msgid "Iwpriv command extra arguments" msgstr "" -#: network/netconnect.pm:1024 +#: network/netconnect.pm:1013 #, c-format msgid "" "Iwpriv enable to set up optionals (private) parameters of a wireless network\n" @@ -8788,24 +8632,7 @@ msgid "" "See iwpriv(8) man page for further information." msgstr "" -#: network/netconnect.pm:1051 -#, 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:1055 standalone/drakgw:263 standalone/drakpxe:142 -#, c-format -msgid "Choose the network interface" -msgstr "" - -#: network/netconnect.pm:1056 -#, c-format -msgid "Please choose which network adapter you want to use to connect to Internet." -msgstr "" - -#: network/netconnect.pm:1077 +#: network/netconnect.pm:1042 #, c-format msgid "" "Please enter your host name.\n" @@ -8814,67 +8641,67 @@ msgid "" "You may also enter the IP address of the gateway if you have one." msgstr "" -#: network/netconnect.pm:1081 +#: network/netconnect.pm:1046 #, c-format msgid "Last but not least you can also type in your DNS server IP addresses." msgstr "" -#: network/netconnect.pm:1083 standalone/drakconnect:944 +#: network/netconnect.pm:1048 standalone/drakconnect:944 #, c-format msgid "Host name (optional)" msgstr "" -#: network/netconnect.pm:1083 +#: network/netconnect.pm:1048 #, c-format msgid "Host name" msgstr "" -#: network/netconnect.pm:1085 +#: network/netconnect.pm:1050 #, c-format msgid "DNS server 1" msgstr "" -#: network/netconnect.pm:1086 +#: network/netconnect.pm:1051 #, c-format msgid "DNS server 2" msgstr "" -#: network/netconnect.pm:1087 +#: network/netconnect.pm:1052 #, c-format msgid "DNS server 3" msgstr "" -#: network/netconnect.pm:1088 +#: network/netconnect.pm:1053 #, c-format msgid "Search domain" msgstr "" -#: network/netconnect.pm:1089 +#: network/netconnect.pm:1054 #, c-format msgid "By default search domain will be set from the fully-qualified host name" msgstr "" -#: network/netconnect.pm:1090 +#: network/netconnect.pm:1055 #, c-format msgid "Gateway (e.g. %s)" msgstr "" -#: network/netconnect.pm:1092 +#: network/netconnect.pm:1057 #, c-format msgid "Gateway device" msgstr "" -#: network/netconnect.pm:1101 +#: network/netconnect.pm:1066 #, c-format msgid "DNS server address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:1106 standalone/drakconnect:623 +#: network/netconnect.pm:1071 standalone/drakconnect:623 #, c-format msgid "Gateway address should be in format 1.2.3.4" msgstr "" -#: network/netconnect.pm:1117 +#: network/netconnect.pm:1082 #, c-format msgid "" "If desired, enter a Zeroconf hostname.\n" @@ -8883,17 +8710,17 @@ msgid "" "It is not necessary on most networks." msgstr "" -#: network/netconnect.pm:1121 +#: network/netconnect.pm:1086 #, c-format msgid "Zeroconf Host name" msgstr "" -#: network/netconnect.pm:1124 +#: network/netconnect.pm:1089 #, c-format msgid "Zeroconf host name must not contain a ." msgstr "" -#: network/netconnect.pm:1134 +#: network/netconnect.pm:1099 #, c-format msgid "" "You have configured multiple ways to connect to the Internet.\n" @@ -8902,52 +8729,52 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:1136 +#: network/netconnect.pm:1101 #, c-format msgid "Internet connection" msgstr "" -#: network/netconnect.pm:1144 +#: network/netconnect.pm:1109 #, c-format msgid "Configuration is complete, do you want to apply settings ?" msgstr "" -#: network/netconnect.pm:1154 +#: network/netconnect.pm:1119 #, c-format msgid "Do you want to start the connection at boot?" msgstr "" -#: network/netconnect.pm:1173 +#: network/netconnect.pm:1138 #, c-format msgid "Automatically at boot" msgstr "" -#: network/netconnect.pm:1175 +#: network/netconnect.pm:1140 #, c-format msgid "By using Net Applet in the system tray" msgstr "" -#: network/netconnect.pm:1177 +#: network/netconnect.pm:1142 #, c-format msgid "Manually (the interface would still be activated at boot)" msgstr "" -#: network/netconnect.pm:1186 +#: network/netconnect.pm:1151 #, c-format msgid "How do you want to dial this connection ?" msgstr "" -#: network/netconnect.pm:1199 +#: network/netconnect.pm:1164 #, c-format msgid "The network needs to be restarted. Do you want to restart it ?" msgstr "" -#: network/netconnect.pm:1206 network/netconnect.pm:1271 +#: network/netconnect.pm:1171 network/netconnect.pm:1236 #, c-format msgid "Network Configuration" msgstr "" -#: network/netconnect.pm:1207 +#: network/netconnect.pm:1172 #, c-format msgid "" "A problem occured while restarting the network: \n" @@ -8955,46 +8782,46 @@ msgid "" "%s" msgstr "" -#: network/netconnect.pm:1215 +#: network/netconnect.pm:1180 #, c-format msgid "Do you want to try to connect to the Internet now?" msgstr "" -#: network/netconnect.pm:1223 standalone/drakconnect:976 +#: network/netconnect.pm:1188 standalone/drakconnect:976 #, c-format msgid "Testing your connection..." msgstr "" -#: network/netconnect.pm:1239 +#: network/netconnect.pm:1204 #, c-format msgid "The system is now connected to the Internet." msgstr "" -#: network/netconnect.pm:1240 +#: network/netconnect.pm:1205 #, c-format msgid "For security reasons, it will be disconnected now." msgstr "" -#: network/netconnect.pm:1241 +#: network/netconnect.pm:1206 #, c-format msgid "" "The system doesn't seem to be connected to the Internet.\n" "Try to reconfigure your connection." msgstr "" -#: network/netconnect.pm:1258 +#: network/netconnect.pm:1223 #, 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:1259 +#: network/netconnect.pm:1224 #, 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:1272 +#: network/netconnect.pm:1237 #, c-format msgid "" "Because you are doing a network installation, your network is already configured.\n" @@ -9002,7 +8829,7 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:1313 +#: network/netconnect.pm:1278 #, c-format msgid "" "An unexpected error has happened:\n" @@ -10810,7 +10637,7 @@ msgstr "" msgid "Printing on the printer \"%s\"" msgstr "" -#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296 printer/printerdrake.pm:3297 printer/printerdrake.pm:3298 printer/printerdrake.pm:4385 standalone/drakTermServ:309 standalone/drakbackup:4100 standalone/drakbug:147 standalone/drakfont:500 standalone/drakfont:593 standalone/net_monitor:119 standalone/printerdrake:514 +#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296 printer/printerdrake.pm:3297 printer/printerdrake.pm:3298 printer/printerdrake.pm:4385 standalone/drakTermServ:309 standalone/drakbackup:4100 standalone/drakbug:152 standalone/drakfont:500 standalone/drakfont:593 standalone/net_monitor:119 standalone/printerdrake:514 #, c-format msgid "Close" msgstr "" @@ -13038,7 +12865,7 @@ msgstr "" msgid "Add/Del Clients" msgstr "" -#: standalone/drakTermServ:304 standalone/drakbug:50 +#: standalone/drakTermServ:304 standalone/drakbug:47 #, c-format msgid "First Time Wizard" msgstr "" @@ -15360,190 +15187,183 @@ msgstr "" msgid "Installation of %s failed. The following error occured:" msgstr "" -#: standalone/drakbug:36 -#, c-format -msgid "" -"To submit a bug report, click on the button report.\n" -"This will open a web browser window on %s\n" -" where you'll find a form to fill in. The information displayed above will be \n" -"transferred to that server." -msgstr "" - -#: standalone/drakbug:44 +#: standalone/drakbug:41 #, c-format msgid "Mandrakelinux Bug Report Tool" msgstr "" -#: standalone/drakbug:49 +#: standalone/drakbug:46 #, c-format msgid "Mandrakelinux Control Center" msgstr "" -#: standalone/drakbug:51 +#: standalone/drakbug:48 #, c-format msgid "Synchronization tool" msgstr "" -#: standalone/drakbug:52 standalone/drakbug:66 standalone/drakbug:172 standalone/drakbug:174 standalone/drakbug:178 +#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:177 standalone/drakbug:179 standalone/drakbug:183 #, c-format msgid "Standalone Tools" msgstr "" -#: standalone/drakbug:53 +#: standalone/drakbug:50 #, c-format msgid "HardDrake" msgstr "" -#: standalone/drakbug:54 +#: standalone/drakbug:51 #, c-format msgid "Mandrakeonline" msgstr "" -#: standalone/drakbug:55 +#: standalone/drakbug:52 #, c-format msgid "Menudrake" msgstr "" -#: standalone/drakbug:56 +#: standalone/drakbug:53 #, c-format msgid "Msec" msgstr "" -#: standalone/drakbug:57 +#: standalone/drakbug:54 #, c-format msgid "Remote Control" msgstr "" -#: standalone/drakbug:58 +#: standalone/drakbug:55 #, c-format msgid "Software Manager" msgstr "" -#: standalone/drakbug:59 +#: standalone/drakbug:56 #, c-format msgid "Urpmi" msgstr "" -#: standalone/drakbug:60 +#: standalone/drakbug:57 #, c-format msgid "Windows Migration tool" msgstr "" -#: standalone/drakbug:61 +#: standalone/drakbug:58 #, c-format msgid "Userdrake" msgstr "" -#: standalone/drakbug:62 +#: standalone/drakbug:59 #, c-format msgid "Configuration Wizards" msgstr "" -#: standalone/drakbug:78 +#: standalone/drakbug:80 #, c-format msgid "" -"To submit a bug report, click the report button, which will open your default browser\n" -"to Anthill where you will be able to upload the above information as a bug report." +"To submit a bug report, click on the report button.\n" +"This will open a web browser window on %s\n" +" where you'll find a form to fill in. The information displayed above will be \n" +"transferred to that server." msgstr "" -#: standalone/drakbug:83 +#: standalone/drakbug:84 #, c-format msgid "Application:" msgstr "" -#: standalone/drakbug:84 standalone/drakbug:96 +#: standalone/drakbug:85 standalone/drakbug:97 #, c-format msgid "Package: " msgstr "" -#: standalone/drakbug:85 +#: standalone/drakbug:86 #, c-format msgid "Kernel:" msgstr "" -#: standalone/drakbug:86 standalone/drakbug:97 +#: standalone/drakbug:87 standalone/drakbug:98 #, c-format msgid "Release: " msgstr "" -#: standalone/drakbug:91 +#: standalone/drakbug:92 #, c-format msgid "" "Application Name\n" "or Full Path:" msgstr "" -#: standalone/drakbug:94 +#: standalone/drakbug:95 #, c-format msgid "Find Package" msgstr "" -#: standalone/drakbug:98 +#: standalone/drakbug:99 #, c-format msgid "Summary: " msgstr "" -#: standalone/drakbug:104 +#: standalone/drakbug:105 #, c-format msgid "Bug Description/System Information" msgstr "" -#: standalone/drakbug:105 +#: standalone/drakbug:106 #, c-format msgid "YOUR TEXT HERE" msgstr "" -#: standalone/drakbug:108 +#: standalone/drakbug:109 #, c-format msgid "Submit kernel version" msgstr "" -#: standalone/drakbug:109 +#: standalone/drakbug:110 #, c-format msgid "Submit cpuinfo" msgstr "" -#: standalone/drakbug:110 +#: standalone/drakbug:111 #, c-format msgid "Submit lspci" msgstr "" -#: standalone/drakbug:130 +#: standalone/drakbug:131 #, c-format msgid "Report" msgstr "" -#: standalone/drakbug:187 +#: standalone/drakbug:192 #, c-format msgid "Not installed" msgstr "" -#: standalone/drakbug:199 +#: standalone/drakbug:204 #, c-format msgid "Package not installed" msgstr "" -#: standalone/drakbug:216 +#: standalone/drakbug:221 #, c-format msgid "NOT FOUND" msgstr "" -#: standalone/drakbug:223 +#: standalone/drakbug:228 #, c-format msgid "connecting to %s ..." msgstr "" -#: standalone/drakbug:231 +#: standalone/drakbug:236 #, c-format msgid "No browser available! Please install one" msgstr "" -#: standalone/drakbug:250 +#: standalone/drakbug:255 #, c-format msgid "Please enter a package name." msgstr "" -#: standalone/drakbug:256 +#: standalone/drakbug:261 #, c-format msgid "Please enter summary text." msgstr "" @@ -16490,6 +16310,11 @@ msgid "" "I am about to setup your Local Area Network with that adapter." msgstr "" +#: standalone/drakgw:263 standalone/drakpxe:142 +#, c-format +msgid "Choose the network interface" +msgstr "" + #: standalone/drakgw:264 #, c-format msgid "Please choose what network adapter will be connected to your Local Area Network." @@ -17012,19 +16837,19 @@ msgstr "" #. -PO: Do not alter the and tags. #. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words. #. -PO: keep the doble empty lines between sections, this is formated a la LaTeX. -#: standalone/draksec:96 +#: standalone/draksec:97 #, c-format msgid "" "Here, you can setup the security level and administrator of your machine.\n" "\n" "\n" -"The Security Administrator is the one who will receive security alerts if the\n" -"'Security Alerts' option is set. It can be a username or an email.\n" +"The 'Security Administrator' is the one who will receive security alerts if the\n" +"'Security Alerts' option is set. It can be a username or an email.\n" "\n" "\n" -"The Security Level menu allows you to select one of the six preconfigured security levels\n" -"provided with msec. These levels range from poor security and ease of use, to\n" -"paranoid config, suitable for very sensitive server applications:\n" +"The 'Security Level' menu allows you to select one of the six preconfigured security levels\n" +"provided with msec. These levels range from 'poor' security and ease of use, to\n" +"'paranoid' config, suitable for very sensitive server applications:\n" "\n" "\n" "Poor: This is a totally unsafe but very\n" @@ -17051,32 +16876,32 @@ msgid "" "maximum" msgstr "" -#: standalone/draksec:141 +#: standalone/draksec:142 #, c-format msgid "(default value: %s)" msgstr "" -#: standalone/draksec:182 +#: standalone/draksec:183 #, c-format msgid "Security Level:" msgstr "" -#: standalone/draksec:185 +#: standalone/draksec:186 #, c-format msgid "Security Alerts:" msgstr "" -#: standalone/draksec:189 +#: standalone/draksec:190 #, c-format msgid "Security Administrator:" msgstr "" -#: standalone/draksec:191 +#: standalone/draksec:192 #, c-format msgid "Basic options" msgstr "" -#: standalone/draksec:204 +#: standalone/draksec:205 #, c-format msgid "" "The following options can be set to customize your\n" @@ -17084,27 +16909,27 @@ msgid "" "" msgstr "" -#: standalone/draksec:206 +#: standalone/draksec:207 #, c-format msgid "Network Options" msgstr "" -#: standalone/draksec:206 +#: standalone/draksec:207 #, c-format msgid "System Options" msgstr "" -#: standalone/draksec:252 +#: standalone/draksec:253 #, c-format msgid "Periodic Checks" msgstr "" -#: standalone/draksec:270 +#: standalone/draksec:271 #, c-format msgid "Please wait, setting security level..." msgstr "" -#: standalone/draksec:276 +#: standalone/draksec:277 #, c-format msgid "Please wait, setting security options..." msgstr "" diff --git a/perl-install/share/po/help-de.pot b/perl-install/share/po/help-de.pot index 1e3d4784b..62b76bcbf 100644 --- a/perl-install/share/po/help-de.pot +++ b/perl-install/share/po/help-de.pot @@ -562,9 +562,9 @@ msgid "" "Linux Standard Base specifications.\n" "\n" " Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" -"instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" "of the system. However, if you do not select the \"LSB\" group you will\n" -"still have a system which is nearly 100% LSB-compliant.\n" +"still have a system which is nearly 100%% LSB-compliant.\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" @@ -616,9 +616,9 @@ msgstr "" "möglichst eng an den Vorgaben der Linux Standard Base ausrichten.\n" "\n" " Die Auswahl der „LSB“-Gruppe bewirkt auch, dass der Kernel „2.4“\n" -"anstelle des standardmäßigen Kernel „2.6“ installiert wird, um die 100%ige\n" +"anstelle des standardmäßigen Kernel „2.6“ installiert wird, um die 100%%ige\n" "Einhaltung der-LSB-Bedingungen zu garantieren. Allerdings erhalten Sie auch\n" -"ohne die Auswahl der „LSB“-Gruppe ein nahezu 100%ig LSB-konformes System.\n" +"ohne die Auswahl der „LSB“-Gruppe ein nahezu 100%%ig LSB-konformes System.\n" "\n" " * „%s“: Wenn Ihre Maschine ein Server werden soll, können Sie hier die\n" "wichtigsten Dienste auswählen, die auf Ihren Rechner installiert werden\n" @@ -762,7 +762,7 @@ msgid "" msgstr "" "Betätigen Sie die Schaltfläche „%s“, wenn Sie alle Partitionen und die\n" "darauf befindlichen Daten löschen wollen. Bedenken Sie, dass Sie nach\n" -"betätigen der Schaltfläche auch an die möglicherweise noch vorhandenen\n" +"betätigen der Schaltfläche „%s“ auch an die möglicherweise noch vorhandenen\n" "Windows-Daten nicht mehr gelangen werden!\n" "\n" "Wählen Sie „%s“, um die Aktion ohne Datenverlust abzubrechen." diff --git a/perl-install/share/po/help-es.pot b/perl-install/share/po/help-es.pot index 319a5d328..cdb49450d 100644 --- a/perl-install/share/po/help-es.pot +++ b/perl-install/share/po/help-es.pot @@ -562,9 +562,9 @@ msgid "" "Linux Standard Base specifications.\n" "\n" " Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" -"instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" "of the system. However, if you do not select the \"LSB\" group you will\n" -"still have a system which is nearly 100% LSB-compliant.\n" +"still have a system which is nearly 100%% LSB-compliant.\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" @@ -619,8 +619,8 @@ msgstr "" "\n" " Si selecciona el grupo \"LSB\" también se instalará la serie del núcleo\n" "\"2.4\", en vez de la serie predeterminada \"2.6\". Esto es para asegurar\n" -"una compatibilidad 100% con LSB del sistema. Sin embargo, si no selecciona\n" -"el grupo \"LSB\" todavía obtendrá un sistema que es casi 100% compatible\n" +"una compatibilidad 100%% con LSB del sistema. Sin embargo, si no selecciona\n" +"el grupo \"LSB\" todavía obtendrá un sistema que es casi 100%% compatible\n" "con LSB.\n" "\n" " * \"%s\": si pretende usar la máquina como un servidor, seleccione cuáles\n" @@ -963,8 +963,7 @@ msgid "" "by the entire system. Running the command as a regular user will only\n" "change the language settings for that particular user." msgstr "" -"El primer paso es elegir el idioma que prefiere. En el ejemplo se elige\n" -"\"%s\" como región y \"%s\" como idioma.\n" +"El primer paso es elegir el idioma que prefiere.\n" "\n" "Su elección de idioma preferido afectará al idioma del instalador, de la\n" "documentación, y del sistema en general. Seleccione primero la región en la\n" @@ -1353,8 +1352,8 @@ msgid "" msgstr "" "Antes de continuar, debería leer cuidadosamente los términos de la\n" "licencia. La misma cubre a toda la distribución Mandrakelinux. Si está de\n" -"acuerdo con todos los términos en la misma, marque la casilla \"%s\". Si\n" -"no, simplemente apague su computadora." +"acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n" +"Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora." # DO NOT BOTHER TO MODIFY HERE, SEE: # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml diff --git a/perl-install/share/po/help-fr.pot b/perl-install/share/po/help-fr.pot index b603336c3..591913853 100644 --- a/perl-install/share/po/help-fr.pot +++ b/perl-install/share/po/help-fr.pot @@ -550,9 +550,9 @@ msgid "" "Linux Standard Base specifications.\n" "\n" " Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" -"instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" "of the system. However, if you do not select the \"LSB\" group you will\n" -"still have a system which is nearly 100% LSB-compliant.\n" +"still have a system which is nearly 100%% LSB-compliant.\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" diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot index ec0561f03..dce759223 100644 --- a/perl-install/share/po/help-it.pot +++ b/perl-install/share/po/help-it.pot @@ -565,9 +565,9 @@ msgid "" "Linux Standard Base specifications.\n" "\n" " Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" -"instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" "of the system. However, if you do not select the \"LSB\" group you will\n" -"still have a system which is nearly 100% LSB-compliant.\n" +"still have a system which is nearly 100%% LSB-compliant.\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" @@ -626,7 +626,7 @@ msgstr "" "costituisce l'opzione predefinita. Questo è necessario per avere una\n" "completa conformità del sistema con le specifiche LSB. Si noti, tuttavia,\n" "che anche se scegliete di non selezionare il gruppo \"LSB\", il vostro\n" -"sistema sarà compatibile quasi al 100% con LSB.\n" +"sistema sarà compatibile quasi al 100%% con LSB.\n" "\n" " * \"%s\": qui potrete scegliere i servizi più comuni da installare se il\n" "computer dovrà essere usato come server.\n" diff --git a/perl-install/share/po/help-ru.pot b/perl-install/share/po/help-ru.pot index f320fcc6b..a9fa70a81 100644 --- a/perl-install/share/po/help-ru.pot +++ b/perl-install/share/po/help-ru.pot @@ -545,9 +545,9 @@ msgid "" "Linux Standard Base specifications.\n" "\n" " Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" -"instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" "of the system. However, if you do not select the \"LSB\" group you will\n" -"still have a system which is nearly 100% LSB-compliant.\n" +"still have a system which is nearly 100%% LSB-compliant.\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" @@ -607,7 +607,18 @@ msgstr "" "интерфейсе.\n" "\n" "При наведении курсора мыши на имя группы будет показываться короткое\n" -"пояснение к данной группе. Если вы не выберете ни одной группы в процессе\n" +"пояснение к данной группе.\n" +"\n" +"ы можете отметить пункт \"%s\", который очень полезен, если вы хорошо\n" +"знаете предлагаемые пакеты, или если вы хотите иметь полный контроль над\n" +"тем, что будет устанавливаться.\n" +"\n" +"Если вы начали инсталляцию в режиме \"%s\", вы можете убрать выбор всех\n" +"групп, чтобы предотвратить инсталляцию какого-либо нового пакета. Это\n" +"полезно в случае восстановления или обновления существующей системы." +"\n" +"\n" +"Если вы не выберете ни одной группы в процессе\n" "выполнения обычной инсталляции (не касается обновления), появится диалог с\n" "различными опциями для минимальной инсталляции:\n" "\n" @@ -619,15 +630,7 @@ msgstr "" "\n" " * \"%s\": будет установлен самый необходимый минимум пакетов для работы\n" "Linux системы. В это варианте вы сможете работать только в режиме командной\n" -"строки. Общий размер этой установки занимает 65 мегабайт.\n" -"\n" -"ы можете отметить пункт \"%s\", который очень полезен, если вы хорошо\n" -"знаете предлагаемые пакеты, или если вы хотите иметь полный контроль над\n" -"тем, что будет устанавливаться.\n" -"\n" -"Если вы начали инсталляцию в режиме \"%s\", вы можете убрать выбор всех\n" -"групп, чтобы предотвратить инсталляцию какого-либо нового пакета. Это\n" -"полезно в случае восстановления или обновления существующей системы." +"строки. Общий размер этой установки занимает 65 мегабайт." # DO NOT BOTHER TO MODIFY HERE, SEE: # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml diff --git a/perl-install/share/po/help-zh_CN.pot b/perl-install/share/po/help-zh_CN.pot index 83d00c7f6..a7d768fa7 100644 --- a/perl-install/share/po/help-zh_CN.pot +++ b/perl-install/share/po/help-zh_CN.pot @@ -77,7 +77,6 @@ msgid "" "here. If you notice the sound card isn't the one actually present on your\n" "system, you can click on the button and choose a different driver." msgstr "" -"\n" "\"%s\"：如果在您的系统中检测到了声卡，则会在此处显示。如果您发现在此显示的声卡与您系统中实际安装的声卡并不相同，您可以单击该按钮选择不同的驱动程序。" # DO NOT BOTHER TO MODIFY HERE, SEE: @@ -202,7 +201,6 @@ msgid "" "information on how to set up a new printer. The interface presented in our\n" "manual is similar to the one used during installation." msgstr "" -"\n" "\"%s\"：单击\"%s\"按钮将打开打印机配置向导。请参看``初学者指南''中的相应章节，其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相同。" # DO NOT BOTHER TO MODIFY HERE, SEE: @@ -765,9 +763,9 @@ msgid "" "Linux Standard Base specifications.\n" "\n" " Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n" -"instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance\n" +"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n" "of the system. However, if you do not select the \"LSB\" group you will\n" -"still have a system which is nearly 100% LSB-compliant.\n" +"still have a system which is nearly 100%% LSB-compliant.\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" @@ -990,7 +988,6 @@ msgid "" "click on the \"%s\" button and choose another. If your country isn't in the\n" "list shown, click on the \"%s\" button to get the complete country list." msgstr "" -"\n" "\"%s\"：检查当前的国家选择。如果您并非在这个国家，请单击\"%s\"按钮，并选择另外的选项。如果您的国家在第一个列表中并没有显示出来，单击\"%s\"按钮可获得完整的国家列表。" # DO NOT BOTHER TO MODIFY HERE, SEE: @@ -1067,7 +1064,6 @@ msgid "" "another installation. See the second tip of the last step on how to create\n" "such a floppy." msgstr "" -"\n" "如果您选中了想要选择单个软件包，安装程序会显示出一个软件包的树形结构，其中会按照组和子组分类显示全部软件包。浏览软件包树时，您可以选择整个组，子组或单个软件包。\n" "\n" "只要您在左侧的树中选择了软件包，右侧就会出现该软件包用途的描述。\n" -- cgit v1.2.1