diff options
author | Guillaume Cottenceau <gc@mandriva.com> | 2000-10-04 12:01:45 +0000 |
---|---|---|
committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-10-04 12:01:45 +0000 |
commit | b91b75b0616d816c3d5426d2fed53cf66d284e32 (patch) | |
tree | be53665abbd883e3917f0fd58fbb0a592553cf04 | |
parent | 8236221d8612f905d747e55a65d788a491eba9f4 (diff) | |
download | drakx-b91b75b0616d816c3d5426d2fed53cf66d284e32.tar drakx-b91b75b0616d816c3d5426d2fed53cf66d284e32.tar.gz drakx-b91b75b0616d816c3d5426d2fed53cf66d284e32.tar.bz2 drakx-b91b75b0616d816c3d5426d2fed53cf66d284e32.tar.xz drakx-b91b75b0616d816c3d5426d2fed53cf66d284e32.zip |
*** empty log message ***
-rw-r--r-- | perl-install/ChangeLog | 6 | ||||
-rw-r--r-- | perl-install/share/compssList | 4 | ||||
-rw-r--r-- | perl-install/share/po/DrakX.pot | 329 | ||||
-rwxr-xr-x | perl-install/standalone/drakgw | 35 |
4 files changed, 207 insertions, 167 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 4100c842e..a9d7488dd 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,9 @@ +2000-10-04 Guillaume Cottenceau <gc@mandrakesoft.com> + + * standalone/drakgw: fix some failing/untranslated i18n messages + + * share/po/fr.po: write translations according to drakgw + 2000-10-04 François Pons <fpons@mandrakesoft.com> * Xconfigurator.pm: removed bad card for 3D Rage Pro. diff --git a/perl-install/share/compssList b/perl-install/share/compssList index 686ad41ba..392db94bd 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -276,7 +276,7 @@ dhcp-client 0 79 5 dhcp-relay 0 10 0 dhcpcd 0 0 0 dhcpxd 0 0 0 -dia 15 0 15 +dia 30 0 30 dialog 10 0 71 diffstat 12 50 87 diffutils 42 55 87 @@ -1376,7 +1376,7 @@ xemacs-extras 50 0 36 xemacs-info 54 0 42 xemacs-mule 0 0 0 xfce 0 0 0 -xfig 59 0 53 +xfig 39 0 33 xfishtank 51 0 45 xgammon 40 0 31 xinetd 0 0 0 diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 5bcb04d8e..e7e9ce5ab 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: 2000-10-04 00:18+0200\n" +"POT-Creation-Date: 2000-10-04 13:48+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" @@ -538,7 +538,7 @@ msgstr "" msgid "Add" msgstr "" -#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45 +#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46 #: ../../install_steps_interactive.pm_.c:819 ../../netconnect.pm_.c:801 #: ../../printerdrake.pm_.c:353 ../../standalone/adduserdrake_.c:36 msgid "Done" @@ -721,199 +721,199 @@ msgid "" "\n" msgstr "" -#: ../../bootloader.pm_.c:599 +#: ../../bootloader.pm_.c:598 msgid "Welcome to GRUB the operating system chooser!" msgstr "" -#: ../../bootloader.pm_.c:600 +#: ../../bootloader.pm_.c:599 #, c-format msgid "Use the %c and %c keys for selecting which entry is highlighted." msgstr "" -#: ../../bootloader.pm_.c:601 +#: ../../bootloader.pm_.c:600 msgid "Press enter to boot the selected OS, 'e' to edit the" msgstr "" -#: ../../bootloader.pm_.c:602 +#: ../../bootloader.pm_.c:601 msgid "commands before booting, or 'c' for a command-line." msgstr "" -#: ../../bootloader.pm_.c:603 +#: ../../bootloader.pm_.c:602 #, c-format msgid "The highlighted entry will be booted automatically in %d seconds." msgstr "" -#: ../../bootloader.pm_.c:607 +#: ../../bootloader.pm_.c:606 msgid "not enough room in /boot" msgstr "" #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows -#: ../../bootloader.pm_.c:699 +#: ../../bootloader.pm_.c:698 msgid "Desktop" msgstr "" -#: ../../bootloader.pm_.c:699 +#: ../../bootloader.pm_.c:698 msgid "Start Menu" msgstr "" -#: ../../common.pm_.c:606 +#: ../../common.pm_.c:612 #, c-format msgid "%d minutes" msgstr "" -#: ../../common.pm_.c:608 +#: ../../common.pm_.c:614 msgid "1 minute" msgstr "" -#: ../../common.pm_.c:610 +#: ../../common.pm_.c:616 #, c-format msgid "%d seconds" msgstr "" -#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:418 +#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:419 msgid "Create" msgstr "" -#: ../../diskdrake.pm_.c:21 +#: ../../diskdrake.pm_.c:22 msgid "Unmount" msgstr "" -#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:420 +#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:421 msgid "Delete" msgstr "" -#: ../../diskdrake.pm_.c:22 +#: ../../diskdrake.pm_.c:23 msgid "Format" msgstr "" -#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:601 +#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:602 msgid "Resize" msgstr "" -#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:418 -#: ../../diskdrake.pm_.c:471 +#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:419 +#: ../../diskdrake.pm_.c:472 msgid "Type" msgstr "" -#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:491 +#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:492 msgid "Mount point" msgstr "" -#: ../../diskdrake.pm_.c:37 +#: ../../diskdrake.pm_.c:38 msgid "Write /etc/fstab" msgstr "" -#: ../../diskdrake.pm_.c:38 +#: ../../diskdrake.pm_.c:39 msgid "Toggle to expert mode" msgstr "" -#: ../../diskdrake.pm_.c:39 +#: ../../diskdrake.pm_.c:40 msgid "Toggle to normal mode" msgstr "" -#: ../../diskdrake.pm_.c:40 +#: ../../diskdrake.pm_.c:41 msgid "Restore from file" msgstr "" -#: ../../diskdrake.pm_.c:41 +#: ../../diskdrake.pm_.c:42 msgid "Save in file" msgstr "" -#: ../../diskdrake.pm_.c:42 +#: ../../diskdrake.pm_.c:43 msgid "Wizard" msgstr "" -#: ../../diskdrake.pm_.c:43 +#: ../../diskdrake.pm_.c:44 msgid "Restore from floppy" msgstr "" -#: ../../diskdrake.pm_.c:44 +#: ../../diskdrake.pm_.c:45 msgid "Save on floppy" msgstr "" -#: ../../diskdrake.pm_.c:48 +#: ../../diskdrake.pm_.c:49 msgid "Clear all" msgstr "" -#: ../../diskdrake.pm_.c:49 +#: ../../diskdrake.pm_.c:50 msgid "Format all" msgstr "" -#: ../../diskdrake.pm_.c:50 +#: ../../diskdrake.pm_.c:51 msgid "Auto allocate" msgstr "" -#: ../../diskdrake.pm_.c:53 +#: ../../diskdrake.pm_.c:54 msgid "All primary partitions are used" msgstr "" -#: ../../diskdrake.pm_.c:53 +#: ../../diskdrake.pm_.c:54 msgid "I can't add any more partition" msgstr "" -#: ../../diskdrake.pm_.c:53 +#: ../../diskdrake.pm_.c:54 msgid "" "To have more partitions, please delete one to be able to create an extended " "partition" msgstr "" -#: ../../diskdrake.pm_.c:56 +#: ../../diskdrake.pm_.c:57 msgid "Rescue partition table" msgstr "" -#: ../../diskdrake.pm_.c:57 +#: ../../diskdrake.pm_.c:58 msgid "Undo" msgstr "" -#: ../../diskdrake.pm_.c:58 +#: ../../diskdrake.pm_.c:59 msgid "Write partition table" msgstr "" -#: ../../diskdrake.pm_.c:59 +#: ../../diskdrake.pm_.c:60 msgid "Reload" msgstr "" -#: ../../diskdrake.pm_.c:100 +#: ../../diskdrake.pm_.c:101 msgid "loopback" msgstr "" -#: ../../diskdrake.pm_.c:113 +#: ../../diskdrake.pm_.c:114 msgid "Ext2" msgstr "" -#: ../../diskdrake.pm_.c:113 +#: ../../diskdrake.pm_.c:114 msgid "FAT" msgstr "" -#: ../../diskdrake.pm_.c:113 +#: ../../diskdrake.pm_.c:114 msgid "HFS" msgstr "" -#: ../../diskdrake.pm_.c:113 +#: ../../diskdrake.pm_.c:114 msgid "SunOS" msgstr "" -#: ../../diskdrake.pm_.c:113 +#: ../../diskdrake.pm_.c:114 msgid "Swap" msgstr "" -#: ../../diskdrake.pm_.c:114 +#: ../../diskdrake.pm_.c:115 msgid "Empty" msgstr "" -#: ../../diskdrake.pm_.c:114 ../../mouse.pm_.c:125 +#: ../../diskdrake.pm_.c:115 ../../mouse.pm_.c:125 msgid "Other" msgstr "" -#: ../../diskdrake.pm_.c:120 +#: ../../diskdrake.pm_.c:121 msgid "Filesystem types:" msgstr "" -#: ../../diskdrake.pm_.c:129 +#: ../../diskdrake.pm_.c:130 msgid "Details" msgstr "" -#: ../../diskdrake.pm_.c:143 +#: ../../diskdrake.pm_.c:144 msgid "" "You have one big FAT partition\n" "(generally used by MicroSoft Dos/Windows).\n" @@ -921,172 +921,172 @@ msgid "" "(click on it, then click on \"Resize\")" msgstr "" -#: ../../diskdrake.pm_.c:148 +#: ../../diskdrake.pm_.c:149 msgid "Please make a backup of your data first" msgstr "" -#: ../../diskdrake.pm_.c:148 ../../diskdrake.pm_.c:165 -#: ../../diskdrake.pm_.c:174 ../../diskdrake.pm_.c:523 -#: ../../diskdrake.pm_.c:545 +#: ../../diskdrake.pm_.c:149 ../../diskdrake.pm_.c:166 +#: ../../diskdrake.pm_.c:175 ../../diskdrake.pm_.c:524 +#: ../../diskdrake.pm_.c:546 msgid "Read carefully!" msgstr "" -#: ../../diskdrake.pm_.c:151 +#: ../../diskdrake.pm_.c:152 msgid "" "If you plan to use aboot, be carefull to leave a free space (2048 sectors is " "enough)\n" "at the beginning of the disk" msgstr "" -#: ../../diskdrake.pm_.c:165 +#: ../../diskdrake.pm_.c:166 msgid "Be careful: this operation is dangerous." msgstr "" -#: ../../diskdrake.pm_.c:202 ../../install_steps.pm_.c:73 +#: ../../diskdrake.pm_.c:203 ../../install_steps.pm_.c:73 #: ../../install_steps_interactive.pm_.c:38 #: ../../install_steps_interactive.pm_.c:341 ../../standalone/diskdrake_.c:60 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304 msgid "Error" msgstr "" -#: ../../diskdrake.pm_.c:226 ../../diskdrake.pm_.c:693 +#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:694 msgid "Mount point: " msgstr "" -#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:268 +#: ../../diskdrake.pm_.c:228 ../../diskdrake.pm_.c:269 msgid "Device: " msgstr "" -#: ../../diskdrake.pm_.c:228 +#: ../../diskdrake.pm_.c:229 #, c-format msgid "DOS drive letter: %s (just a guess)\n" msgstr "" -#: ../../diskdrake.pm_.c:229 ../../diskdrake.pm_.c:271 +#: ../../diskdrake.pm_.c:230 ../../diskdrake.pm_.c:272 msgid "Type: " msgstr "" -#: ../../diskdrake.pm_.c:230 +#: ../../diskdrake.pm_.c:231 #, c-format msgid "Start: sector %s\n" msgstr "" -#: ../../diskdrake.pm_.c:231 +#: ../../diskdrake.pm_.c:232 #, c-format msgid "Size: %d MB" msgstr "" -#: ../../diskdrake.pm_.c:233 +#: ../../diskdrake.pm_.c:234 #, c-format msgid ", %s sectors" msgstr "" -#: ../../diskdrake.pm_.c:235 +#: ../../diskdrake.pm_.c:236 #, c-format msgid "Cylinder %d to cylinder %d\n" msgstr "" -#: ../../diskdrake.pm_.c:236 +#: ../../diskdrake.pm_.c:237 msgid "Formatted\n" msgstr "" -#: ../../diskdrake.pm_.c:237 +#: ../../diskdrake.pm_.c:238 msgid "Not formatted\n" msgstr "" -#: ../../diskdrake.pm_.c:238 +#: ../../diskdrake.pm_.c:239 msgid "Mounted\n" msgstr "" -#: ../../diskdrake.pm_.c:239 +#: ../../diskdrake.pm_.c:240 #, c-format msgid "RAID md%s\n" msgstr "" -#: ../../diskdrake.pm_.c:240 +#: ../../diskdrake.pm_.c:241 #, c-format msgid "Loopback file(s): %s\n" msgstr "" -#: ../../diskdrake.pm_.c:241 +#: ../../diskdrake.pm_.c:242 msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" msgstr "" -#: ../../diskdrake.pm_.c:243 +#: ../../diskdrake.pm_.c:244 #, c-format msgid "Level %s\n" msgstr "" -#: ../../diskdrake.pm_.c:244 +#: ../../diskdrake.pm_.c:245 #, c-format msgid "Chunk size %s\n" msgstr "" -#: ../../diskdrake.pm_.c:245 +#: ../../diskdrake.pm_.c:246 #, c-format msgid "RAID-disks %s\n" msgstr "" -#: ../../diskdrake.pm_.c:247 +#: ../../diskdrake.pm_.c:248 #, c-format msgid "Loopback file name: %s" msgstr "" -#: ../../diskdrake.pm_.c:264 +#: ../../diskdrake.pm_.c:265 msgid "Please click on a partition" msgstr "" -#: ../../diskdrake.pm_.c:269 +#: ../../diskdrake.pm_.c:270 #, c-format msgid "Size: %d MB\n" msgstr "" -#: ../../diskdrake.pm_.c:270 +#: ../../diskdrake.pm_.c:271 #, c-format msgid "Geometry: %s cylinders, %s heads, %s sectors\n" msgstr "" -#: ../../diskdrake.pm_.c:272 +#: ../../diskdrake.pm_.c:273 #, c-format msgid "Partition table type: %s\n" msgstr "" -#: ../../diskdrake.pm_.c:273 +#: ../../diskdrake.pm_.c:274 #, c-format msgid "on bus %d id %d\n" msgstr "" -#: ../../diskdrake.pm_.c:286 +#: ../../diskdrake.pm_.c:287 msgid "Mount" msgstr "" -#: ../../diskdrake.pm_.c:287 +#: ../../diskdrake.pm_.c:288 msgid "Active" msgstr "" -#: ../../diskdrake.pm_.c:288 +#: ../../diskdrake.pm_.c:289 msgid "Add to RAID" msgstr "" -#: ../../diskdrake.pm_.c:289 +#: ../../diskdrake.pm_.c:290 msgid "Remove from RAID" msgstr "" -#: ../../diskdrake.pm_.c:290 +#: ../../diskdrake.pm_.c:291 msgid "Modify RAID" msgstr "" -#: ../../diskdrake.pm_.c:291 +#: ../../diskdrake.pm_.c:292 msgid "Use for loopback" msgstr "" -#: ../../diskdrake.pm_.c:298 +#: ../../diskdrake.pm_.c:299 msgid "Choose action" msgstr "" -#: ../../diskdrake.pm_.c:391 +#: ../../diskdrake.pm_.c:392 msgid "" "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > " "1024).\n" @@ -1094,7 +1094,7 @@ msgid "" "need /boot" msgstr "" -#: ../../diskdrake.pm_.c:395 +#: ../../diskdrake.pm_.c:396 msgid "" "The partition you've selected to add as root (/) is physically located " "beyond\n" @@ -1102,240 +1102,240 @@ msgid "" "If you plan to use the LILO boot manager, be careful to add a /boot partition" msgstr "" -#: ../../diskdrake.pm_.c:401 +#: ../../diskdrake.pm_.c:402 msgid "" "You've selected a software RAID partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "So be careful to add a /boot partition" msgstr "" -#: ../../diskdrake.pm_.c:418 ../../diskdrake.pm_.c:420 +#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:421 #, c-format msgid "Use ``%s'' instead" msgstr "" -#: ../../diskdrake.pm_.c:423 +#: ../../diskdrake.pm_.c:424 msgid "Use ``Unmount'' first" msgstr "" -#: ../../diskdrake.pm_.c:424 ../../diskdrake.pm_.c:466 +#: ../../diskdrake.pm_.c:425 ../../diskdrake.pm_.c:467 #, c-format msgid "" "After changing type of partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake.pm_.c:436 +#: ../../diskdrake.pm_.c:437 msgid "Continue anyway?" msgstr "" -#: ../../diskdrake.pm_.c:441 +#: ../../diskdrake.pm_.c:442 msgid "Quit without saving" msgstr "" -#: ../../diskdrake.pm_.c:441 +#: ../../diskdrake.pm_.c:442 msgid "Quit without writing the partition table?" msgstr "" -#: ../../diskdrake.pm_.c:469 +#: ../../diskdrake.pm_.c:470 msgid "Change partition type" msgstr "" -#: ../../diskdrake.pm_.c:470 +#: ../../diskdrake.pm_.c:471 msgid "Which filesystem do you want?" msgstr "" -#: ../../diskdrake.pm_.c:473 ../../diskdrake.pm_.c:725 +#: ../../diskdrake.pm_.c:474 ../../diskdrake.pm_.c:726 msgid "You can't use ReiserFS for partitions smaller than 32MB" msgstr "" -#: ../../diskdrake.pm_.c:489 +#: ../../diskdrake.pm_.c:490 #, c-format msgid "Where do you want to mount loopback file %s?" msgstr "" -#: ../../diskdrake.pm_.c:490 +#: ../../diskdrake.pm_.c:491 #, c-format msgid "Where do you want to mount device %s?" msgstr "" -#: ../../diskdrake.pm_.c:495 +#: ../../diskdrake.pm_.c:496 msgid "" "Can't unset mount point as this partition is used for loop back.\n" "Remove the loopback first" msgstr "" -#: ../../diskdrake.pm_.c:514 +#: ../../diskdrake.pm_.c:515 #, c-format msgid "After formatting partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake.pm_.c:516 +#: ../../diskdrake.pm_.c:517 msgid "Formatting" msgstr "" -#: ../../diskdrake.pm_.c:517 +#: ../../diskdrake.pm_.c:518 #, c-format msgid "Formatting loopback file %s" msgstr "" -#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:428 +#: ../../diskdrake.pm_.c:519 ../../install_steps_interactive.pm_.c:428 #, c-format msgid "Formatting partition %s" msgstr "" -#: ../../diskdrake.pm_.c:523 +#: ../../diskdrake.pm_.c:524 msgid "After formatting all partitions," msgstr "" -#: ../../diskdrake.pm_.c:523 +#: ../../diskdrake.pm_.c:524 msgid "all data on these partitions will be lost" msgstr "" -#: ../../diskdrake.pm_.c:529 +#: ../../diskdrake.pm_.c:530 msgid "Move" msgstr "" -#: ../../diskdrake.pm_.c:530 +#: ../../diskdrake.pm_.c:531 msgid "Which disk do you want to move it to?" msgstr "" -#: ../../diskdrake.pm_.c:531 +#: ../../diskdrake.pm_.c:532 msgid "Sector" msgstr "" -#: ../../diskdrake.pm_.c:532 +#: ../../diskdrake.pm_.c:533 msgid "Which sector do you want to move it to?" msgstr "" -#: ../../diskdrake.pm_.c:535 +#: ../../diskdrake.pm_.c:536 msgid "Moving" msgstr "" -#: ../../diskdrake.pm_.c:535 +#: ../../diskdrake.pm_.c:536 msgid "Moving partition..." msgstr "" -#: ../../diskdrake.pm_.c:545 +#: ../../diskdrake.pm_.c:546 #, c-format msgid "Partition table of drive %s is going to be written to disk!" msgstr "" -#: ../../diskdrake.pm_.c:547 +#: ../../diskdrake.pm_.c:548 msgid "You'll need to reboot before the modification can take place" msgstr "" -#: ../../diskdrake.pm_.c:568 +#: ../../diskdrake.pm_.c:569 msgid "Computing FAT filesystem bounds" msgstr "" -#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:628 +#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:629 #: ../../install_interactive.pm_.c:107 msgid "Resizing" msgstr "" -#: ../../diskdrake.pm_.c:591 +#: ../../diskdrake.pm_.c:592 msgid "This partition is not resizeable" msgstr "" -#: ../../diskdrake.pm_.c:596 +#: ../../diskdrake.pm_.c:597 msgid "All data on this partition should be backed-up" msgstr "" -#: ../../diskdrake.pm_.c:598 +#: ../../diskdrake.pm_.c:599 #, c-format msgid "After resizing partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake.pm_.c:608 +#: ../../diskdrake.pm_.c:609 msgid "Choose the new size" msgstr "" -#: ../../diskdrake.pm_.c:608 ../../install_steps_interactive.pm_.c:532 +#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:532 #: ../../partition_table_raw.pm_.c:101 msgid "MB" msgstr "" -#: ../../diskdrake.pm_.c:665 +#: ../../diskdrake.pm_.c:666 msgid "Create a new partition" msgstr "" -#: ../../diskdrake.pm_.c:685 +#: ../../diskdrake.pm_.c:686 msgid "Start sector: " msgstr "" -#: ../../diskdrake.pm_.c:689 ../../diskdrake.pm_.c:764 +#: ../../diskdrake.pm_.c:690 ../../diskdrake.pm_.c:765 msgid "Size in MB: " msgstr "" -#: ../../diskdrake.pm_.c:692 ../../diskdrake.pm_.c:767 +#: ../../diskdrake.pm_.c:693 ../../diskdrake.pm_.c:768 msgid "Filesystem type: " msgstr "" -#: ../../diskdrake.pm_.c:695 +#: ../../diskdrake.pm_.c:696 msgid "Preference: " msgstr "" -#: ../../diskdrake.pm_.c:743 +#: ../../diskdrake.pm_.c:744 msgid "This partition can't be used for loopback" msgstr "" -#: ../../diskdrake.pm_.c:753 +#: ../../diskdrake.pm_.c:754 msgid "Loopback" msgstr "" -#: ../../diskdrake.pm_.c:763 +#: ../../diskdrake.pm_.c:764 msgid "Loopback file name: " msgstr "" -#: ../../diskdrake.pm_.c:789 +#: ../../diskdrake.pm_.c:790 msgid "File already used by another loopback, choose another one" msgstr "" -#: ../../diskdrake.pm_.c:790 +#: ../../diskdrake.pm_.c:791 msgid "File already exists. Use it?" msgstr "" -#: ../../diskdrake.pm_.c:812 ../../diskdrake.pm_.c:828 +#: ../../diskdrake.pm_.c:813 ../../diskdrake.pm_.c:829 msgid "Select file" msgstr "" -#: ../../diskdrake.pm_.c:821 +#: ../../diskdrake.pm_.c:822 msgid "" "The backup partition table has not the same size\n" "Still continue?" msgstr "" -#: ../../diskdrake.pm_.c:829 +#: ../../diskdrake.pm_.c:830 msgid "Warning" msgstr "" -#: ../../diskdrake.pm_.c:830 +#: ../../diskdrake.pm_.c:831 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" msgstr "" -#: ../../diskdrake.pm_.c:841 +#: ../../diskdrake.pm_.c:842 msgid "Trying to rescue partition table" msgstr "" -#: ../../diskdrake.pm_.c:852 +#: ../../diskdrake.pm_.c:853 msgid "device" msgstr "" -#: ../../diskdrake.pm_.c:853 +#: ../../diskdrake.pm_.c:854 msgid "level" msgstr "" -#: ../../diskdrake.pm_.c:854 +#: ../../diskdrake.pm_.c:855 msgid "chunk size" msgstr "" -#: ../../diskdrake.pm_.c:866 +#: ../../diskdrake.pm_.c:867 msgid "Choose an existing RAID to add to" msgstr "" -#: ../../diskdrake.pm_.c:867 +#: ../../diskdrake.pm_.c:868 msgid "new" msgstr "" @@ -1405,7 +1405,7 @@ msgid "" "You need to accept the terms of the above license to continue installation.\n" "\n" "\n" -"Please click on \"Accept\" if you agree with its terms.\n" +"Please click on \"Accept\" if you are agree with its terms.\n" "\n" "\n" "Please click on \"Refuse\" if you disagree with its terms. Installation will " @@ -5203,14 +5203,42 @@ msgstr "" msgid "Internet Connection Sharing currently enabled" msgstr "" -#: ../../standalone/drakgw_.c:104 ../../standalone/drakgw_.c:123 -msgid "The setup of Internet connection sharing has already been done.\n" +#: ../../standalone/drakgw_.c:104 +msgid "" +"The setup of Internet connection sharing has already been done.\n" +"It's currently enabled.\n" +"\n" +"What would you like to do?" +msgstr "" + +#: ../../standalone/drakgw_.c:107 +msgid "disable" +msgstr "" + +#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126 +msgid "dismiss" +msgstr "" + +#: ../../standalone/drakgw_.c:107 ../../standalone/drakgw_.c:126 +msgid "reconfigure" msgstr "" #: ../../standalone/drakgw_.c:122 msgid "Internet Connection Sharing currently disabled" msgstr "" +#: ../../standalone/drakgw_.c:123 +msgid "" +"The setup of Internet connection sharing has already been done.\n" +"It's currently disabled.\n" +"\n" +"What would you like to do?" +msgstr "" + +#: ../../standalone/drakgw_.c:126 +msgid "enable" +msgstr "" + #: ../../standalone/drakgw_.c:141 msgid "Config file content could not be interpreted." msgstr "" @@ -5223,6 +5251,10 @@ msgstr "" msgid "" "Your computer can be configured to share its Internet connection.\n" "\n" +"Note: you need a dedicated Network Adapter to set up a Local Area Network " +"(LAN).\n" +"\n" +"Would you like to setup the Internet Connection Sharing?" msgstr "" #: ../../standalone/drakgw_.c:210 @@ -5299,7 +5331,10 @@ msgid "Congratulations!" msgstr "" #: ../../standalone/drakgw_.c:513 -msgid "Everything has been configured.\n" +msgid "" +"Everything has been configured.\n" +"You may now share Internet connection with other computers on your Local " +"Area Network, using automatic network configuration (DHCP)." msgstr "" #: ../../standalone/draksec_.c:28 diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index e3e42973c..f77ea5183 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -101,11 +101,11 @@ if (-f $drakgw_setup) if (grep(/enabled/, @drakgw_setup_content)) { my $r = $in->ask_from_list(_("Internet Connection Sharing currently enabled"), - _("The setup of Internet connection sharing has already been done.\n". - "It's currently enabled.\n\n". - "What would you like to do?"), - [ "disable", "reconfigure", "dismiss" ]); - if ($r eq "disable") + _("The setup of Internet connection sharing has already been done. +It's currently enabled.\n +What would you like to do?"), + [ _("disable"), _("reconfigure"), _("dismiss") ]); + if ($r eq _("disable")) { stop_daemons(); -f "$dhcpd_conf.drakgwdisable" and (unlink("$dhcpd_conf.drakgwdisable") or die "Could not unlink $dhcpd_conf.drakgwdisable"); @@ -115,16 +115,16 @@ if (-f $drakgw_setup) log::l("[drakgw] Disabled\n"); $in->exit(0); } - ($r eq "dismiss") and $in->exit(0); + ($r eq _("dismiss")) and $in->exit(0); } elsif (grep(/disabled/, @drakgw_setup_content)) { my $r = $in->ask_from_list(_("Internet Connection Sharing currently disabled"), - _("The setup of Internet connection sharing has already been done.\n". - "It's currently disabled.\n\n". - "What would you like to do?"), - [ "enable", "reconfigure", "dismiss" ]); - if ($r eq "enable") + _("The setup of Internet connection sharing has already been done. +It's currently disabled.\n +What would you like to do?"), + [ _("enable"), _("reconfigure"), _("dismiss") ]); + if ($r eq _("enable")) { -f $dhcpd_conf and rename($dhcpd_conf, "$dhcpd_conf.old"); rename("$dhcpd_conf.drakgwdisable", $dhcpd_conf) or die "Could not find configuration. Please reconfigure."; @@ -134,7 +134,7 @@ if (-f $drakgw_setup) log::l("[drakgw] Enabled\n"); $in->exit(0); } - ($r eq "dismiss") and $in->exit(0); + ($r eq _("dismiss")) and $in->exit(0); } else { @@ -149,9 +149,9 @@ if (-f $drakgw_setup) #- * 1st step: detect/setup $::direct or $in->ask_okcancel(_("Internet Connection Sharing"), - _("Your computer can be configured to share its Internet connection.\n\n". - "Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN).\n\n". - "Would you like to setup the Internet Connection Sharing?"), 1) or $in->exit(0); + _("Your computer can be configured to share its Internet connection.\n +Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN).\n +Would you like to setup the Internet Connection Sharing?"), 1) or $in->exit(0); #my @pci_ethernet_cards; #require pci_probing::main; @@ -510,9 +510,8 @@ start_daemons(); undef $wait_configuring; $in->ask_warn(_("Congratulations!"), - _("Everything has been configured.\n". - "You may now share Internet connection with other computers on your Local Area Network, ". - "using automatic network configuration (DHCP).")); + _("Everything has been configured. +You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP).")); log::l("[drakgw] Installation complete, exiting\n"); |