diff options
| -rw-r--r-- | perl-install/common.pm | 18 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/share/po/DrakX.pot | 604 |
4 files changed, 343 insertions, 289 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm index 481ce793f..aab938f2f 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int @ISA = qw(Exporter); %EXPORT_TAGS = ( - common => [ qw(__ even odd min max sqr sum sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ], + common => [ qw(__ even odd min max sqr sum sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines) ], functional => [ qw(fold_left compose map_index grep_index map_each grep_each map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ], file => [ qw(dirname basename touch all glob_ cat_ symlinkf chop_ mode typeFromMagic) ], system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ crypt_ getVarsFromSh setVarsInSh) ], @@ -282,6 +282,22 @@ sub formatAlaTeX($) { $t . ($t && $tmp && "\n") . $tmp; } +sub formatLines($) { + my ($t, $tmp); + foreach (split "\n", $_[0]) { + if (/^$/) { + $t .= "$tmp\n"; + $tmp = ""; + } elsif (/^\s/) { + $t .= "$tmp\n"; + $tmp = $_; + } else { + $tmp = ($tmp ? "$tmp " : ($t && "\n") . $tmp) . $_; + } + } + "$t$tmp\n"; +} + sub getVarsFromSh($) { my %l; local *F; diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e789293b6..69c50eff3 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -121,7 +121,7 @@ $o = $::o = { autoSCSI => 0, mkbootdisk => 1, #- no mkbootdisk if 0 or undef, find a floppy with 1 #- packages => [ qw() ], - partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0, readonly => 1 }, + partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0, readonly => 0 }, #- partitions => [ #- { mntpoint => "/boot", size => 16 << 11, type => 0x83 }, #- { mntpoint => "/", size => 256 << 11, type => 0x83 }, diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 98b7df3e5..c8eee3ac3 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -576,10 +576,10 @@ failures. Would you like to create a bootdisk for your system?"), $o->{mkbootdis } else { @l or die _("Sorry, no floppy drive available"); - $o->{mkbootdisk} = $o->ask_from_list('', - _("Choose the floppy drive you want to use to make the bootdisk"), - [ @l, "Cancel" ], $o->{mkbootdisk}); - return if $o->{mkbootdisk} eq "Cancel"; + $o->{mkbootdisk} = $o->ask_from_list_('', + _("Choose the floppy drive you want to use to make the bootdisk"), + [ @l, 'Cancel' ], $o->{mkbootdisk}); + return if $o->{mkbootdisk} eq 'Cancel'; } $o->ask_warn('', _("Insert a floppy in drive %s", $o->{mkbootdisk})); diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 128f5be13..4bbd6cb21 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: 1999-10-18 00:22+0200\n" +"POT-Creation-Date: 1999-10-21 00:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -87,7 +87,7 @@ msgstr "" msgid "(leaving in %d seconds)" msgstr "" -#: ../Xconfigurator.pm_.c:316 ../my_gtk.pm_.c:348 +#: ../Xconfigurator.pm_.c:316 ../my_gtk.pm_.c:423 msgid "Is this correct?" msgstr "" @@ -106,8 +106,8 @@ msgid "" "You can switch if off if you want, you'll hear a beep when it's over" msgstr "" -#: ../Xconfigurator.pm_.c:380 ../install_steps_interactive.pm_.c:449 -#: ../install_steps_interactive.pm_.c:450 +#: ../Xconfigurator.pm_.c:380 ../install_steps_interactive.pm_.c:450 +#: ../install_steps_interactive.pm_.c:451 msgid "Resolution" msgstr "" @@ -346,15 +346,15 @@ msgstr "" msgid "Format" msgstr "" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:378 +#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:380 msgid "Move" msgstr "" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:436 +#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:438 msgid "Resize" msgstr "" -#: ../diskdrake.pm_.c:17 +#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:329 msgid "Type" msgstr "" @@ -390,8 +390,8 @@ msgstr "" msgid "Save on floppy" msgstr "" -#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:532 -#: ../install_steps_interactive.pm_.c:641 +#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:533 +#: ../install_steps_interactive.pm_.c:642 msgid "Done" msgstr "" @@ -466,7 +466,7 @@ msgstr "" msgid "After %s partition %s," msgstr "" -#: ../diskdrake.pm_.c:122 ../diskdrake.pm_.c:369 ../diskdrake.pm_.c:396 +#: ../diskdrake.pm_.c:122 ../diskdrake.pm_.c:371 ../diskdrake.pm_.c:398 msgid "Read carefully!" msgstr "" @@ -475,11 +475,11 @@ msgid "all data on this partition will be lost" msgstr "" #: ../diskdrake.pm_.c:140 ../install_any.pm_.c:177 ../install_steps.pm_.c:67 -#: ../install_steps_interactive.pm_.c:37 +#: ../install_steps_interactive.pm_.c:38 msgid "Error" msgstr "" -#: ../diskdrake.pm_.c:161 ../diskdrake.pm_.c:513 +#: ../diskdrake.pm_.c:161 ../diskdrake.pm_.c:515 msgid "Mount point: " msgstr "" @@ -584,125 +584,125 @@ msgstr "" msgid "changing type of" msgstr "" -#: ../diskdrake.pm_.c:326 +#: ../diskdrake.pm_.c:327 msgid "Change partition type" msgstr "" -#: ../diskdrake.pm_.c:327 +#: ../diskdrake.pm_.c:328 msgid "Which partition type do you want?" msgstr "" -#: ../diskdrake.pm_.c:341 +#: ../diskdrake.pm_.c:343 #, c-format msgid "Where do you want to mount device %s?" msgstr "" -#: ../diskdrake.pm_.c:342 +#: ../diskdrake.pm_.c:344 msgid "Mount point" msgstr "" -#: ../diskdrake.pm_.c:363 +#: ../diskdrake.pm_.c:365 msgid "formatting" msgstr "" -#: ../diskdrake.pm_.c:369 +#: ../diskdrake.pm_.c:371 msgid "After formatting all partitions," msgstr "" -#: ../diskdrake.pm_.c:369 +#: ../diskdrake.pm_.c:371 msgid "all data on these partitions will be lost" msgstr "" -#: ../diskdrake.pm_.c:379 +#: ../diskdrake.pm_.c:381 msgid "Which disk do you want to move to?" msgstr "" -#: ../diskdrake.pm_.c:383 +#: ../diskdrake.pm_.c:385 msgid "Sector" msgstr "" -#: ../diskdrake.pm_.c:384 +#: ../diskdrake.pm_.c:386 msgid "Which sector do you want to move to?" msgstr "" -#: ../diskdrake.pm_.c:387 +#: ../diskdrake.pm_.c:389 msgid "Moving" msgstr "" -#: ../diskdrake.pm_.c:387 +#: ../diskdrake.pm_.c:389 msgid "Moving partition..." msgstr "" -#: ../diskdrake.pm_.c:396 +#: ../diskdrake.pm_.c:398 #, c-format msgid "Partition table of drive %s is going to be written to disk!" msgstr "" -#: ../diskdrake.pm_.c:398 +#: ../diskdrake.pm_.c:400 msgid "You'll need to reboot before the modification can take place" msgstr "" -#: ../diskdrake.pm_.c:419 +#: ../diskdrake.pm_.c:421 msgid "Computing fat filesystem bounds" msgstr "" -#: ../diskdrake.pm_.c:419 ../diskdrake.pm_.c:464 +#: ../diskdrake.pm_.c:421 ../diskdrake.pm_.c:466 msgid "Resizing" msgstr "" -#: ../diskdrake.pm_.c:433 +#: ../diskdrake.pm_.c:435 msgid "resizing" msgstr "" -#: ../diskdrake.pm_.c:443 +#: ../diskdrake.pm_.c:445 msgid "Choose the new size" msgstr "" -#: ../diskdrake.pm_.c:443 ../install_steps_graphical.pm_.c:304 +#: ../diskdrake.pm_.c:445 ../install_steps_graphical.pm_.c:301 msgid "MB" msgstr "" -#: ../diskdrake.pm_.c:490 +#: ../diskdrake.pm_.c:492 msgid "Create a new partition" msgstr "" -#: ../diskdrake.pm_.c:506 +#: ../diskdrake.pm_.c:508 msgid "Start sector: " msgstr "" -#: ../diskdrake.pm_.c:509 +#: ../diskdrake.pm_.c:511 msgid "Size in MB: " msgstr "" -#: ../diskdrake.pm_.c:512 +#: ../diskdrake.pm_.c:514 msgid "Filesystem type: " msgstr "" -#: ../diskdrake.pm_.c:514 +#: ../diskdrake.pm_.c:516 msgid "Preference: " msgstr "" -#: ../diskdrake.pm_.c:556 ../diskdrake.pm_.c:572 +#: ../diskdrake.pm_.c:559 ../diskdrake.pm_.c:575 msgid "Select file" msgstr "" -#: ../diskdrake.pm_.c:565 +#: ../diskdrake.pm_.c:568 msgid "" "The backup partition table has not the same size\n" "Still continue?" msgstr "" -#: ../diskdrake.pm_.c:573 +#: ../diskdrake.pm_.c:576 msgid "Warning" msgstr "" -#: ../diskdrake.pm_.c:574 +#: ../diskdrake.pm_.c:577 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" msgstr "" -#: ../diskdrake.pm_.c:588 +#: ../diskdrake.pm_.c:591 msgid "Trying to rescue partition table" msgstr "" @@ -738,30 +738,30 @@ msgstr "" msgid "There is already a partition with mount point %s" msgstr "" -#: ../fsedit.pm_.c:294 +#: ../fsedit.pm_.c:295 #, c-format msgid "Error opening %s for writing: %s" msgstr "" -#: ../fsedit.pm_.c:363 +#: ../fsedit.pm_.c:367 msgid "" "An error has occurred - no valid devices were found on which to create new " "filesystems. Please check your hardware for the cause of this problem" msgstr "" -#: ../fsedit.pm_.c:378 +#: ../fsedit.pm_.c:382 msgid "You don't have any partitions!" msgstr "" -#: ../help.pm_.c:7 ../help.pm_.c:238 +#: ../help.pm_.c:7 ../help.pm_.c:235 msgid "Choose preferred language for install and system usage." msgstr "" -#: ../help.pm_.c:10 ../help.pm_.c:241 +#: ../help.pm_.c:10 ../help.pm_.c:238 msgid "Choose the layout corresponding to your keyboard from the list above" msgstr "" -#: ../help.pm_.c:13 ../help.pm_.c:244 +#: ../help.pm_.c:13 ../help.pm_.c:241 msgid "" "Choose \"Installation\" if there are no previous versions of Linux\n" "installed, or if you wish use to multiple distributions or versions.\n" @@ -771,27 +771,24 @@ msgid "" "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)." msgstr "" -#: ../help.pm_.c:21 ../help.pm_.c:252 +#: ../help.pm_.c:21 msgid "" "Select:\n" "\n" -" - Beginner: If you have never installed Linux before, and wish to\n" -"install the distribution elected \"Product of the year\" for 1999,\n" -"click here.\n" +" - Beginner: If you have never installed Linux before, click here.\n" "\n" " - Developer: If you are familiar with Linux and will be using the\n" "computer primarily for software development, you will find happiness\n" "here.\n" "\n" -" - Server: If you wish to install a general purpose server, or the\n" -"Linux distribution elected \"Distribution/Server\" for 1999, select\n" -"this.\n" +" - Server: If you wish to install a general purpose server (for mail,\n" +"printing...), select this.\n" "\n" " - Expert: If you are fluent with GNU/Linux and want to perform\n" "a highly customized installation, this Install Class is for you." msgstr "" -#: ../help.pm_.c:39 ../help.pm_.c:270 +#: ../help.pm_.c:36 msgid "" "DrakX will attempt at first to look for one or more PCI\n" "SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n" @@ -809,12 +806,12 @@ msgid "" "probe for the hardware: it usually works fine.\n" "\n" "If not, do not forget the information on your hardware that you\n" -"could get from Windows (if you have it on your system), as\n" -"suggested by the installation guide. These are the options\n" -"you will need to provide to the driver." +"could get from your documentation or from Windows (if you have it\n" +"on your system), as suggested by the installation guide. These\n" +"are the options you will need to provide to the driver." msgstr "" -#: ../help.pm_.c:60 ../help.pm_.c:291 +#: ../help.pm_.c:57 ../help.pm_.c:288 msgid "" "At this point, hard drive partitions must be defined. (Unless you\n" "are overwriting a previous install of Linux and have already defined\n" @@ -835,7 +832,7 @@ msgid "" "and take your time before proceeding." msgstr "" -#: ../help.pm_.c:79 ../help.pm_.c:310 +#: ../help.pm_.c:76 ../help.pm_.c:307 msgid "" "Any partitions that have been newly defined must be formatted for\n" "use (formatting meaning creating a filesystem). At this time, you may\n" @@ -845,7 +842,7 @@ msgid "" "Typically retained are /home and /usr/local." msgstr "" -#: ../help.pm_.c:87 ../help.pm_.c:318 +#: ../help.pm_.c:84 ../help.pm_.c:315 msgid "" "You may now select the packages you wish to install.\n" "\n" @@ -862,13 +859,13 @@ msgid "" "buttons \"Go\", \"Select more/less\" and \"Show more/less\"." msgstr "" -#: ../help.pm_.c:102 ../help.pm_.c:333 +#: ../help.pm_.c:99 ../help.pm_.c:330 msgid "" "The packages selected are now being installed. This operation\n" "should only take a few minutes." msgstr "" -#: ../help.pm_.c:106 ../help.pm_.c:337 +#: ../help.pm_.c:103 ../help.pm_.c:334 msgid "" "If DrakX failed to find your mouse, or if you want to\n" "check what it has done, you will be presented the list of mice\n" @@ -884,7 +881,7 @@ msgid "" "which serial port it is connected to." msgstr "" -#: ../help.pm_.c:120 ../help.pm_.c:351 +#: ../help.pm_.c:117 ../help.pm_.c:348 msgid "" "This section is dedicated to configuring a local area network,\n" "or LAN. If you answer \"Yes\" here, DrakX will try to find an\n" @@ -908,12 +905,12 @@ msgid "" "addresses " msgstr "" -#: ../help.pm_.c:142 ../help.pm_.c:145 ../help.pm_.c:232 ../help.pm_.c:373 -#: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65 +#: ../help.pm_.c:139 ../help.pm_.c:142 ../help.pm_.c:229 ../help.pm_.c:370 +#: ../help.pm_.c:373 ../help.pm_.c:460 ../install2.pm_.c:65 msgid "Help" msgstr "" -#: ../help.pm_.c:148 +#: ../help.pm_.c:145 msgid "" "Linux can deal with many types of printer. Each of these\n" "types require a different setup.\n" @@ -938,7 +935,7 @@ msgid "" "for a NetWare printer, except that you need no workgroup information." msgstr "" -#: ../help.pm_.c:171 ../help.pm_.c:402 +#: ../help.pm_.c:168 ../help.pm_.c:399 msgid "" "You must now enter the root password for your Linux-Mandrake\n" "system. The password must be entered twice to verify that both\n" @@ -956,7 +953,7 @@ msgid "" "effort." msgstr "" -#: ../help.pm_.c:187 ../help.pm_.c:418 +#: ../help.pm_.c:184 ../help.pm_.c:415 msgid "" "You may now create one or more \"regular\" user account(s), as\n" "opposed to the \"priviledged\" user account, root. You can create\n" @@ -980,7 +977,7 @@ msgid "" "and maintenance purposes." msgstr "" -#: ../help.pm_.c:206 ../help.pm_.c:437 +#: ../help.pm_.c:203 ../help.pm_.c:434 msgid "" "Please, please, answer \"Yes\" here! Just for example, when you\n" "reinstall Windows, it will overwrite the boot sector. Unless you have\n" @@ -988,7 +985,7 @@ msgid "" "any more!" msgstr "" -#: ../help.pm_.c:212 ../help.pm_.c:443 +#: ../help.pm_.c:209 ../help.pm_.c:440 msgid "" "You need to indicate where you wish\n" "to place the information required to boot to Linux.\n" @@ -998,7 +995,7 @@ msgid "" "drive (MBR)\"." msgstr "" -#: ../help.pm_.c:220 ../help.pm_.c:451 +#: ../help.pm_.c:217 ../help.pm_.c:448 msgid "" "Now it's time to configure the X Window System, which is the\n" "core of the Linux GUI (Graphical User Interface). For this purpose,\n" @@ -1012,7 +1009,50 @@ msgid "" "change them, as many times as necessary." msgstr "" -#: ../help.pm_.c:379 +#: ../help.pm_.c:249 +msgid "" +"Select:\n" +"\n" +" - Beginner: If you have never installed Linux before, and wish to\n" +"install the distribution elected \"Product of the year\" for 1999,\n" +"click here.\n" +"\n" +" - Developer: If you are familiar with Linux and will be using the\n" +"computer primarily for software development, you will find happiness\n" +"here.\n" +"\n" +" - Server: If you wish to install a general purpose server, or the\n" +"Linux distribution elected \"Distribution/Server\" for 1999, select\n" +"this.\n" +"\n" +" - Expert: If you are fluent with GNU/Linux and want to perform\n" +"a highly customized installation, this Install Class is for you." +msgstr "" + +#: ../help.pm_.c:267 +msgid "" +"DrakX will attempt at first to look for one or more PCI\n" +"SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n" +"to use, it will insert it (them) automatically.\n" +"\n" +"If your SCSI adapter is ISA, or is PCI but DrakX doesn't know\n" +"which driver to use for this card, or if you have no SCSI adapters\n" +"at all, you will then be prompted on whether you have one or not.\n" +"If you have none, answer \"No\". If you have one or more, answer\n" +"\"Yes\". A list of drivers will then pop up, from which you will\n" +"have to select one.\n" +"\n" +"After you have selected the driver, DrakX will ask if you\n" +"want to specify options for it. First, try and let the driver\n" +"probe for the hardware: it usually works fine.\n" +"\n" +"If not, do not forget the information on your hardware that you\n" +"could get from you documentation or from Windows (if you have\n" +"it on your system), as suggested by the installation guide.\n" +"These are the options you will need to provide to the driver." +msgstr "" + +#: ../help.pm_.c:376 msgid "" "Linux can deal with many types of printer. Each of these\n" "types require a different setup.\n" @@ -1089,8 +1129,8 @@ msgstr "" msgid "Configure printer" msgstr "" -#: ../install2.pm_.c:53 ../install_steps_interactive.pm_.c:507 -#: ../install_steps_interactive.pm_.c:508 +#: ../install2.pm_.c:53 ../install_steps_interactive.pm_.c:508 +#: ../install_steps_interactive.pm_.c:509 msgid "Set root password" msgstr "" @@ -1134,11 +1174,11 @@ msgstr "" msgid "Partitioning failed: no root filesystem" msgstr "" -#: ../install2.pm_.c:460 +#: ../install2.pm_.c:474 msgid "Error reading file $f" msgstr "" -#: ../install2.pm_.c:465 +#: ../install2.pm_.c:479 #, c-format msgid "Bad kickstart file %s (failed %s)" msgstr "" @@ -1190,266 +1230,259 @@ msgstr "" #: ../install_steps_graphical.pm_.c:259 msgid "" "You don't have a swap partition\n" +"\n" "Continue anyway?" msgstr "" -#: ../install_steps_graphical.pm_.c:304 +#: ../install_steps_graphical.pm_.c:301 msgid "Total size: " msgstr "" -#: ../install_steps_graphical.pm_.c:315 +#: ../install_steps_graphical.pm_.c:313 #, c-format msgid "Version: %s\n" msgstr "" -#: ../install_steps_graphical.pm_.c:316 +#: ../install_steps_graphical.pm_.c:314 #, c-format msgid "Size: %d KB\n" msgstr "" -#: ../install_steps_graphical.pm_.c:317 +#: ../install_steps_graphical.pm_.c:315 #, c-format msgid "" "Summary: %s\n" "\n" msgstr "" -#: ../install_steps_graphical.pm_.c:433 +#: ../install_steps_graphical.pm_.c:426 msgid "Choose the packages you want to install" msgstr "" -#: ../install_steps_graphical.pm_.c:436 +#: ../install_steps_graphical.pm_.c:429 msgid "Info" msgstr "" -#: ../install_steps_graphical.pm_.c:444 +#: ../install_steps_graphical.pm_.c:437 msgid "Go" msgstr "" -#: ../install_steps_graphical.pm_.c:445 +#: ../install_steps_graphical.pm_.c:438 msgid "Select less" msgstr "" -#: ../install_steps_graphical.pm_.c:446 +#: ../install_steps_graphical.pm_.c:439 msgid "Select more" msgstr "" -#: ../install_steps_graphical.pm_.c:447 +#: ../install_steps_graphical.pm_.c:440 msgid "Show less" msgstr "" -#: ../install_steps_graphical.pm_.c:448 +#: ../install_steps_graphical.pm_.c:441 msgid "Show more" msgstr "" -#: ../install_steps_graphical.pm_.c:465 +#: ../install_steps_graphical.pm_.c:458 msgid "Installing" msgstr "" -#: ../install_steps_graphical.pm_.c:471 +#: ../install_steps_graphical.pm_.c:464 msgid "Please wait, " msgstr "" -#: ../install_steps_graphical.pm_.c:473 +#: ../install_steps_graphical.pm_.c:466 msgid "Time remaining " msgstr "" -#: ../install_steps_graphical.pm_.c:474 +#: ../install_steps_graphical.pm_.c:467 msgid "Total time " msgstr "" -#: ../install_steps_graphical.pm_.c:479 +#: ../install_steps_graphical.pm_.c:472 msgid "Preparing installation" msgstr "" -#: ../install_steps_graphical.pm_.c:500 +#: ../install_steps_graphical.pm_.c:493 #, c-format msgid "Installing package %s" msgstr "" -#: ../install_steps_graphical.pm_.c:525 +#: ../install_steps_graphical.pm_.c:518 msgid "Go on anyway?" msgstr "" -#: ../install_steps_graphical.pm_.c:525 +#: ../install_steps_graphical.pm_.c:518 msgid "There was an error ordering packages:" msgstr "" -#: ../install_steps_graphical.pm_.c:549 +#: ../install_steps_graphical.pm_.c:542 msgid "Use existing configuration for X11?" msgstr "" -#: ../install_steps_graphical.pm_.c:623 ../interactive.pm_.c:47 -#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:348 -#: ../my_gtk.pm_.c:438 +#: ../install_steps_graphical.pm_.c:616 ../interactive.pm_.c:47 +#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:423 +#: ../my_gtk.pm_.c:513 msgid "Ok" msgstr "" -#: ../install_steps_interactive.pm_.c:37 +#: ../install_steps_interactive.pm_.c:38 msgid "An error occurred" msgstr "" -#: ../install_steps_interactive.pm_.c:53 +#: ../install_steps_interactive.pm_.c:54 msgid "Which language do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:61 -msgid "Accept" -msgstr "" - -#: ../install_steps_interactive.pm_.c:61 -msgid "Refuse" -msgstr "" - -#: ../install_steps_interactive.pm_.c:68 +#: ../install_steps_interactive.pm_.c:69 msgid "What is your keyboard layout?" msgstr "" -#: ../install_steps_interactive.pm_.c:78 +#: ../install_steps_interactive.pm_.c:79 msgid "Install/Upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:79 +#: ../install_steps_interactive.pm_.c:80 msgid "Is this an install or an upgrade?" msgstr "" -#: ../install_steps_interactive.pm_.c:80 +#: ../install_steps_interactive.pm_.c:81 msgid "Install" msgstr "" -#: ../install_steps_interactive.pm_.c:80 +#: ../install_steps_interactive.pm_.c:81 msgid "Upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:88 +#: ../install_steps_interactive.pm_.c:89 msgid "Root Partition" msgstr "" -#: ../install_steps_interactive.pm_.c:89 +#: ../install_steps_interactive.pm_.c:90 msgid "What is the root partition (/) of your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:98 +#: ../install_steps_interactive.pm_.c:99 msgid "Install Class" msgstr "" -#: ../install_steps_interactive.pm_.c:99 +#: ../install_steps_interactive.pm_.c:100 msgid "What installation class do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:111 +#: ../install_steps_interactive.pm_.c:112 msgid "What is the type of your mouse?" msgstr "" -#: ../install_steps_interactive.pm_.c:115 +#: ../install_steps_interactive.pm_.c:116 msgid "Emulate third button?" msgstr "" -#: ../install_steps_interactive.pm_.c:118 +#: ../install_steps_interactive.pm_.c:119 msgid "Mouse Port" msgstr "" -#: ../install_steps_interactive.pm_.c:119 +#: ../install_steps_interactive.pm_.c:120 msgid "Which serial port is your mouse connected to?" msgstr "" -#: ../install_steps_interactive.pm_.c:132 +#: ../install_steps_interactive.pm_.c:133 msgid "no available partitions" msgstr "" -#: ../install_steps_interactive.pm_.c:134 +#: ../install_steps_interactive.pm_.c:135 #, c-format msgid "(%dMb)" msgstr "" -#: ../install_steps_interactive.pm_.c:141 +#: ../install_steps_interactive.pm_.c:142 msgid "Which partition do you want to use as your root partition" msgstr "" -#: ../install_steps_interactive.pm_.c:148 +#: ../install_steps_interactive.pm_.c:149 msgid "Choose the mount points" msgstr "" -#: ../install_steps_interactive.pm_.c:160 +#: ../install_steps_interactive.pm_.c:161 msgid "You need to reboot for the partition table modifications to take place" msgstr "" -#: ../install_steps_interactive.pm_.c:176 +#: ../install_steps_interactive.pm_.c:177 msgid "Choose the partitions you want to format" msgstr "" -#: ../install_steps_interactive.pm_.c:186 +#: ../install_steps_interactive.pm_.c:187 #, c-format msgid "Formatting partition %s" msgstr "" -#: ../install_steps_interactive.pm_.c:194 +#: ../install_steps_interactive.pm_.c:195 msgid "Looking for available packages" msgstr "" -#: ../install_steps_interactive.pm_.c:200 +#: ../install_steps_interactive.pm_.c:201 msgid "Finding packages to upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:210 +#: ../install_steps_interactive.pm_.c:211 msgid "Keep the current IP configuration" msgstr "" -#: ../install_steps_interactive.pm_.c:211 +#: ../install_steps_interactive.pm_.c:212 msgid "Reconfigure network now" msgstr "" -#: ../install_steps_interactive.pm_.c:212 +#: ../install_steps_interactive.pm_.c:213 msgid "Do not set up networking" msgstr "" -#: ../install_steps_interactive.pm_.c:214 -#: ../install_steps_interactive.pm_.c:220 +#: ../install_steps_interactive.pm_.c:215 +#: ../install_steps_interactive.pm_.c:221 msgid "Network Configuration" msgstr "" -#: ../install_steps_interactive.pm_.c:215 +#: ../install_steps_interactive.pm_.c:216 msgid "Local networking has already been configured. Do you want to:" msgstr "" -#: ../install_steps_interactive.pm_.c:221 +#: ../install_steps_interactive.pm_.c:222 msgid "Do you want to configure LAN (not dialup) networking for your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:228 +#: ../install_steps_interactive.pm_.c:229 msgid "no network card found" msgstr "" -#: ../install_steps_interactive.pm_.c:255 +#: ../install_steps_interactive.pm_.c:256 #, c-format msgid "Configuring network device %s" msgstr "" -#: ../install_steps_interactive.pm_.c:256 +#: ../install_steps_interactive.pm_.c:257 msgid "" "Please enter the IP configuration for this machine.\n" "Each item should be entered as an IP address in dotted-decimal\n" "notation (for example, 1.2.3.4)." msgstr "" -#: ../install_steps_interactive.pm_.c:259 +#: ../install_steps_interactive.pm_.c:260 msgid "IP address:" msgstr "" -#: ../install_steps_interactive.pm_.c:259 +#: ../install_steps_interactive.pm_.c:260 msgid "Netmask:" msgstr "" -#: ../install_steps_interactive.pm_.c:264 -#: ../install_steps_interactive.pm_.c:403 +#: ../install_steps_interactive.pm_.c:265 +#: ../install_steps_interactive.pm_.c:404 msgid "IP address should be in format 1.2.3.4" msgstr "" -#: ../install_steps_interactive.pm_.c:282 +#: ../install_steps_interactive.pm_.c:283 msgid "Configuring network" msgstr "" -#: ../install_steps_interactive.pm_.c:283 +#: ../install_steps_interactive.pm_.c:284 msgid "" "Please enter your host name.\n" "Your host name should be a fully-qualified host name,\n" @@ -1457,116 +1490,116 @@ msgid "" "You may also enter the IP address of the gateway if you have one" msgstr "" -#: ../install_steps_interactive.pm_.c:287 +#: ../install_steps_interactive.pm_.c:288 msgid "DNS server:" msgstr "" -#: ../install_steps_interactive.pm_.c:287 +#: ../install_steps_interactive.pm_.c:288 msgid "Gateway device:" msgstr "" -#: ../install_steps_interactive.pm_.c:287 +#: ../install_steps_interactive.pm_.c:288 msgid "Gateway:" msgstr "" -#: ../install_steps_interactive.pm_.c:287 +#: ../install_steps_interactive.pm_.c:288 msgid "Host name:" msgstr "" -#: ../install_steps_interactive.pm_.c:297 +#: ../install_steps_interactive.pm_.c:298 msgid "Is your hardware clock set to GMT?" msgstr "" -#: ../install_steps_interactive.pm_.c:299 +#: ../install_steps_interactive.pm_.c:300 msgid "Which is your timezone?" msgstr "" -#: ../install_steps_interactive.pm_.c:309 +#: ../install_steps_interactive.pm_.c:310 msgid "Printer" msgstr "" -#: ../install_steps_interactive.pm_.c:310 +#: ../install_steps_interactive.pm_.c:311 msgid "Would you like to configure a printer?" msgstr "" -#: ../install_steps_interactive.pm_.c:326 +#: ../install_steps_interactive.pm_.c:327 msgid "Local Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:327 +#: ../install_steps_interactive.pm_.c:328 msgid "" "Every print queue (which print jobs are directed to) needs a\n" "name (often lp) and a spool directory associated with it. What\n" "name and directory should be used for this queue?" msgstr "" -#: ../install_steps_interactive.pm_.c:330 +#: ../install_steps_interactive.pm_.c:331 msgid "Name of queue:" msgstr "" -#: ../install_steps_interactive.pm_.c:330 +#: ../install_steps_interactive.pm_.c:331 msgid "Spool directory:" msgstr "" -#: ../install_steps_interactive.pm_.c:341 +#: ../install_steps_interactive.pm_.c:342 msgid "Select Printer Connection" msgstr "" -#: ../install_steps_interactive.pm_.c:342 +#: ../install_steps_interactive.pm_.c:343 msgid "How is the printer connected?" msgstr "" -#: ../install_steps_interactive.pm_.c:350 +#: ../install_steps_interactive.pm_.c:351 msgid "Detecting devices..." msgstr "" -#: ../install_steps_interactive.pm_.c:350 +#: ../install_steps_interactive.pm_.c:351 msgid "Test ports" msgstr "" -#: ../install_steps_interactive.pm_.c:363 +#: ../install_steps_interactive.pm_.c:364 #, c-format msgid "A printer, model \"%s\", has been detected on " msgstr "" -#: ../install_steps_interactive.pm_.c:370 +#: ../install_steps_interactive.pm_.c:371 msgid "Local Printer Device" msgstr "" -#: ../install_steps_interactive.pm_.c:371 +#: ../install_steps_interactive.pm_.c:372 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" msgstr "" -#: ../install_steps_interactive.pm_.c:372 +#: ../install_steps_interactive.pm_.c:373 msgid "Printer Device:" msgstr "" -#: ../install_steps_interactive.pm_.c:378 +#: ../install_steps_interactive.pm_.c:379 msgid "Remote lpd Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:379 +#: ../install_steps_interactive.pm_.c:380 msgid "" "To use a remote lpd print queue, you need to supply\n" "the hostname of the printer server and the queue name\n" "on that server which jobs should be placed in." msgstr "" -#: ../install_steps_interactive.pm_.c:382 +#: ../install_steps_interactive.pm_.c:383 msgid "Remote hostname:" msgstr "" -#: ../install_steps_interactive.pm_.c:382 -msgid "Remote queue:" +#: ../install_steps_interactive.pm_.c:383 +msgid "Remote queue" msgstr "" -#: ../install_steps_interactive.pm_.c:388 +#: ../install_steps_interactive.pm_.c:389 msgid "SMB (Windows 9x/NT) Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:389 +#: ../install_steps_interactive.pm_.c:390 msgid "" "To print to a SMB printer, you need to provide the\n" "SMB host name (Note! It may be different from its\n" @@ -1575,38 +1608,38 @@ msgid "" "applicable user name, password, and workgroup information." msgstr "" -#: ../install_steps_interactive.pm_.c:394 +#: ../install_steps_interactive.pm_.c:395 msgid "SMB server IP:" msgstr "" -#: ../install_steps_interactive.pm_.c:394 +#: ../install_steps_interactive.pm_.c:395 msgid "SMB server host:" msgstr "" -#: ../install_steps_interactive.pm_.c:395 -#: ../install_steps_interactive.pm_.c:417 -#: ../install_steps_interactive.pm_.c:509 +#: ../install_steps_interactive.pm_.c:396 +#: ../install_steps_interactive.pm_.c:418 +#: ../install_steps_interactive.pm_.c:510 msgid "Password:" msgstr "" -#: ../install_steps_interactive.pm_.c:395 +#: ../install_steps_interactive.pm_.c:396 msgid "Share name:" msgstr "" -#: ../install_steps_interactive.pm_.c:395 -#: ../install_steps_interactive.pm_.c:417 +#: ../install_steps_interactive.pm_.c:396 +#: ../install_steps_interactive.pm_.c:418 msgid "User name:" msgstr "" -#: ../install_steps_interactive.pm_.c:396 +#: ../install_steps_interactive.pm_.c:397 msgid "Workgroup:" msgstr "" -#: ../install_steps_interactive.pm_.c:411 +#: ../install_steps_interactive.pm_.c:412 msgid "NetWare Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:412 +#: ../install_steps_interactive.pm_.c:413 msgid "" "To print to a NetWare printer, you need to provide the\n" "NetWare print server name (Note! it may be different from its\n" @@ -1614,116 +1647,116 @@ msgid "" "wish to access and any applicable user name and password." msgstr "" -#: ../install_steps_interactive.pm_.c:416 +#: ../install_steps_interactive.pm_.c:417 msgid "Print Queue Name:" msgstr "" -#: ../install_steps_interactive.pm_.c:416 +#: ../install_steps_interactive.pm_.c:417 msgid "Printer Server:" msgstr "" -#: ../install_steps_interactive.pm_.c:427 +#: ../install_steps_interactive.pm_.c:428 msgid "Configure Printer" msgstr "" -#: ../install_steps_interactive.pm_.c:428 +#: ../install_steps_interactive.pm_.c:429 msgid "What type of printer do you have?" msgstr "" -#: ../install_steps_interactive.pm_.c:439 #: ../install_steps_interactive.pm_.c:440 +#: ../install_steps_interactive.pm_.c:441 msgid "Paper Size" msgstr "" -#: ../install_steps_interactive.pm_.c:459 +#: ../install_steps_interactive.pm_.c:460 msgid "CRLF" msgstr "" -#: ../install_steps_interactive.pm_.c:460 +#: ../install_steps_interactive.pm_.c:461 msgid "Fix stair-stepping text?" msgstr "" -#: ../install_steps_interactive.pm_.c:476 +#: ../install_steps_interactive.pm_.c:477 msgid "Configure Uniprint Driver" msgstr "" -#: ../install_steps_interactive.pm_.c:477 +#: ../install_steps_interactive.pm_.c:478 msgid "You may now set the Uniprint driver options for this printer." msgstr "" -#: ../install_steps_interactive.pm_.c:485 +#: ../install_steps_interactive.pm_.c:486 msgid "Configure Color Depth" msgstr "" -#: ../install_steps_interactive.pm_.c:486 +#: ../install_steps_interactive.pm_.c:487 msgid "You may now configure the color options for this printer." msgstr "" -#: ../install_steps_interactive.pm_.c:509 +#: ../install_steps_interactive.pm_.c:510 msgid "Password (again):" msgstr "" -#: ../install_steps_interactive.pm_.c:513 -#: ../install_steps_interactive.pm_.c:545 +#: ../install_steps_interactive.pm_.c:514 +#: ../install_steps_interactive.pm_.c:546 msgid "Please try again" msgstr "" -#: ../install_steps_interactive.pm_.c:513 -#: ../install_steps_interactive.pm_.c:545 +#: ../install_steps_interactive.pm_.c:514 +#: ../install_steps_interactive.pm_.c:546 msgid "The passwords do not match" msgstr "" -#: ../install_steps_interactive.pm_.c:514 +#: ../install_steps_interactive.pm_.c:515 msgid "This password is too simple" msgstr "" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:533 msgid "Add user" msgstr "" -#: ../install_steps_interactive.pm_.c:533 +#: ../install_steps_interactive.pm_.c:534 #, c-format msgid "(already added %s)" msgstr "" -#: ../install_steps_interactive.pm_.c:533 +#: ../install_steps_interactive.pm_.c:534 #, c-format msgid "" "Enter a user\n" "%s" msgstr "" -#: ../install_steps_interactive.pm_.c:534 -#: ../install_steps_interactive.pm_.c:619 +#: ../install_steps_interactive.pm_.c:535 +#: ../install_steps_interactive.pm_.c:620 msgid "Password" msgstr "" -#: ../install_steps_interactive.pm_.c:534 +#: ../install_steps_interactive.pm_.c:535 msgid "Password (again)" msgstr "" -#: ../install_steps_interactive.pm_.c:534 +#: ../install_steps_interactive.pm_.c:535 msgid "Real name" msgstr "" -#: ../install_steps_interactive.pm_.c:534 +#: ../install_steps_interactive.pm_.c:535 msgid "Shell" msgstr "" -#: ../install_steps_interactive.pm_.c:534 +#: ../install_steps_interactive.pm_.c:535 msgid "User name" msgstr "" -#: ../install_steps_interactive.pm_.c:547 +#: ../install_steps_interactive.pm_.c:548 msgid "Please give a user name" msgstr "" -#: ../install_steps_interactive.pm_.c:548 +#: ../install_steps_interactive.pm_.c:549 msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "" -#: ../install_steps_interactive.pm_.c:568 +#: ../install_steps_interactive.pm_.c:569 msgid "" "A custom bootdisk provides a way of booting into your Linux system without\n" "depending on the normal bootloader. This is useful if you don't want to " @@ -1737,150 +1770,151 @@ msgid "" "failures. Would you like to create a bootdisk for your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:576 +#: ../install_steps_interactive.pm_.c:577 msgid "Sorry, no floppy drive available" msgstr "" -#: ../install_steps_interactive.pm_.c:579 +#: ../install_steps_interactive.pm_.c:580 msgid "Choose the floppy drive you want to use to make the bootdisk" msgstr "" -#: ../install_steps_interactive.pm_.c:584 +#: ../install_steps_interactive.pm_.c:585 #, c-format msgid "Insert a floppy in drive %s" msgstr "" -#: ../install_steps_interactive.pm_.c:585 +#: ../install_steps_interactive.pm_.c:586 msgid "Creating bootdisk" msgstr "" -#: ../install_steps_interactive.pm_.c:592 +#: ../install_steps_interactive.pm_.c:593 msgid "Preparing bootloader" msgstr "" -#: ../install_steps_interactive.pm_.c:602 +#: ../install_steps_interactive.pm_.c:603 msgid "First sector of boot partition" msgstr "" -#: ../install_steps_interactive.pm_.c:602 +#: ../install_steps_interactive.pm_.c:603 msgid "First sector of drive (MBR)" msgstr "" -#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:608 msgid "LILO Installation" msgstr "" -#: ../install_steps_interactive.pm_.c:608 +#: ../install_steps_interactive.pm_.c:609 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../install_steps_interactive.pm_.c:611 +#: ../install_steps_interactive.pm_.c:612 msgid "Do you want to use LILO?" msgstr "" -#: ../install_steps_interactive.pm_.c:614 +#: ../install_steps_interactive.pm_.c:615 msgid "Boot device" msgstr "" -#: ../install_steps_interactive.pm_.c:615 +#: ../install_steps_interactive.pm_.c:616 msgid "Linear (needed for some SCSI drives)" msgstr "" -#: ../install_steps_interactive.pm_.c:615 +#: ../install_steps_interactive.pm_.c:616 msgid "linear" msgstr "" -#: ../install_steps_interactive.pm_.c:616 +#: ../install_steps_interactive.pm_.c:617 msgid "Compact" msgstr "" -#: ../install_steps_interactive.pm_.c:616 +#: ../install_steps_interactive.pm_.c:617 msgid "compact" msgstr "" -#: ../install_steps_interactive.pm_.c:617 +#: ../install_steps_interactive.pm_.c:618 msgid "Delay before booting default image" msgstr "" -#: ../install_steps_interactive.pm_.c:618 +#: ../install_steps_interactive.pm_.c:619 msgid "Video mode" msgstr "" -#: ../install_steps_interactive.pm_.c:620 +#: ../install_steps_interactive.pm_.c:621 msgid "Restrict command line options" msgstr "" -#: ../install_steps_interactive.pm_.c:620 +#: ../install_steps_interactive.pm_.c:621 msgid "restrict" msgstr "" -#: ../install_steps_interactive.pm_.c:626 +#: ../install_steps_interactive.pm_.c:627 msgid "LILO main options" msgstr "" -#: ../install_steps_interactive.pm_.c:630 +#: ../install_steps_interactive.pm_.c:631 msgid "" "Option ``Restrict command line options'' is of no use without a password" msgstr "" -#: ../install_steps_interactive.pm_.c:639 +#: ../install_steps_interactive.pm_.c:640 msgid "" "Here are the following entries in LILO.\n" "You can add some more or change the existent ones." msgstr "" -#: ../install_steps_interactive.pm_.c:641 +#: ../install_steps_interactive.pm_.c:642 msgid "Add" msgstr "" -#: ../install_steps_interactive.pm_.c:659 +#: ../install_steps_interactive.pm_.c:660 msgid "Image" msgstr "" -#: ../install_steps_interactive.pm_.c:660 -#: ../install_steps_interactive.pm_.c:668 +#: ../install_steps_interactive.pm_.c:661 +#: ../install_steps_interactive.pm_.c:669 msgid "Root" msgstr "" -#: ../install_steps_interactive.pm_.c:661 +#: ../install_steps_interactive.pm_.c:662 msgid "Append" msgstr "" -#: ../install_steps_interactive.pm_.c:662 +#: ../install_steps_interactive.pm_.c:663 msgid "Initrd" msgstr "" -#: ../install_steps_interactive.pm_.c:663 +#: ../install_steps_interactive.pm_.c:664 msgid "Read-write" msgstr "" -#: ../install_steps_interactive.pm_.c:669 +#: ../install_steps_interactive.pm_.c:670 msgid "Table" msgstr "" -#: ../install_steps_interactive.pm_.c:670 +#: ../install_steps_interactive.pm_.c:671 msgid "Unsafe" msgstr "" -#: ../install_steps_interactive.pm_.c:675 +#: ../install_steps_interactive.pm_.c:676 msgid "Label" msgstr "" -#: ../install_steps_interactive.pm_.c:677 +#: ../install_steps_interactive.pm_.c:678 msgid "Default" msgstr "" -#: ../install_steps_interactive.pm_.c:696 +#: ../install_steps_interactive.pm_.c:697 msgid "Installation of LILO failed. The following error occured:" msgstr "" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:708 msgid "" "Some steps are not completed.\n" +"\n" "Do you really want to quit now?" msgstr "" -#: ../install_steps_interactive.pm_.c:711 +#: ../install_steps_interactive.pm_.c:713 msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" @@ -1891,22 +1925,22 @@ msgid "" "install chapter of the Official Linux-Mandrake User's Guide." msgstr "" -#: ../install_steps_interactive.pm_.c:728 +#: ../install_steps_interactive.pm_.c:730 #, c-format msgid "Installing driver for %s card %s" msgstr "" -#: ../install_steps_interactive.pm_.c:729 +#: ../install_steps_interactive.pm_.c:731 #, c-format msgid "(module %s)" msgstr "" -#: ../install_steps_interactive.pm_.c:739 +#: ../install_steps_interactive.pm_.c:741 #, c-format msgid "What %s card do you have?" msgstr "" -#: ../install_steps_interactive.pm_.c:746 +#: ../install_steps_interactive.pm_.c:748 #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" @@ -1918,20 +1952,20 @@ msgid "" "not cause any damage." msgstr "" -#: ../install_steps_interactive.pm_.c:751 +#: ../install_steps_interactive.pm_.c:753 msgid "Autoprobe" msgstr "" -#: ../install_steps_interactive.pm_.c:751 +#: ../install_steps_interactive.pm_.c:753 msgid "Specify options" msgstr "" -#: ../install_steps_interactive.pm_.c:755 +#: ../install_steps_interactive.pm_.c:757 #, c-format msgid "You may now provide its options to module %s." msgstr "" -#: ../install_steps_interactive.pm_.c:761 +#: ../install_steps_interactive.pm_.c:763 #, c-format msgid "" "You may now provide its options to module %s.\n" @@ -1939,59 +1973,60 @@ msgid "" "For instance, ``io=0x300 irq=7''" msgstr "" -#: ../install_steps_interactive.pm_.c:764 +#: ../install_steps_interactive.pm_.c:766 msgid "Module options:" msgstr "" -#: ../install_steps_interactive.pm_.c:774 +#: ../install_steps_interactive.pm_.c:776 #, c-format msgid "" "Loading module %s failed.\n" "Do you want to try again with other parameters?" msgstr "" -#: ../install_steps_interactive.pm_.c:787 -msgid "Skip PCMCIA probing" +#: ../install_steps_interactive.pm_.c:789 +#, c-format +msgid "Skip %s PCMCIA probing" msgstr "" -#: ../install_steps_interactive.pm_.c:788 +#: ../install_steps_interactive.pm_.c:790 msgid "Configuring PCMCIA cards..." msgstr "" -#: ../install_steps_interactive.pm_.c:788 +#: ../install_steps_interactive.pm_.c:790 msgid "PCMCIA" msgstr "" -#: ../install_steps_interactive.pm_.c:795 +#: ../install_steps_interactive.pm_.c:797 #, c-format msgid "Skip %s PCI probing" msgstr "" -#: ../install_steps_interactive.pm_.c:799 +#: ../install_steps_interactive.pm_.c:801 #, c-format msgid "Found %s %s interfaces" msgstr "" -#: ../install_steps_interactive.pm_.c:800 +#: ../install_steps_interactive.pm_.c:802 msgid "Do you have another one?" msgstr "" -#: ../install_steps_interactive.pm_.c:801 +#: ../install_steps_interactive.pm_.c:803 #, c-format msgid "Do you have an %s interface?" msgstr "" -#: ../install_steps_interactive.pm_.c:803 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:347 +#: ../install_steps_interactive.pm_.c:805 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:422 msgid "No" msgstr "" -#: ../install_steps_interactive.pm_.c:803 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:347 +#: ../install_steps_interactive.pm_.c:805 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:422 msgid "Yes" msgstr "" -#: ../install_steps_interactive.pm_.c:804 +#: ../install_steps_interactive.pm_.c:806 msgid "See hardware info" msgstr "" @@ -2000,7 +2035,7 @@ msgstr "" msgid "Entering step `%s'\n" msgstr "" -#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:195 ../my_gtk.pm_.c:348 +#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:195 ../my_gtk.pm_.c:423 msgid "Cancel" msgstr "" @@ -2141,10 +2176,13 @@ msgstr "" msgid "US keyboard" msgstr "" -#: ../lilo.pm_.c:111 +#: ../lilo.pm_.c:113 msgid "" -"Welcome to LILO the operating system chooser!\n" -"To list the possible choices, press <TAB>\n" +"Welcome to LILO the famous operating system chooser!\n" +"\n" +"To list the possible choices, press <TAB>.\n" +"\n" +"To load one of them, write its name and press <ENTER>.\n" msgstr "" #: ../mouse.pm_.c:15 @@ -2263,28 +2301,28 @@ msgstr "" msgid "Logitech Bus Mouse" msgstr "" -#: ../partition_table.pm_.c:373 +#: ../partition_table.pm_.c:376 msgid "" "You have a hole in your partition table but I can't use it.\n" "The only solution is to move your primary partitions to have the hole next " "to the extended partitions" msgstr "" -#: ../partition_table.pm_.c:459 +#: ../partition_table.pm_.c:462 #, c-format msgid "Error reading file %s" msgstr "" -#: ../partition_table.pm_.c:466 +#: ../partition_table.pm_.c:469 #, c-format msgid "Restoring from file %s failed: %s" msgstr "" -#: ../partition_table.pm_.c:468 +#: ../partition_table.pm_.c:471 msgid "Bad backup file" msgstr "" -#: ../partition_table.pm_.c:488 +#: ../partition_table.pm_.c:491 #, c-format msgid "Error writing to file %s" msgstr "" |