summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-28 07:06:11 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-28 07:06:11 +0000
commit7b02dcbc138f9aa51547445504acfdd32c5f8bf1 (patch)
tree9314f154c29dd25d7c1bd6b8e0a1052d14afef93
parent693e214b84e219c5ad88065d538ad764f50e485d (diff)
downloadurpmi-7b02dcbc138f9aa51547445504acfdd32c5f8bf1.tar
urpmi-7b02dcbc138f9aa51547445504acfdd32c5f8bf1.tar.gz
urpmi-7b02dcbc138f9aa51547445504acfdd32c5f8bf1.tar.bz2
urpmi-7b02dcbc138f9aa51547445504acfdd32c5f8bf1.tar.xz
urpmi-7b02dcbc138f9aa51547445504acfdd32c5f8bf1.zip
Allow to give several comma- or space-separated answers to the question
"One of the following packages is needed, what is your choice?" in urpmi
-rwxr-xr-xurpmi5
1 files changed, 5 insertions, 0 deletions
diff --git a/urpmi b/urpmi
index a09edce3..dc3ab3fe 100755
--- a/urpmi
+++ b/urpmi
@@ -350,6 +350,11 @@ sub ask_choice {
my $i = 0; foreach (@l) { message(" " . ++$i . "- $_") }
$n = message_input(N("What is your choice? (1-%d) ", $i), undef, range_min => 0, range => $i);
defined($n) && $n ne "0" or exit 1; # abort.
+ if ($n =~ /\D/) {
+ my @nn = map { $choices->[$_ - 1] } grep { !/\D/ } split /[, \t]+/, $n;
+ @nn or exit 1;
+ return @nn;
+ }
}
$choices->[$n - 1];
}
class='sha1'>drakx-990d4424959a50018d9b034411dd3a8283789a27.tar
drakx-990d4424959a50018d9b034411dd3a8283789a27.tar.gz
drakx-990d4424959a50018d9b034411dd3a8283789a27.tar.bz2
drakx-990d4424959a50018d9b034411dd3a8283789a27.tar.xz
drakx-990d4424959a50018d9b034411dd3a8283789a27.zip
updated pot file
Diffstat (limited to 'perl-install/share/po')
-rw-r--r--perl-install/share/po/DrakX.pot604
1 files changed, 321 insertions, 283 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 4131ca2a4..e1cc49438 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-06 14:43+0200\n"
+"POT-Creation-Date: 2000-10-06 21:29+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"
@@ -30,33 +30,33 @@ msgstr ""
msgid "X server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:216 ../../Xconfigurator.pm_.c:222
+#: ../../Xconfigurator.pm_.c:217 ../../Xconfigurator.pm_.c:223
#, c-format
msgid "XFree %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:219
+#: ../../Xconfigurator.pm_.c:220
msgid "Which configuration of XFree do you want to have?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:231
+#: ../../Xconfigurator.pm_.c:232
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
"Your card is supported by XFree %s which may have a better support in 2D."
msgstr ""
-#: ../../Xconfigurator.pm_.c:233 ../../Xconfigurator.pm_.c:256
+#: ../../Xconfigurator.pm_.c:234 ../../Xconfigurator.pm_.c:257
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr ""
-#: ../../Xconfigurator.pm_.c:235 ../../Xconfigurator.pm_.c:258
+#: ../../Xconfigurator.pm_.c:236 ../../Xconfigurator.pm_.c:259
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:244
+#: ../../Xconfigurator.pm_.c:245
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -64,39 +64,39 @@ msgid ""
"Your card is supported by XFree %s which may have a better support in 2D."
msgstr ""
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:248
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
msgstr ""
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:250
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:263
+#: ../../Xconfigurator.pm_.c:265
msgid "XFree configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:299
+#: ../../Xconfigurator.pm_.c:301
msgid "Select the memory size of your graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:345
msgid "Choose options for server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:354
+#: ../../Xconfigurator.pm_.c:356
msgid "Choose a monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:354
+#: ../../Xconfigurator.pm_.c:356
msgid "Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:357
+#: ../../Xconfigurator.pm_.c:359
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -110,184 +110,184 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../../Xconfigurator.pm_.c:364
+#: ../../Xconfigurator.pm_.c:366
msgid "Horizontal refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:364
+#: ../../Xconfigurator.pm_.c:366
msgid "Vertical refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:403
+#: ../../Xconfigurator.pm_.c:405
msgid "Monitor not configured"
msgstr ""
-#: ../../Xconfigurator.pm_.c:406
+#: ../../Xconfigurator.pm_.c:408
msgid "Graphic card not configured yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:409
+#: ../../Xconfigurator.pm_.c:411
msgid "Resolutions not chosen yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:425
+#: ../../Xconfigurator.pm_.c:427
msgid "Do you want to test the configuration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:429
+#: ../../Xconfigurator.pm_.c:431
msgid "Warning: testing this graphic card may freeze your computer"
msgstr ""
-#: ../../Xconfigurator.pm_.c:432
+#: ../../Xconfigurator.pm_.c:434
msgid "Test of the configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:471
+#: ../../Xconfigurator.pm_.c:473
msgid ""
"\n"
"try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:471
+#: ../../Xconfigurator.pm_.c:473
msgid "An error has occurred:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:493
+#: ../../Xconfigurator.pm_.c:495
#, c-format
msgid "Leaving in %d seconds"
msgstr ""
-#: ../../Xconfigurator.pm_.c:503
+#: ../../Xconfigurator.pm_.c:505
msgid "Is this the correct setting?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:511
+#: ../../Xconfigurator.pm_.c:513
msgid "An error has occurred, try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:548 ../../printerdrake.pm_.c:276
+#: ../../Xconfigurator.pm_.c:550 ../../printerdrake.pm_.c:276
msgid "Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:583
+#: ../../Xconfigurator.pm_.c:585
msgid "Choose the resolution and the color depth"
msgstr ""
-#: ../../Xconfigurator.pm_.c:585
+#: ../../Xconfigurator.pm_.c:587
#, c-format
msgid "Graphic card: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:586
+#: ../../Xconfigurator.pm_.c:588
#, c-format
msgid "XFree86 server: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:595
+#: ../../Xconfigurator.pm_.c:597
msgid "Show all"
msgstr ""
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:621
msgid "Resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1011
+#: ../../Xconfigurator.pm_.c:1019
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1012
+#: ../../Xconfigurator.pm_.c:1020
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1013
+#: ../../Xconfigurator.pm_.c:1021
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1014
+#: ../../Xconfigurator.pm_.c:1022
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1015
+#: ../../Xconfigurator.pm_.c:1023
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1016
+#: ../../Xconfigurator.pm_.c:1024
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1017
+#: ../../Xconfigurator.pm_.c:1025
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1018
+#: ../../Xconfigurator.pm_.c:1026
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1020
+#: ../../Xconfigurator.pm_.c:1028
#, c-format
msgid "Color depth: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1021
+#: ../../Xconfigurator.pm_.c:1029
#, c-format
msgid "Resolution: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1023
+#: ../../Xconfigurator.pm_.c:1031
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1024
+#: ../../Xconfigurator.pm_.c:1032
#, c-format
msgid "XFree86 driver: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1043
+#: ../../Xconfigurator.pm_.c:1051
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1057
+#: ../../Xconfigurator.pm_.c:1065
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1058
+#: ../../Xconfigurator.pm_.c:1066
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1059
+#: ../../Xconfigurator.pm_.c:1067
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1060
+#: ../../Xconfigurator.pm_.c:1068
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1061
+#: ../../Xconfigurator.pm_.c:1069
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1062
+#: ../../Xconfigurator.pm_.c:1070
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1063 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1071 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1067 ../../standalone/drakboot_.c:40
+#: ../../Xconfigurator.pm_.c:1075 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1074
+#: ../../Xconfigurator.pm_.c:1082
#, c-format
msgid ""
"Keep the changes?\n"
@@ -296,40 +296,40 @@ msgid ""
"%s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1095
+#: ../../Xconfigurator.pm_.c:1103
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1115
+#: ../../Xconfigurator.pm_.c:1123
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1118
+#: ../../Xconfigurator.pm_.c:1126
msgid "X at startup"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1127
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1139
+#: ../../Xconfigurator.pm_.c:1151
msgid "Autologin"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1140
+#: ../../Xconfigurator.pm_.c:1152
msgid ""
"I can set up your computer to automatically log on one user.\n"
"If you don't want to use this feature, click on the cancel button."
msgstr ""
-#: ../../Xconfigurator.pm_.c:1142
+#: ../../Xconfigurator.pm_.c:1154
msgid "Choose the default user:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1143
+#: ../../Xconfigurator.pm_.c:1155
msgid "Choose the window manager to run:"
msgstr ""
@@ -486,7 +486,7 @@ msgid "Delay before booting default image"
msgstr ""
#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:753
-#: ../../install_steps_interactive.pm_.c:804 ../../netconnect.pm_.c:533
+#: ../../install_steps_interactive.pm_.c:804 ../../netconnect.pm_.c:549
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
@@ -539,7 +539,7 @@ msgid "Add"
msgstr ""
#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:46
-#: ../../install_steps_interactive.pm_.c:798 ../../netconnect.pm_.c:811
+#: ../../install_steps_interactive.pm_.c:798 ../../netconnect.pm_.c:831
#: ../../printerdrake.pm_.c:352 ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr ""
@@ -618,54 +618,54 @@ msgstr ""
msgid "This label is already used"
msgstr ""
-#: ../../any.pm_.c:499
+#: ../../any.pm_.c:500
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../../any.pm_.c:500
+#: ../../any.pm_.c:501
msgid "Do you have another one?"
msgstr ""
-#: ../../any.pm_.c:501
+#: ../../any.pm_.c:502
#, c-format
msgid "Do you have any %s interfaces?"
msgstr ""
-#: ../../any.pm_.c:503 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:453
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:90 ../../netconnect.pm_.c:466
#: ../../printerdrake.pm_.c:233
msgid "No"
msgstr ""
-#: ../../any.pm_.c:503 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:451
+#: ../../any.pm_.c:504 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
+#: ../../netconnect.pm_.c:88 ../../netconnect.pm_.c:464
msgid "Yes"
msgstr ""
-#: ../../any.pm_.c:504
+#: ../../any.pm_.c:505
msgid "See hardware info"
msgstr ""
#. -PO: the first %s is the card type (scsi, network, sound,...)
#. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:521
+#: ../../any.pm_.c:522
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../../any.pm_.c:522
+#: ../../any.pm_.c:523
#, c-format
msgid "(module %s)"
msgstr ""
#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:533
+#: ../../any.pm_.c:534
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../../any.pm_.c:541
+#: ../../any.pm_.c:542
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -677,20 +677,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../../any.pm_.c:546
+#: ../../any.pm_.c:547
msgid "Autoprobe"
msgstr ""
-#: ../../any.pm_.c:546
+#: ../../any.pm_.c:547
msgid "Specify options"
msgstr ""
-#: ../../any.pm_.c:550
+#: ../../any.pm_.c:551
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../../any.pm_.c:556
+#: ../../any.pm_.c:557
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -698,11 +698,11 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../../any.pm_.c:559
+#: ../../any.pm_.c:560
msgid "Module options:"
msgstr ""
-#: ../../any.pm_.c:569
+#: ../../any.pm_.c:570
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -1248,7 +1248,9 @@ msgstr ""
msgid "Choose the new size"
msgstr ""
-#: ../../diskdrake.pm_.c:609 ../../install_steps_interactive.pm_.c:511
+#: ../../diskdrake.pm_.c:609 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+#: ../../install_steps_interactive.pm_.c:511
#: ../../partition_table_raw.pm_.c:101
msgid "MB"
msgstr ""
@@ -2492,7 +2494,7 @@ msgstr ""
msgid "Exit install"
msgstr ""
-#: ../../install_any.pm_.c:584
+#: ../../install_any.pm_.c:583
msgid "Error reading file $f"
msgstr ""
@@ -2522,11 +2524,11 @@ msgid ""
"Then choose action ``Mount point'' and set it to `/'"
msgstr ""
-#: ../../install_interactive.pm_.c:46
+#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
msgid "You must have a swap partition"
msgstr ""
-#: ../../install_interactive.pm_.c:47
+#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -2718,6 +2720,80 @@ msgstr ""
msgid "Entering step `%s'\n"
msgstr ""
+#: ../../install_steps_graphical.pm_.c:287
+msgid "Choose the size you want to install"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:334
+msgid "Total size: "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:353
+#: ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:354
+#: ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:260
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:263
+msgid "Info"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:268
+#: ../../install_steps_interactive.pm_.c:216 ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:587
+msgid "Installing"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:472
+msgid "Please wait, "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:474
+msgid "Time remaining "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:475
+msgid "Total time "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:484
+#: ../../install_steps_interactive.pm_.c:587
+msgid "Preparing installation"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:500
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:569
+#: ../../install_steps_gtk.pm_.c:573
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:569
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:577
+#: ../../install_steps_interactive.pm_.c:992
+msgid "Use existing configuration for X11?"
+msgstr ""
+
#: ../../install_steps_gtk.pm_.c:136
msgid ""
"Your system is low on resource. You may have some problem installing\n"
@@ -2763,19 +2839,6 @@ msgstr ""
msgid "Percentage of packages to install"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:260
-msgid "Choose the packages you want to install"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:263
-msgid "Info"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:268 ../../install_steps_interactive.pm_.c:216
-#: ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:272
msgid "Automatic dependencies"
msgstr ""
@@ -2801,16 +2864,6 @@ msgstr ""
msgid "Name: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:353 ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:354 ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:355
#, c-format
msgid "Importance: %s\n"
@@ -2856,26 +2909,10 @@ msgstr ""
msgid "You can't unselect this package. It must be upgraded"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:466 ../../install_steps_interactive.pm_.c:587
-msgid "Installing"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:469
msgid "Estimating"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:472
-msgid "Please wait, "
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:474
-msgid "Time remaining "
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:475
-msgid "Total time "
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
#: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
@@ -2883,20 +2920,11 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:484 ../../install_steps_interactive.pm_.c:587
-msgid "Preparing installation"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:495
#, c-format
msgid "%d packages"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:500
-#, c-format
-msgid "Installing package %s"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:531
msgid ""
"\n"
@@ -2947,14 +2975,6 @@ msgstr ""
msgid "Refuse"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:569 ../../install_steps_gtk.pm_.c:573
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:569
-msgid "There was an error ordering packages:"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:573
msgid "There was an error installing packages:"
msgstr ""
@@ -3664,10 +3684,6 @@ msgid ""
"give digits instead of normal letters (eg: pressing `p' gives `6')"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:992
-msgid "Use existing configuration for X11?"
-msgstr ""
-
#: ../../install_steps_interactive.pm_.c:1021
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
@@ -4093,127 +4109,143 @@ msgstr ""
msgid "Do you want to try to connect to the Internet now?"
msgstr ""
-#: ../../netconnect.pm_.c:129 ../../netconnect.pm_.c:201
-#: ../../netconnect.pm_.c:220 ../../netconnect.pm_.c:232
-#: ../../netconnect.pm_.c:244
+#: ../../netconnect.pm_.c:101
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../../netconnect.pm_.c:106
+msgid ""
+"The system is now connected to Internet! Congratulation.\n"
+"Feel free to launch draknet at any time to setup your connection.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:108
+msgid ""
+"The system doesn't seem to be connected to internet.\n"
+"Try to reconfigure your connection."
+msgstr ""
+
+#: ../../netconnect.pm_.c:142 ../../netconnect.pm_.c:214
+#: ../../netconnect.pm_.c:233 ../../netconnect.pm_.c:245
+#: ../../netconnect.pm_.c:257
msgid "ISDN Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:129
+#: ../../netconnect.pm_.c:142
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
msgstr ""
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:159
msgid "Connection Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:160
msgid "Please fill or check the field below"
msgstr ""
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:162
msgid "Card IRQ"
msgstr ""
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:163
msgid "Card mem (DMA)"
msgstr ""
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:164
msgid "Card IO"
msgstr ""
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:165
msgid "Card IO_0"
msgstr ""
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:166
msgid "Card IO_1"
msgstr ""
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:167
msgid "Your personal phone number"
msgstr ""
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:169
msgid "Provider name (ex provider.net)"
msgstr ""
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:170
msgid "Provider phone number"
msgstr ""
-#: ../../netconnect.pm_.c:158
+#: ../../netconnect.pm_.c:171
msgid "Provider dns 1"
msgstr ""
-#: ../../netconnect.pm_.c:159
+#: ../../netconnect.pm_.c:172
msgid "Provider dns 2"
msgstr ""
-#: ../../netconnect.pm_.c:160
+#: ../../netconnect.pm_.c:173
msgid "Dialing mode"
msgstr ""
-#: ../../netconnect.pm_.c:162
+#: ../../netconnect.pm_.c:175
msgid "Account Login (user name)"
msgstr ""
-#: ../../netconnect.pm_.c:163
+#: ../../netconnect.pm_.c:176
msgid "Account Password"
msgstr ""
-#: ../../netconnect.pm_.c:164
+#: ../../netconnect.pm_.c:177
msgid "Confirm Password"
msgstr ""
-#: ../../netconnect.pm_.c:196
+#: ../../netconnect.pm_.c:209
msgid "Europe"
msgstr ""
-#: ../../netconnect.pm_.c:196
+#: ../../netconnect.pm_.c:209
msgid "Europe (EDSS1)"
msgstr ""
-#: ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:211
msgid "Rest of the world"
msgstr ""
-#: ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:211
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr ""
-#: ../../netconnect.pm_.c:202
+#: ../../netconnect.pm_.c:215
msgid "Which protocol do you want to use ?"
msgstr ""
-#: ../../netconnect.pm_.c:212
+#: ../../netconnect.pm_.c:225
msgid "ISA / PCMCIA"
msgstr ""
-#: ../../netconnect.pm_.c:214
+#: ../../netconnect.pm_.c:227
msgid "PCI"
msgstr ""
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:229
msgid "I don't know"
msgstr ""
-#: ../../netconnect.pm_.c:221
+#: ../../netconnect.pm_.c:234
msgid "What kind of card do you have?"
msgstr ""
-#: ../../netconnect.pm_.c:227
+#: ../../netconnect.pm_.c:240
msgid "Continue"
msgstr ""
-#: ../../netconnect.pm_.c:229
+#: ../../netconnect.pm_.c:242
msgid "Abort"
msgstr ""
-#: ../../netconnect.pm_.c:233
+#: ../../netconnect.pm_.c:246
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -4221,273 +4253,279 @@ msgid ""
"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
msgstr ""
-#: ../../netconnect.pm_.c:245
+#: ../../netconnect.pm_.c:258
msgid "Which is your ISDN card ?"
msgstr ""
-#: ../../netconnect.pm_.c:269
+#: ../../netconnect.pm_.c:282
msgid "I have found an ISDN Card:\n"
msgstr ""
-#: ../../netconnect.pm_.c:275
+#: ../../netconnect.pm_.c:288
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:287
+#: ../../netconnect.pm_.c:300
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:319
+#: ../../netconnect.pm_.c:332
msgid ""
"No ethernet network adapter has been detected on your system.\n"
"I cannot set up this connection type."
msgstr ""
-#: ../../netconnect.pm_.c:323 ../../standalone/drakgw_.c:222
+#: ../../netconnect.pm_.c:336 ../../standalone/drakgw_.c:222
msgid "Choose the network interface"
msgstr ""
-#: ../../netconnect.pm_.c:324
+#: ../../netconnect.pm_.c:337
msgid ""
"Please choose which network adapter you want to use to connect to Internet"
msgstr ""
-#: ../../netconnect.pm_.c:339 ../../netconnect.pm_.c:608
-#: ../../netconnect.pm_.c:735 ../../standalone/drakgw_.c:217
+#: ../../netconnect.pm_.c:352 ../../netconnect.pm_.c:625
+#: ../../netconnect.pm_.c:755 ../../standalone/drakgw_.c:217
msgid "Network interface"
msgstr ""
-#: ../../netconnect.pm_.c:340
-msgid "I'm about to restart the network device $device. Do you agree?"
+#: ../../netconnect.pm_.c:353
+msgid ""
+"\n"
+"Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:456
+#: ../../netconnect.pm_.c:353
+msgid "I'm about to restart the network device:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:469
msgid "ADSL configuration"
msgstr ""
-#: ../../netconnect.pm_.c:457
+#: ../../netconnect.pm_.c:470
msgid "Do you want to start your connection at boot?"
msgstr ""
-#: ../../netconnect.pm_.c:514
+#: ../../netconnect.pm_.c:530
msgid "Try to find a modem?"
msgstr ""
-#: ../../netconnect.pm_.c:524
+#: ../../netconnect.pm_.c:540
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../netconnect.pm_.c:529
+#: ../../netconnect.pm_.c:545
msgid "Dialup options"
msgstr ""
-#: ../../netconnect.pm_.c:530
+#: ../../netconnect.pm_.c:546
msgid "Connection name"
msgstr ""
-#: ../../netconnect.pm_.c:531
+#: ../../netconnect.pm_.c:547
msgid "Phone number"
msgstr ""
-#: ../../netconnect.pm_.c:532
+#: ../../netconnect.pm_.c:548
msgid "Login ID"
msgstr ""
-#: ../../netconnect.pm_.c:534
+#: ../../netconnect.pm_.c:550
msgid "Authentication"
msgstr ""
-#: ../../netconnect.pm_.c:534
+#: ../../netconnect.pm_.c:550
msgid "PAP"
msgstr ""
-#: ../../netconnect.pm_.c:534
+#: ../../netconnect.pm_.c:550
msgid "Script-based"
msgstr ""
-#: ../../netconnect.pm_.c:534
+#: ../../netconnect.pm_.c:550
msgid "Terminal-based"
msgstr ""
-#: ../../netconnect.pm_.c:535
+#: ../../netconnect.pm_.c:551
msgid "Domain name"
msgstr ""
-#: ../../netconnect.pm_.c:537
+#: ../../netconnect.pm_.c:553
msgid "First DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:538
+#: ../../netconnect.pm_.c:554
msgid "Second DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:567
+#: ../../netconnect.pm_.c:584
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:567 ../../netconnect.pm_.c:571
+#: ../../netconnect.pm_.c:584 ../../netconnect.pm_.c:588
msgid ""
"\n"
"You can reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:567
+#: ../../netconnect.pm_.c:584
msgid "You are not currently connected to Internet."
msgstr ""
-#: ../../netconnect.pm_.c:571
+#: ../../netconnect.pm_.c:588
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:571
+#: ../../netconnect.pm_.c:588
msgid "You are currently connected to internet."
msgstr ""
-#: ../../netconnect.pm_.c:575
+#: ../../netconnect.pm_.c:592
msgid "Connect to Internet"
msgstr ""
-#: ../../netconnect.pm_.c:577
+#: ../../netconnect.pm_.c:594
msgid "Disconnect from Internet"
msgstr ""
-#: ../../netconnect.pm_.c:579
+#: ../../netconnect.pm_.c:596
msgid "Configure network connection (LAN or Internet)"
msgstr ""
-#: ../../netconnect.pm_.c:582
+#: ../../netconnect.pm_.c:599
msgid "Internet connection & configuration"
msgstr ""
-#: ../../netconnect.pm_.c:609 ../../netconnect.pm_.c:736
+#: ../../netconnect.pm_.c:626 ../../netconnect.pm_.c:756
msgid ""
"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:625
+#: ../../netconnect.pm_.c:643
msgid "Configure a normal modem connection"
msgstr ""
-#: ../../netconnect.pm_.c:643
+#: ../../netconnect.pm_.c:662
msgid "Configure an ISDN connection"
msgstr ""
-#: ../../netconnect.pm_.c:648
+#: ../../netconnect.pm_.c:667
msgid "Internal ISDN card"
msgstr ""
-#: ../../netconnect.pm_.c:650
+#: ../../netconnect.pm_.c:669
msgid "External ISDN modem"
msgstr ""
-#: ../../netconnect.pm_.c:653 ../../netconnect.pm_.c:686
-#: ../../netconnect.pm_.c:698 ../../netconnect.pm_.c:722
-#: ../../netconnect.pm_.c:767
+#: ../../netconnect.pm_.c:672 ../../netconnect.pm_.c:706
+#: ../../netconnect.pm_.c:718 ../../netconnect.pm_.c:742
+#: ../../netconnect.pm_.c:787
msgid "Connect to the Internet"
msgstr ""
-#: ../../netconnect.pm_.c:654
+#: ../../netconnect.pm_.c:673
msgid "What kind is your ISDN connection?"
msgstr ""
-#: ../../netconnect.pm_.c:672
+#: ../../netconnect.pm_.c:692
msgid "Configure a DSL (or ADSL) connection"
msgstr ""
-#: ../../netconnect.pm_.c:681
+#: ../../netconnect.pm_.c:701
msgid "France"
msgstr ""
-#: ../../netconnect.pm_.c:683
+#: ../../netconnect.pm_.c:703
msgid "Other countries"
msgstr ""
-#: ../../netconnect.pm_.c:687
+#: ../../netconnect.pm_.c:707
msgid "In which country are you located ?"
msgstr ""
-#: ../../netconnect.pm_.c:693
+#: ../../netconnect.pm_.c:713
msgid "Alcatel modem"
msgstr ""
-#: ../../netconnect.pm_.c:695
+#: ../../netconnect.pm_.c:715
msgid "ECI modem"
msgstr ""
-#: ../../netconnect.pm_.c:699
+#: ../../netconnect.pm_.c:719
msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
msgstr ""
-#: ../../netconnect.pm_.c:717
+#: ../../netconnect.pm_.c:737
msgid "use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:719
+#: ../../netconnect.pm_.c:739
msgid "don't use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:723
+#: ../../netconnect.pm_.c:743
msgid ""
"The most common way to connect with adsl is dhcp + pppoe.\n"
"However, some connections only use dhcp.\n"
"If you don't know, choose 'use pppoe'"
msgstr ""
-#: ../../netconnect.pm_.c:746
+#: ../../netconnect.pm_.c:766
msgid "Configure a cable connection"
msgstr ""
-#: ../../netconnect.pm_.c:768
+#: ../../netconnect.pm_.c:788
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
msgstr ""
-#: ../../netconnect.pm_.c:781
+#: ../../netconnect.pm_.c:801
msgid "Disable Internet Connection"
msgstr ""
-#: ../../netconnect.pm_.c:792
+#: ../../netconnect.pm_.c:812
msgid "Configure local network"
msgstr ""
-#: ../../netconnect.pm_.c:796
+#: ../../netconnect.pm_.c:816
msgid "Network configuration"
msgstr ""
-#: ../../netconnect.pm_.c:797
+#: ../../netconnect.pm_.c:817
msgid "Do you want to restart the network"
msgstr ""
-#: ../../netconnect.pm_.c:805
+#: ../../netconnect.pm_.c:825
msgid "Disable networking"
msgstr ""
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:835
msgid "Configure the Internet connection / Configure local Network"
msgstr ""
-#: ../../netconnect.pm_.c:816
+#: ../../netconnect.pm_.c:836
msgid ""
"Local networking has already been configured.\n"
"Do you want to:"
msgstr ""
-#: ../../netconnect.pm_.c:817
+#: ../../netconnect.pm_.c:837
msgid "How do you want to connect to the Internet?"
msgstr ""
-#: ../../netconnect.pm_.c:838
+#: ../../netconnect.pm_.c:859
msgid "Network Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:860
msgid ""
"Now that your Internet connection is configured,\n"
"your computer can be configured to share its Internet connection.\n"
@@ -5639,149 +5677,149 @@ msgid "Finding leaves takes some time"
msgstr ""
#: ../../share/compssUsers
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Graphics Manipulation"
msgstr ""
#: ../../share/compssUsers
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
+msgid "Personnal Finance"
msgstr ""
#: ../../share/compssUsers
-msgid "Personnal Information Management"
+msgid "Databases"
msgstr ""
#: ../../share/compssUsers
-msgid "Tools to create and burn CD's"
+msgid "Internet"
msgstr ""
#: ../../share/compssUsers
-msgid "Internet Tools"
+msgid "Multimedia - Graphics"
msgstr ""
#: ../../share/compssUsers
-msgid "Internet"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
msgstr ""
#: ../../share/compssUsers
-msgid "Personnal Finance"
+msgid "Multimedia"
msgstr ""
#: ../../share/compssUsers
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Office"
msgstr ""
#: ../../share/compssUsers
-msgid "Graphics programs such as The Gimp"
+msgid "Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file transfer tools"
msgstr ""
#: ../../share/compssUsers
-msgid "Office"
+msgid "Set of tools to read and send mail and news (pine, mutt, tin..) and to browse the Web"
msgstr ""
#: ../../share/compssUsers
-msgid "Databases clients and servers (mysql and postgresql)"
+msgid "Communication facilities"
msgstr ""
#: ../../share/compssUsers
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "KDE"
msgstr ""
#: ../../share/compssUsers
-msgid "Multimedia - Graphics"
+msgid "Personnal Information Management"
msgstr ""
#: ../../share/compssUsers
-msgid "Video players and editors"
+msgid "Programs to manage your finance, such as gnucash"
msgstr ""
#: ../../share/compssUsers
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "Gnome"
msgstr ""
#: ../../share/compssUsers
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
+msgid "Documentation"
msgstr ""
#: ../../share/compssUsers
-msgid "Set of tools to read and send mail and news (pine, mutt, tin..) and to browse the Web"
+msgid "Internet Tools"
msgstr ""
#: ../../share/compssUsers
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
#: ../../share/compssUsers
-msgid "Chat (IRC or instant messaging) programs such as xchat, licq, gaim, and file transfer tools"
+msgid "Multimedia - Sound"
msgstr ""
#: ../../share/compssUsers
-msgid "Books and Howto's on Linux and Free Software"
+msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
#: ../../share/compssUsers
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Video players and editors"
msgstr ""
#: ../../share/compssUsers
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
+msgid "Databases clients and servers (mysql and postgresql)"
msgstr ""
#: ../../share/compssUsers
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Sound and video playing/editing programs"
msgstr ""
#: ../../share/compssUsers
-msgid "Multimedia - Video"
+msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: ../../share/compssUsers
-msgid "KDE"
+msgid "A graphical environment with user-friendly set of applications and desktop tools"
msgstr ""
#: ../../share/compssUsers
-msgid "Sound and video playing/editing programs"
+msgid "Games"
msgstr ""
#: ../../share/compssUsers
-msgid "Multimedia"
+msgid "Multimedia - Video"
msgstr ""
#: ../../share/compssUsers
-msgid "Other Graphical Desktops"
+msgid "Graphics programs such as The Gimp"
msgstr ""
#: ../../share/compssUsers
-msgid "Multimedia - Sound"
+msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
msgstr ""
#: ../../share/compssUsers
-msgid "Gnome"
+msgid "More Graphical Desktops (Gnome, IceWM)"
msgstr ""
#: ../../share/compssUsers
-msgid "Documentation"
+msgid "Tools to create and burn CD's"
msgstr ""
#: ../../share/compssUsers
-msgid "Programs to manage your finance, such as gnucash"
+msgid "Multimedia - CD Burning"
msgstr ""
#: ../../share/compssUsers
-msgid "Graphics Manipulation"
+msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
msgstr ""
#: ../../share/compssUsers
-msgid "Games"
+msgid "Other Graphical Desktops"
msgstr ""
#: ../../share/compssUsers
-msgid "Multimedia - CD Burning"
+msgid "Tools for your Palm Pilot or your Visor"
msgstr ""
#: ../../share/compssUsers
-msgid "Communication facilities"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
#: ../../share/compssUsers
-msgid "Databases"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
msgstr ""