summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-05 15:10:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-05 15:10:29 +0000
commitf0a8d0eaa8e8576e7c44eadfde8d6bc3e7299d58 (patch)
tree9f0eee22ab504192b25061faab3ecc1e67bc8130
parent139da3b3b9e267c546893f9b2955134eedfc648a (diff)
downloaddrakx-f0a8d0eaa8e8576e7c44eadfde8d6bc3e7299d58.tar
drakx-f0a8d0eaa8e8576e7c44eadfde8d6bc3e7299d58.tar.gz
drakx-f0a8d0eaa8e8576e7c44eadfde8d6bc3e7299d58.tar.bz2
drakx-f0a8d0eaa8e8576e7c44eadfde8d6bc3e7299d58.tar.xz
drakx-f0a8d0eaa8e8576e7c44eadfde8d6bc3e7299d58.zip
no_comment
-rw-r--r--perl-install/share/po/DrakX.pot685
-rw-r--r--perl-install/share/po/no.po729
-rw-r--r--perl-install/share/po/sp.po938
3 files changed, 1276 insertions, 1076 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index aa8e9ea6b..6630cb962 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-01-04 14:37+0100\n"
+"POT-Creation-Date: 2000-01-05 17:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,172 +92,172 @@ msgstr ""
msgid "Test configuration"
msgstr ""
-#: ../Xconfigurator.pm_.c:328
+#: ../Xconfigurator.pm_.c:329
msgid "An error occurred:"
msgstr ""
-#: ../Xconfigurator.pm_.c:330
+#: ../Xconfigurator.pm_.c:331
msgid ""
"\n"
"try changing some parameters"
msgstr ""
-#: ../Xconfigurator.pm_.c:351
+#: ../Xconfigurator.pm_.c:352
#, c-format
msgid "(leaving in %d seconds)"
msgstr ""
-#: ../Xconfigurator.pm_.c:355 ../my_gtk.pm_.c:425
+#: ../Xconfigurator.pm_.c:356 ../my_gtk.pm_.c:425
msgid "Is this correct?"
msgstr ""
-#: ../Xconfigurator.pm_.c:363
+#: ../Xconfigurator.pm_.c:364
msgid "An error occurred, try changing some parameters"
msgstr ""
-#: ../Xconfigurator.pm_.c:371 ../Xconfigurator.pm_.c:538
+#: ../Xconfigurator.pm_.c:372 ../Xconfigurator.pm_.c:541
msgid "Automatic resolutions"
msgstr ""
-#: ../Xconfigurator.pm_.c:372
+#: ../Xconfigurator.pm_.c:373
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
"You can switch if off if you want, you'll hear a beep when it's over"
msgstr ""
-#: ../Xconfigurator.pm_.c:425 ../printerdrake.pm_.c:210
+#: ../Xconfigurator.pm_.c:428 ../printerdrake.pm_.c:210
msgid "Resolution"
msgstr ""
-#: ../Xconfigurator.pm_.c:460
+#: ../Xconfigurator.pm_.c:463
msgid "Choose resolution and color depth"
msgstr ""
-#: ../Xconfigurator.pm_.c:468
+#: ../Xconfigurator.pm_.c:471
msgid "Show all"
msgstr ""
-#: ../Xconfigurator.pm_.c:492
+#: ../Xconfigurator.pm_.c:495
msgid "Resolutions"
msgstr ""
-#: ../Xconfigurator.pm_.c:539
+#: ../Xconfigurator.pm_.c:542
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
"Do you want to try?"
msgstr ""
-#: ../Xconfigurator.pm_.c:544
+#: ../Xconfigurator.pm_.c:547
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:758
+#: ../Xconfigurator.pm_.c:761
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:759
+#: ../Xconfigurator.pm_.c:762
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:760
+#: ../Xconfigurator.pm_.c:763
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:761
+#: ../Xconfigurator.pm_.c:764
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:762
+#: ../Xconfigurator.pm_.c:765
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:763
+#: ../Xconfigurator.pm_.c:766
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:764
+#: ../Xconfigurator.pm_.c:767
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:765
+#: ../Xconfigurator.pm_.c:768
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:766
+#: ../Xconfigurator.pm_.c:769
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:780
+#: ../Xconfigurator.pm_.c:783
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../Xconfigurator.pm_.c:794
+#: ../Xconfigurator.pm_.c:797
msgid "Change Monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:795
+#: ../Xconfigurator.pm_.c:798
msgid "Change Graphic card"
msgstr ""
-#: ../Xconfigurator.pm_.c:796
+#: ../Xconfigurator.pm_.c:799
msgid "Change Server options"
msgstr ""
-#: ../Xconfigurator.pm_.c:797
+#: ../Xconfigurator.pm_.c:800
msgid "Change Resolution"
msgstr ""
-#: ../Xconfigurator.pm_.c:798
+#: ../Xconfigurator.pm_.c:801
msgid "Automatical resolutions search"
msgstr ""
-#: ../Xconfigurator.pm_.c:802
+#: ../Xconfigurator.pm_.c:805
msgid "Show information"
msgstr ""
-#: ../Xconfigurator.pm_.c:803
+#: ../Xconfigurator.pm_.c:806
msgid "Test again"
msgstr ""
-#: ../Xconfigurator.pm_.c:804 ../standalone/rpmdrake_.c:46
+#: ../Xconfigurator.pm_.c:807 ../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr ""
-#: ../Xconfigurator.pm_.c:808
+#: ../Xconfigurator.pm_.c:811
msgid "What do you want to do?"
msgstr ""
-#: ../Xconfigurator.pm_.c:815
+#: ../Xconfigurator.pm_.c:818
msgid "Forget the changes?"
msgstr ""
-#: ../Xconfigurator.pm_.c:831
+#: ../Xconfigurator.pm_.c:834
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../Xconfigurator.pm_.c:847
+#: ../Xconfigurator.pm_.c:850
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../Xconfigurator.pm_.c:850
+#: ../Xconfigurator.pm_.c:853
msgid "X at startup"
msgstr ""
-#: ../Xconfigurator.pm_.c:851
+#: ../Xconfigurator.pm_.c:854
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -415,8 +415,8 @@ msgstr ""
msgid "Save on floppy"
msgstr ""
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:574
-#: ../install_steps_interactive.pm_.c:704 ../standalone/adduserdrake_.c:34
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:613
+#: ../install_steps_interactive.pm_.c:743 ../standalone/adduserdrake_.c:34
msgid "Done"
msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
msgid "all data on this partition will be lost"
msgstr ""
-#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:185 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:192 ../install_steps.pm_.c:67
#: ../install_steps_interactive.pm_.c:37 ../standalone/diskdrake_.c:60
#: ../standalone/rpmdrake_.c:294 ../standalone/rpmdrake_.c:304
msgid "Error"
@@ -702,7 +702,7 @@ msgstr ""
msgid "Formatting"
msgstr ""
-#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:214
+#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:221
#, c-format
msgid "Formatting partition %s"
msgstr ""
@@ -765,9 +765,8 @@ msgstr ""
msgid "Choose the new size"
msgstr ""
-#: ../diskdrake.pm_.c:534 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:327
-#: ../install_steps_gtk.pm_.c:376
+#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:317
+#: ../install_steps_gtk.pm_.c:361
msgid "MB"
msgstr ""
@@ -1403,8 +1402,8 @@ msgstr ""
msgid "Configure printer"
msgstr ""
-#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:533
+#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:572
msgid "Set root password"
msgstr ""
@@ -1455,44 +1454,44 @@ msgstr ""
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
-#: ../install_any.pm_.c:186 ../standalone/diskdrake_.c:61
+#: ../install_any.pm_.c:193 ../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
msgstr ""
-#: ../install_any.pm_.c:202
+#: ../install_any.pm_.c:209
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
msgstr ""
-#: ../install_any.pm_.c:212
+#: ../install_any.pm_.c:219
msgid "Searching root partition."
msgstr ""
-#: ../install_any.pm_.c:241
+#: ../install_any.pm_.c:248
msgid "Information"
msgstr ""
-#: ../install_any.pm_.c:242
+#: ../install_any.pm_.c:249
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr ""
-#: ../install_any.pm_.c:244
+#: ../install_any.pm_.c:251
msgid "No root partition found"
msgstr ""
-#: ../install_any.pm_.c:281
+#: ../install_any.pm_.c:288
msgid "Can't use broadcast with no NIS domain"
msgstr ""
-#: ../install_any.pm_.c:456
+#: ../install_any.pm_.c:463
msgid "Error reading file $f"
msgstr ""
-#: ../install_any.pm_.c:462
+#: ../install_any.pm_.c:469
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr ""
@@ -1508,7 +1507,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr ""
-#: ../install_steps.pm_.c:504
+#: ../install_steps.pm_.c:516
msgid "No floppy drive available"
msgstr ""
@@ -1517,129 +1516,123 @@ msgstr ""
msgid "Entering step `%s'\n"
msgstr ""
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:293
+#: ../install_steps_gtk.pm_.c:259
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:278
+msgid "Automatic resizing failed"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:294
msgid "You must have a swap partition"
msgstr ""
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:295
+#: ../install_steps_gtk.pm_.c:296
msgid ""
"You don't have a swap partition\n"
"\n"
"Continue anyway?"
msgstr ""
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:327
+#: ../install_steps_gtk.pm_.c:312
+msgid ""
+"Now that you've selected desired groups, please choose \n"
+"how many packages you want, ranging from minimal to full \n"
+"installation of each selected groups."
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:315
+msgid "You will be able to choose more precisely in next step"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:317
msgid "Choose the size you want to install"
msgstr ""
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:376
+#: ../install_steps_gtk.pm_.c:361
msgid "Total size: "
msgstr ""
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:388
-#: ../standalone/rpmdrake_.c:136
+#: ../install_steps_gtk.pm_.c:372
+msgid "Bad package"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:373 ../standalone/rpmdrake_.c:136
#, c-format
msgid "Version: %s\n"
msgstr ""
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:389
-#: ../standalone/rpmdrake_.c:137
+#: ../install_steps_gtk.pm_.c:374 ../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
msgstr ""
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:504
+#: ../install_steps_gtk.pm_.c:489
msgid "Choose the packages you want to install"
msgstr ""
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:507
+#: ../install_steps_gtk.pm_.c:492
msgid "Info"
msgstr ""
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:515
-#: ../install_steps_interactive.pm_.c:81 ../standalone/rpmdrake_.c:161
+#: ../install_steps_gtk.pm_.c:500 ../install_steps_interactive.pm_.c:81
+#: ../standalone/rpmdrake_.c:161
msgid "Install"
msgstr ""
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:534
-#: ../install_steps_interactive.pm_.c:268
+#: ../install_steps_gtk.pm_.c:519 ../install_steps_interactive.pm_.c:312
msgid "Installing"
msgstr ""
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:541
+#: ../install_steps_gtk.pm_.c:522
+msgid "Estimating"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:526
msgid "Please wait, "
msgstr ""
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:543
+#: ../install_steps_gtk.pm_.c:528
msgid "Time remaining "
msgstr ""
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:544
+#: ../install_steps_gtk.pm_.c:529
msgid "Total time "
msgstr ""
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:549
-#: ../install_steps_interactive.pm_.c:268
+#: ../install_steps_gtk.pm_.c:534 ../install_steps_interactive.pm_.c:312
msgid "Preparing installation"
msgstr ""
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:564
+#: ../install_steps_gtk.pm_.c:544
#, c-format
-msgid "Installing package %s"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:589
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:589
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:849
-msgid "Use existing configuration for X11?"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:259
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first run scandisk "
-"(and\n"
-"optionally run defrag) on this partition and backup your data.\n"
-"When sure, press Ok."
+msgid "%d packages"
msgstr ""
-#: ../install_steps_gtk.pm_.c:277
-msgid "Automatic resizing failed"
+#: ../install_steps_gtk.pm_.c:544
+msgid ", %U MB"
msgstr ""
-#: ../install_steps_gtk.pm_.c:324
+#: ../install_steps_gtk.pm_.c:549
#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:325
-msgid "You will be able to choose more precisely in next step"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:387
-msgid "Bad package"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:537
-msgid "Estimating"
+msgid "Installing package %s"
msgstr ""
-#: ../install_steps_gtk.pm_.c:559
-#, c-format
-msgid "%d packages"
+#: ../install_steps_gtk.pm_.c:574
+msgid "Go on anyway?"
msgstr ""
-#: ../install_steps_gtk.pm_.c:559
-msgid ", %U MB"
+#: ../install_steps_gtk.pm_.c:574
+msgid "There was an error ordering packages:"
msgstr ""
#: ../install_steps_interactive.pm_.c:37
@@ -1748,113 +1741,112 @@ msgstr ""
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
-#: ../install_steps_interactive.pm_.c:204
+#: ../install_steps_interactive.pm_.c:207
msgid "Choose the partitions you want to format"
msgstr ""
-#: ../install_steps_interactive.pm_.c:223
+#: ../install_steps_interactive.pm_.c:211
+msgid "Check bad blocks?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:230
msgid "Looking for available packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:236
msgid "Finding packages to upgrade"
msgstr ""
-#: ../install_steps_interactive.pm_.c:244
+#: ../install_steps_interactive.pm_.c:282
msgid "Package Group Selection"
msgstr ""
-#: ../install_steps_interactive.pm_.c:254
-#, c-format
-msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
-msgstr ""
-
-#: ../install_steps_interactive.pm_.c:277
+#: ../install_steps_interactive.pm_.c:321
msgid ""
"Installing package %s\n"
"%d%%"
msgstr ""
-#: ../install_steps_interactive.pm_.c:286
+#: ../install_steps_interactive.pm_.c:330
msgid "Post install configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:297
+#: ../install_steps_interactive.pm_.c:341
msgid "Keep the current IP configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:298
+#: ../install_steps_interactive.pm_.c:342
msgid "Reconfigure network now"
msgstr ""
-#: ../install_steps_interactive.pm_.c:299
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:343
+#: ../install_steps_interactive.pm_.c:355
msgid "Do not set up networking"
msgstr ""
-#: ../install_steps_interactive.pm_.c:301
-#: ../install_steps_interactive.pm_.c:309
+#: ../install_steps_interactive.pm_.c:345
+#: ../install_steps_interactive.pm_.c:353
msgid "Network Configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:302
+#: ../install_steps_interactive.pm_.c:346
msgid "Local networking has already been configured. Do you want to:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:310
+#: ../install_steps_interactive.pm_.c:354
msgid "Do you want to configure networking for your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:355
msgid "Dialup with modem"
msgstr ""
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:355
msgid "Local LAN"
msgstr ""
-#: ../install_steps_interactive.pm_.c:320
+#: ../install_steps_interactive.pm_.c:364
msgid "no network card found"
msgstr ""
-#: ../install_steps_interactive.pm_.c:350
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:394
+#: ../install_steps_interactive.pm_.c:395
#, c-format
msgid "Configuring network device %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:352
+#: ../install_steps_interactive.pm_.c:396
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:355
+#: ../install_steps_interactive.pm_.c:399
msgid "Automatic IP"
msgstr ""
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "IP address:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "Netmask:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:356
+#: ../install_steps_interactive.pm_.c:400
msgid "(bootp/dhcp)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:362 ../printerdrake.pm_.c:149
+#: ../install_steps_interactive.pm_.c:406 ../printerdrake.pm_.c:149
msgid "IP address should be in format 1.2.3.4"
msgstr ""
-#: ../install_steps_interactive.pm_.c:380
+#: ../install_steps_interactive.pm_.c:424
msgid "Configuring network"
msgstr ""
-#: ../install_steps_interactive.pm_.c:381
+#: ../install_steps_interactive.pm_.c:425
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -1862,90 +1854,90 @@ msgid ""
"You may also enter the IP address of the gateway if you have one"
msgstr ""
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "DNS server:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Gateway device:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Gateway:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Host name:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:442
msgid "Try to find a modem?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:408
+#: ../install_steps_interactive.pm_.c:452
msgid "Which serial port is your modem connected to?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:413
+#: ../install_steps_interactive.pm_.c:457
msgid "Dialup options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:414
+#: ../install_steps_interactive.pm_.c:458
msgid "Connection name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:415
+#: ../install_steps_interactive.pm_.c:459
msgid "Phone number"
msgstr ""
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:460
msgid "Login ID"
msgstr ""
-#: ../install_steps_interactive.pm_.c:417
-#: ../install_steps_interactive.pm_.c:534
-#: ../install_steps_interactive.pm_.c:580
-#: ../install_steps_interactive.pm_.c:680 ../standalone/adduserdrake_.c:40
+#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:573
+#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:719 ../standalone/adduserdrake_.c:40
msgid "Password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Authentication"
msgstr ""
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "CHAP"
msgstr ""
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "PAP"
msgstr ""
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Script-based"
msgstr ""
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Terminal-based"
msgstr ""
-#: ../install_steps_interactive.pm_.c:419
+#: ../install_steps_interactive.pm_.c:463
msgid "Domain name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:420
+#: ../install_steps_interactive.pm_.c:464
msgid "First DNS Server"
msgstr ""
-#: ../install_steps_interactive.pm_.c:421
+#: ../install_steps_interactive.pm_.c:465
msgid "Second DNS Server"
msgstr ""
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:478
msgid "Bringing up the network"
msgstr ""
-#: ../install_steps_interactive.pm_.c:443
+#: ../install_steps_interactive.pm_.c:487
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -1976,61 +1968,52 @@ msgid ""
"downloading of these software, to which customer and/or end user could\n"
"eventually have access after having sign up the present agreement.\n"
"\n"
-"The present agreement shall be governed and construed pursuant to the laws "
-"of\n"
-"France except to the extent that the application of local laws is required "
-"by\n"
-"mandatory laws of public order. However this agreement expressly excludes "
-"any\n"
-"conflict of laws, principles, choice of law or rule to the contrary. "
-"Therefore\n"
-"French laws shall prevail on any other local laws.\n"
"\n"
"For any queries relating to these agreement, please contact \n"
-"Mandrakesoft\n"
-"43, rue d'Aboukir\n"
-"75002 Paris\n"
-"FRANCE"
+"Mandrakesoft, Inc.\n"
+"2400 N. Lincoln Avenue Suite 243\n"
+"Altadena California 91001\n"
+"USA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:479
+#: ../install_steps_interactive.pm_.c:518
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:523
msgid "Contacting the mirror to get the list of available packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:527
msgid "Which packages do you want to install"
msgstr ""
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:529
msgid "Downloading cryptographic packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:500
+#: ../install_steps_interactive.pm_.c:539
msgid "Which is your timezone?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:501
+#: ../install_steps_interactive.pm_.c:540
msgid "Is your hardware clock set to GMT?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:550
msgid "Printer"
msgstr ""
-#: ../install_steps_interactive.pm_.c:512
+#: ../install_steps_interactive.pm_.c:551
msgid "Would you like to configure a printer?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:571
msgid "No password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:754 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:793 ../interactive.pm_.c:74
#: ../interactive.pm_.c:84 ../interactive.pm_.c:163
#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:425
@@ -2038,127 +2021,127 @@ msgstr ""
msgid "Ok"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535
-#: ../install_steps_interactive.pm_.c:581
-#: ../install_steps_interactive.pm_.c:681 ../standalone/adduserdrake_.c:41
+#: ../install_steps_interactive.pm_.c:574
+#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:720 ../standalone/adduserdrake_.c:41
msgid "Password (again)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:576
msgid "Use shadow file"
msgstr ""
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:576
msgid "shadow"
msgstr ""
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:577
msgid "MD5"
msgstr ""
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:577
msgid "Use MD5 passwords"
msgstr ""
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:579
msgid "Use NIS"
msgstr ""
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:579
msgid "yellow pages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:544
-#: ../install_steps_interactive.pm_.c:592
-#: ../install_steps_interactive.pm_.c:692 ../standalone/adduserdrake_.c:52
+#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:731 ../standalone/adduserdrake_.c:52
msgid "Please try again"
msgstr ""
-#: ../install_steps_interactive.pm_.c:544
-#: ../install_steps_interactive.pm_.c:592
-#: ../install_steps_interactive.pm_.c:692 ../standalone/adduserdrake_.c:52
+#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:731 ../standalone/adduserdrake_.c:52
msgid "The passwords do not match"
msgstr ""
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:585
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:553
+#: ../install_steps_interactive.pm_.c:592
msgid "Authentification NIS"
msgstr ""
-#: ../install_steps_interactive.pm_.c:554
+#: ../install_steps_interactive.pm_.c:593
msgid "NIS Domain"
msgstr ""
-#: ../install_steps_interactive.pm_.c:554
+#: ../install_steps_interactive.pm_.c:593
msgid "NIS Server"
msgstr ""
-#: ../install_steps_interactive.pm_.c:574 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:613 ../standalone/adduserdrake_.c:34
msgid "Accept user"
msgstr ""
-#: ../install_steps_interactive.pm_.c:574 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:613 ../standalone/adduserdrake_.c:34
msgid "Add user"
msgstr ""
-#: ../install_steps_interactive.pm_.c:575 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:35
#, c-format
msgid "(already added %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:575 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:35
#, c-format
msgid ""
"Enter a user\n"
"%s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:577 ../standalone/adduserdrake_.c:37
+#: ../install_steps_interactive.pm_.c:616 ../standalone/adduserdrake_.c:37
msgid "Real name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:578 ../standalone/adduserdrake_.c:38
+#: ../install_steps_interactive.pm_.c:617 ../standalone/adduserdrake_.c:38
msgid "User name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:583 ../standalone/adduserdrake_.c:43
+#: ../install_steps_interactive.pm_.c:622 ../standalone/adduserdrake_.c:43
msgid "Shell"
msgstr ""
-#: ../install_steps_interactive.pm_.c:593 ../standalone/adduserdrake_.c:53
+#: ../install_steps_interactive.pm_.c:632 ../standalone/adduserdrake_.c:53
msgid "This password is too simple"
msgstr ""
-#: ../install_steps_interactive.pm_.c:594 ../standalone/adduserdrake_.c:54
+#: ../install_steps_interactive.pm_.c:633 ../standalone/adduserdrake_.c:54
msgid "Please give a user name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:595 ../standalone/adduserdrake_.c:55
+#: ../install_steps_interactive.pm_.c:634 ../standalone/adduserdrake_.c:55
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: ../install_steps_interactive.pm_.c:596 ../standalone/adduserdrake_.c:56
+#: ../install_steps_interactive.pm_.c:635 ../standalone/adduserdrake_.c:56
msgid "This user name is already added"
msgstr ""
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:654
msgid "First drive"
msgstr ""
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:655
msgid "Second drive"
msgstr ""
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:656
msgid "Skip"
msgstr ""
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:661
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 "
@@ -2172,263 +2155,267 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:670
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../install_steps_interactive.pm_.c:634
+#: ../install_steps_interactive.pm_.c:673
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../install_steps_interactive.pm_.c:639
+#: ../install_steps_interactive.pm_.c:678
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:640
-#: ../install_steps_interactive.pm_.c:998
+#: ../install_steps_interactive.pm_.c:679
+#: ../install_steps_interactive.pm_.c:1037
msgid "Creating bootdisk"
msgstr ""
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:686
msgid "Preparing bootloader"
msgstr ""
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:698
msgid "First sector of boot partition"
msgstr ""
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:698
msgid "First sector of drive (MBR)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:703
msgid "LILO Installation"
msgstr ""
-#: ../install_steps_interactive.pm_.c:665
+#: ../install_steps_interactive.pm_.c:704
msgid "Where do you want to install the bootloader?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:710
msgid "Do you want to use LILO?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:713
msgid "Boot device"
msgstr ""
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:714
msgid "Linear (needed for some SCSI drives)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:714
msgid "linear"
msgstr ""
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:715
msgid "Compact"
msgstr ""
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:715
msgid "compact"
msgstr ""
-#: ../install_steps_interactive.pm_.c:677
+#: ../install_steps_interactive.pm_.c:716
msgid "Delay before booting default image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:717
msgid "Video mode"
msgstr ""
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:721
msgid "Restrict command line options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:721
msgid "restrict"
msgstr ""
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:727
msgid "LILO main options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:691
+#: ../install_steps_interactive.pm_.c:730
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:741
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../install_steps_interactive.pm_.c:704 ../standalone/rpmdrake_.c:302
+#: ../install_steps_interactive.pm_.c:743 ../standalone/rpmdrake_.c:302
msgid "Add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Linux"
msgstr ""
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Other OS (windows...)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Which type of entry do you want to add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:733
+#: ../install_steps_interactive.pm_.c:772
msgid "Image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:734
-#: ../install_steps_interactive.pm_.c:742
+#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:781
msgid "Root"
msgstr ""
-#: ../install_steps_interactive.pm_.c:735
+#: ../install_steps_interactive.pm_.c:774
msgid "Append"
msgstr ""
-#: ../install_steps_interactive.pm_.c:736
+#: ../install_steps_interactive.pm_.c:775
msgid "Initrd"
msgstr ""
-#: ../install_steps_interactive.pm_.c:737
+#: ../install_steps_interactive.pm_.c:776
msgid "Read-write"
msgstr ""
-#: ../install_steps_interactive.pm_.c:743
+#: ../install_steps_interactive.pm_.c:782
msgid "Table"
msgstr ""
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:783
msgid "Unsafe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:749
+#: ../install_steps_interactive.pm_.c:788
msgid "Label"
msgstr ""
-#: ../install_steps_interactive.pm_.c:751
+#: ../install_steps_interactive.pm_.c:790
msgid "Default"
msgstr ""
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:793
msgid "Remove entry"
msgstr ""
-#: ../install_steps_interactive.pm_.c:757
+#: ../install_steps_interactive.pm_.c:796
msgid "Empty label not allowed"
msgstr ""
-#: ../install_steps_interactive.pm_.c:758
+#: ../install_steps_interactive.pm_.c:797
msgid "This label is already in use"
msgstr ""
-#: ../install_steps_interactive.pm_.c:759
+#: ../install_steps_interactive.pm_.c:798
#, c-format
msgid "A entry %s already exists"
msgstr ""
-#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:812
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:787
+#: ../install_steps_interactive.pm_.c:826
msgid "Proxies configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:788
+#: ../install_steps_interactive.pm_.c:827
msgid "HTTP proxy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:828
msgid "FTP proxy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:795
+#: ../install_steps_interactive.pm_.c:834
msgid "Proxy should be http://..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:835
msgid "Proxy should be ftp://..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:806 ../standalone/draksec_.c:20
+#: ../install_steps_interactive.pm_.c:845 ../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr ""
-#: ../install_steps_interactive.pm_.c:807 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:846 ../standalone/draksec_.c:21
msgid "Poor"
msgstr ""
-#: ../install_steps_interactive.pm_.c:808 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:847 ../standalone/draksec_.c:22
msgid "Low"
msgstr ""
-#: ../install_steps_interactive.pm_.c:809 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:848 ../standalone/draksec_.c:23
msgid "Medium"
msgstr ""
-#: ../install_steps_interactive.pm_.c:810 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:849 ../standalone/draksec_.c:24
msgid "High"
msgstr ""
-#: ../install_steps_interactive.pm_.c:811 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:850 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr ""
-#: ../install_steps_interactive.pm_.c:824
+#: ../install_steps_interactive.pm_.c:863
msgid "Miscellaneous questions"
msgstr ""
-#: ../install_steps_interactive.pm_.c:825
+#: ../install_steps_interactive.pm_.c:864
msgid "(may cause data corruption)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:825
+#: ../install_steps_interactive.pm_.c:864
msgid "Use hard drive optimisations?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:826 ../standalone/draksec_.c:46
+#: ../install_steps_interactive.pm_.c:865 ../standalone/draksec_.c:46
msgid "Choose security level"
msgstr ""
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:866
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:867
msgid "Removable media automounting"
msgstr ""
-#: ../install_steps_interactive.pm_.c:830
+#: ../install_steps_interactive.pm_.c:869
msgid "Enable num lock at startup"
msgstr ""
-#: ../install_steps_interactive.pm_.c:833
+#: ../install_steps_interactive.pm_.c:872
msgid "Give the ram size in Mb"
msgstr ""
-#: ../install_steps_interactive.pm_.c:861
-#: ../install_steps_interactive.pm_.c:1031
+#: ../install_steps_interactive.pm_.c:888
+msgid "Use existing configuration for X11?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:900
+#: ../install_steps_interactive.pm_.c:1070
msgid "Try to find PCI devices?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:915
msgid ""
"Some steps are not completed.\n"
"\n"
"Do you really want to quit now?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:883
+#: ../install_steps_interactive.pm_.c:922
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2441,26 +2428,26 @@ msgid ""
"install chapter of the Official Linux-Mandrake User's Guide."
msgstr ""
-#: ../install_steps_interactive.pm_.c:892
+#: ../install_steps_interactive.pm_.c:931
msgid "Shutting down"
msgstr ""
-#: ../install_steps_interactive.pm_.c:906
+#: ../install_steps_interactive.pm_.c:945
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:907
+#: ../install_steps_interactive.pm_.c:946
#, c-format
msgid "(module %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:917
+#: ../install_steps_interactive.pm_.c:956
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:964
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2472,20 +2459,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:969
msgid "Autoprobe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:969
msgid "Specify options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:934
+#: ../install_steps_interactive.pm_.c:973
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../install_steps_interactive.pm_.c:940
+#: ../install_steps_interactive.pm_.c:979
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2493,82 +2480,82 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../install_steps_interactive.pm_.c:943
+#: ../install_steps_interactive.pm_.c:982
msgid "Module options:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:953
+#: ../install_steps_interactive.pm_.c:992
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:966
+#: ../install_steps_interactive.pm_.c:1005
msgid "Try to find PCMCIA cards?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:1006
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:1006
msgid "PCMCIA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:974
+#: ../install_steps_interactive.pm_.c:1013
msgid ""
"Linux does not yet fully support ultra dma 66 HPT.\n"
"As a work-around i can make a custom floppy giving access the hard drive on "
"ide2 and ide3"
msgstr ""
-#: ../install_steps_interactive.pm_.c:995
+#: ../install_steps_interactive.pm_.c:1034
msgid ""
"Enter a floppy to create an HTP enabled boot\n"
"(all data on floppy will be lost)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1012
+#: ../install_steps_interactive.pm_.c:1051
msgid "It is necessary to restart installation booting on the floppy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1013
+#: ../install_steps_interactive.pm_.c:1052
msgid "It is necessary to restart installation with the new parameters"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1017
+#: ../install_steps_interactive.pm_.c:1056
#, c-format
msgid ""
"Failed to create an HTP boot floppy.\n"
"You may have to restart installation and give ``%s'' at the prompt"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1037
+#: ../install_steps_interactive.pm_.c:1076
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1038
+#: ../install_steps_interactive.pm_.c:1077
msgid "Do you have another one?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1039
+#: ../install_steps_interactive.pm_.c:1078
#, c-format
msgid "Do you have any %s interface?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:1080 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
msgid "No"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:1080 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424
msgid "Yes"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1042
+#: ../install_steps_interactive.pm_.c:1081
msgid "See hardware info"
msgstr ""
@@ -2709,91 +2696,91 @@ msgstr ""
msgid "Latin American"
msgstr ""
-#: ../keyboard.pm_.c:111
+#: ../keyboard.pm_.c:112
msgid "Dutch"
msgstr ""
-#: ../keyboard.pm_.c:112
+#: ../keyboard.pm_.c:113
msgid "Lithuanian AZERTY"
msgstr ""
-#: ../keyboard.pm_.c:113
+#: ../keyboard.pm_.c:114
msgid "Lithuanian \"number row\" QWERTY"
msgstr ""
-#: ../keyboard.pm_.c:114
+#: ../keyboard.pm_.c:115
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr ""
-#: ../keyboard.pm_.c:115
+#: ../keyboard.pm_.c:116
msgid "Norwegian"
msgstr ""
-#: ../keyboard.pm_.c:116
+#: ../keyboard.pm_.c:117
msgid "Polish"
msgstr ""
-#: ../keyboard.pm_.c:117
+#: ../keyboard.pm_.c:118
msgid "Portuguese"
msgstr ""
-#: ../keyboard.pm_.c:118
+#: ../keyboard.pm_.c:119
msgid "Canadian (Quebec)"
msgstr ""
-#: ../keyboard.pm_.c:119
+#: ../keyboard.pm_.c:120
msgid "Russian"
msgstr ""
-#: ../keyboard.pm_.c:120
+#: ../keyboard.pm_.c:121
msgid "Russian (Yawerty)"
msgstr ""
-#: ../keyboard.pm_.c:121
+#: ../keyboard.pm_.c:122
msgid "Swedish"
msgstr ""
-#: ../keyboard.pm_.c:122
+#: ../keyboard.pm_.c:123
msgid "Slovenian"
msgstr ""
-#: ../keyboard.pm_.c:123
+#: ../keyboard.pm_.c:124
msgid "Slovakian"
msgstr ""
-#: ../keyboard.pm_.c:124
+#: ../keyboard.pm_.c:125
msgid "Thai keyboard"
msgstr ""
-#: ../keyboard.pm_.c:125
+#: ../keyboard.pm_.c:126
msgid "Turkish (traditional \"F\" model)"
msgstr ""
-#: ../keyboard.pm_.c:126
+#: ../keyboard.pm_.c:127
msgid "Turkish (modern \"Q\" model)"
msgstr ""
-#: ../keyboard.pm_.c:127
+#: ../keyboard.pm_.c:128
msgid "Ukrainian"
msgstr ""
-#: ../keyboard.pm_.c:128
+#: ../keyboard.pm_.c:129
msgid "UK keyboard"
msgstr ""
-#: ../keyboard.pm_.c:129
+#: ../keyboard.pm_.c:130
msgid "US keyboard"
msgstr ""
-#: ../keyboard.pm_.c:130
+#: ../keyboard.pm_.c:131
msgid "US keyboard (international)"
msgstr ""
-#: ../keyboard.pm_.c:131
+#: ../keyboard.pm_.c:132
msgid "Yugoslavian (latin layout)"
msgstr ""
-#: ../lilo.pm_.c:142
+#: ../lilo.pm_.c:145
#, c-format
msgid ""
"Welcome to LILO the operating system chooser!\n"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index cbe3919f8..49f516d8d 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-01-04 14:37+0100\n"
+"POT-Creation-Date: 2000-01-05 17:50+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -101,11 +101,11 @@ msgstr "Advarsel: testing er farlig med dette grafikk-kortet"
msgid "Test configuration"
msgstr "Test konfigurasjon"
-#: ../Xconfigurator.pm_.c:328
+#: ../Xconfigurator.pm_.c:329
msgid "An error occurred:"
msgstr "En feil oppsto:"
-#: ../Xconfigurator.pm_.c:330
+#: ../Xconfigurator.pm_.c:331
msgid ""
"\n"
"try changing some parameters"
@@ -113,24 +113,24 @@ msgstr ""
"\n"
"pr�v � endre noen parametere"
-#: ../Xconfigurator.pm_.c:351
+#: ../Xconfigurator.pm_.c:352
#, c-format
msgid "(leaving in %d seconds)"
msgstr "(slutter om %d sekunder)"
-#: ../Xconfigurator.pm_.c:355 ../my_gtk.pm_.c:425
+#: ../Xconfigurator.pm_.c:356 ../my_gtk.pm_.c:425
msgid "Is this correct?"
msgstr "Er dette riktig?"
-#: ../Xconfigurator.pm_.c:363
+#: ../Xconfigurator.pm_.c:364
msgid "An error occurred, try changing some parameters"
msgstr "En feil oppsto, pr�v � endre noen parametere"
-#: ../Xconfigurator.pm_.c:371 ../Xconfigurator.pm_.c:538
+#: ../Xconfigurator.pm_.c:372 ../Xconfigurator.pm_.c:541
msgid "Automatic resolutions"
msgstr "Automatiske oppl�sninger"
-#: ../Xconfigurator.pm_.c:372
+#: ../Xconfigurator.pm_.c:373
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -140,23 +140,23 @@ msgstr ""
"Skjermen din vil blinke...\n"
"Du kan sl� av hvis du vil, du vil h�re et bipp n�r det er ferdig"
-#: ../Xconfigurator.pm_.c:425 ../printerdrake.pm_.c:210
+#: ../Xconfigurator.pm_.c:428 ../printerdrake.pm_.c:210
msgid "Resolution"
msgstr "Oppl�sning"
-#: ../Xconfigurator.pm_.c:460
+#: ../Xconfigurator.pm_.c:463
msgid "Choose resolution and color depth"
msgstr "Velg oppl�sning og fargedybde"
-#: ../Xconfigurator.pm_.c:468
+#: ../Xconfigurator.pm_.c:471
msgid "Show all"
msgstr "Vis alle"
-#: ../Xconfigurator.pm_.c:492
+#: ../Xconfigurator.pm_.c:495
msgid "Resolutions"
msgstr "Oppl�sninger"
-#: ../Xconfigurator.pm_.c:539
+#: ../Xconfigurator.pm_.c:542
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -166,7 +166,7 @@ msgstr ""
"Noen ganger kan dette for�rsake at maskinen stopper opp.\n"
"�nsker du � pr�ve?"
-#: ../Xconfigurator.pm_.c:544
+#: ../Xconfigurator.pm_.c:547
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -174,109 +174,109 @@ msgstr ""
"Ingen gyldige modus funnet\n"
"Pr�v med et annet skjermkort eller monitor"
-#: ../Xconfigurator.pm_.c:758
+#: ../Xconfigurator.pm_.c:761
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../Xconfigurator.pm_.c:759
+#: ../Xconfigurator.pm_.c:762
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../Xconfigurator.pm_.c:760
+#: ../Xconfigurator.pm_.c:763
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../Xconfigurator.pm_.c:761
+#: ../Xconfigurator.pm_.c:764
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../Xconfigurator.pm_.c:762
+#: ../Xconfigurator.pm_.c:765
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../Xconfigurator.pm_.c:763
+#: ../Xconfigurator.pm_.c:766
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../Xconfigurator.pm_.c:764
+#: ../Xconfigurator.pm_.c:767
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../Xconfigurator.pm_.c:765
+#: ../Xconfigurator.pm_.c:768
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../Xconfigurator.pm_.c:766
+#: ../Xconfigurator.pm_.c:769
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../Xconfigurator.pm_.c:780
+#: ../Xconfigurator.pm_.c:783
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../Xconfigurator.pm_.c:794
+#: ../Xconfigurator.pm_.c:797
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../Xconfigurator.pm_.c:795
+#: ../Xconfigurator.pm_.c:798
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../Xconfigurator.pm_.c:796
+#: ../Xconfigurator.pm_.c:799
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../Xconfigurator.pm_.c:797
+#: ../Xconfigurator.pm_.c:800
msgid "Change Resolution"
msgstr "Endre oppl�sning"
-#: ../Xconfigurator.pm_.c:798
+#: ../Xconfigurator.pm_.c:801
msgid "Automatical resolutions search"
msgstr "Automatisk oppl�sningss�k"
-#: ../Xconfigurator.pm_.c:802
+#: ../Xconfigurator.pm_.c:805
msgid "Show information"
msgstr "Vis informasjon"
-#: ../Xconfigurator.pm_.c:803
+#: ../Xconfigurator.pm_.c:806
msgid "Test again"
msgstr "Test igjen"
-#: ../Xconfigurator.pm_.c:804 ../standalone/rpmdrake_.c:46
+#: ../Xconfigurator.pm_.c:807 ../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Avslutt"
-#: ../Xconfigurator.pm_.c:808
+#: ../Xconfigurator.pm_.c:811
msgid "What do you want to do?"
msgstr "Hva �nsker du � gj�re?"
-#: ../Xconfigurator.pm_.c:815
+#: ../Xconfigurator.pm_.c:818
msgid "Forget the changes?"
msgstr "Glem endringene?"
-#: ../Xconfigurator.pm_.c:831
+#: ../Xconfigurator.pm_.c:834
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Vennligst logg inn i %s p� nytt for � aktivere endringene"
-#: ../Xconfigurator.pm_.c:847
+#: ../Xconfigurator.pm_.c:850
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk s� Ctrl-Alt-BackSpace"
-#: ../Xconfigurator.pm_.c:850
+#: ../Xconfigurator.pm_.c:853
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../Xconfigurator.pm_.c:851
+#: ../Xconfigurator.pm_.c:854
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -436,8 +436,8 @@ msgstr "Gjenopprett fra diskett"
msgid "Save on floppy"
msgstr "Lagre p� diskett"
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:574
-#: ../install_steps_interactive.pm_.c:704 ../standalone/adduserdrake_.c:34
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:613
+#: ../install_steps_interactive.pm_.c:743 ../standalone/adduserdrake_.c:34
msgid "Done"
msgstr "Ferdig"
@@ -544,7 +544,7 @@ msgid "all data on this partition will be lost"
msgstr "alle data p� denne partisjonen vil g� tapt"
# #: ../install_steps_interactive.pm_.c:37
-#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:185 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:192 ../install_steps.pm_.c:67
#: ../install_steps_interactive.pm_.c:37 ../standalone/diskdrake_.c:60
#: ../standalone/rpmdrake_.c:294 ../standalone/rpmdrake_.c:304
msgid "Error"
@@ -741,7 +741,7 @@ msgstr "formatering"
msgid "Formatting"
msgstr "Formatering"
-#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:214
+#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:221
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
@@ -804,9 +804,8 @@ msgstr "endrer st�rrelse"
msgid "Choose the new size"
msgstr "Velg den nye st�rrelsen"
-#: ../diskdrake.pm_.c:534 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:327
-#: ../install_steps_gtk.pm_.c:376
+#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:317
+#: ../install_steps_gtk.pm_.c:361
msgid "MB"
msgstr "MB"
@@ -1780,8 +1779,8 @@ msgstr "Konfigurer tidssone"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:533
+#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:572
msgid "Set root password"
msgstr "Sett root-passord"
@@ -1836,7 +1835,7 @@ msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
"Ikke nok vekslingsplass til � fullf�re installasjonen, vennligst legg til mer"
-#: ../install_any.pm_.c:186 ../standalone/diskdrake_.c:61
+#: ../install_any.pm_.c:193 ../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
@@ -1844,7 +1843,7 @@ msgstr ""
"Jeg kan ikke lese partisjonstabellen din, den er for �delagt for meg :(\n"
"Jeg vil f�rs�ke � blanke ut d�rlige partisjoner"
-#: ../install_any.pm_.c:202
+#: ../install_any.pm_.c:209
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -1852,32 +1851,32 @@ msgstr ""
"DiskDrake klarte ikke � lese partisjonstabellen korrekt.\n"
"Fortsett p� eget ansvar!"
-#: ../install_any.pm_.c:212
+#: ../install_any.pm_.c:219
msgid "Searching root partition."
msgstr "S�ker root-partisjon."
-#: ../install_any.pm_.c:241
+#: ../install_any.pm_.c:248
msgid "Information"
msgstr "Informasjon"
-#: ../install_any.pm_.c:242
+#: ../install_any.pm_.c:249
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen."
-#: ../install_any.pm_.c:244
+#: ../install_any.pm_.c:251
msgid "No root partition found"
msgstr "Ingen root-partisjon funnet"
-#: ../install_any.pm_.c:281
+#: ../install_any.pm_.c:288
msgid "Can't use broadcast with no NIS domain"
msgstr "Kan ikke bruke broadcast uten NIS-domene"
-#: ../install_any.pm_.c:456
+#: ../install_any.pm_.c:463
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
-#: ../install_any.pm_.c:462
+#: ../install_any.pm_.c:469
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr "D�rlig kickstart-fil %s (mislykket %s)"
@@ -1896,7 +1895,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "Dupliser monteringspunkt %s"
-#: ../install_steps.pm_.c:504
+#: ../install_steps.pm_.c:516
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
@@ -1905,11 +1904,37 @@ msgstr "Ingen diskettstasjon tilgjengelig"
msgid "Entering step `%s'\n"
msgstr "Entrer trinn `%s'\n"
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:293
+#: ../install_steps_gtk.pm_.c:259
+#, fuzzy
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+"ADVARSEL!\n"
+"\n"
+"DrakX trenger n� � endre st�rrelsen p� Windows partisjonen din. V�r "
+"forsiktig: denne operasjonen er\n"
+"farlig. Hvis du ikke allerede har gjort det burde du kj�re scandisk f�rst "
+"(og\n"
+"som en opsjon kj�re defrag) p� denne partisjonen og ta sikkerhetskopi av "
+"dine data.\n"
+"N�r du er sikker, trykk Ok."
+
+#: ../install_steps_gtk.pm_.c:278
+msgid "Automatic resizing failed"
+msgstr "Automatisk endring av st�rrelse mislykket"
+
+#: ../install_steps_gtk.pm_.c:294
msgid "You must have a swap partition"
msgstr "Du m� ha en vekslingspartisjon"
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:295
+#: ../install_steps_gtk.pm_.c:296
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -1919,129 +1944,98 @@ msgstr ""
"\n"
"Fortsette likevel?"
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:327
+#: ../install_steps_gtk.pm_.c:312
+msgid ""
+"Now that you've selected desired groups, please choose \n"
+"how many packages you want, ranging from minimal to full \n"
+"installation of each selected groups."
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:315
+msgid "You will be able to choose more precisely in next step"
+msgstr "Du vil kunne velge mere presist i neste trinn"
+
+#: ../install_steps_gtk.pm_.c:317
msgid "Choose the size you want to install"
msgstr "Velg st�rrelsen du �nsker � installere"
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:376
+#: ../install_steps_gtk.pm_.c:361
msgid "Total size: "
msgstr "Total st�rrelse: "
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:388
-#: ../standalone/rpmdrake_.c:136
+#: ../install_steps_gtk.pm_.c:372
+msgid "Bad package"
+msgstr "D�rlig pakke"
+
+#: ../install_steps_gtk.pm_.c:373 ../standalone/rpmdrake_.c:136
#, c-format
msgid "Version: %s\n"
msgstr "Versjon: %s\n"
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:389
-#: ../standalone/rpmdrake_.c:137
+#: ../install_steps_gtk.pm_.c:374 ../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
msgstr "St�rrelse: %d KB\n"
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:504
+#: ../install_steps_gtk.pm_.c:489
msgid "Choose the packages you want to install"
msgstr "Velg pakkene du �nsker � installere"
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:507
+#: ../install_steps_gtk.pm_.c:492
msgid "Info"
msgstr "Info"
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:515
-#: ../install_steps_interactive.pm_.c:81 ../standalone/rpmdrake_.c:161
+#: ../install_steps_gtk.pm_.c:500 ../install_steps_interactive.pm_.c:81
+#: ../standalone/rpmdrake_.c:161
msgid "Install"
msgstr "Installer"
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:534
-#: ../install_steps_interactive.pm_.c:268
+#: ../install_steps_gtk.pm_.c:519 ../install_steps_interactive.pm_.c:312
msgid "Installing"
msgstr "Installerer"
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:541
+#: ../install_steps_gtk.pm_.c:522
+msgid "Estimating"
+msgstr "Beregner"
+
+#: ../install_steps_gtk.pm_.c:526
msgid "Please wait, "
msgstr "Vennligst vent, "
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:543
+#: ../install_steps_gtk.pm_.c:528
msgid "Time remaining "
msgstr "Tid som gjenst�r "
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:544
+#: ../install_steps_gtk.pm_.c:529
msgid "Total time "
msgstr "Total tid "
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:549
-#: ../install_steps_interactive.pm_.c:268
+#: ../install_steps_gtk.pm_.c:534 ../install_steps_interactive.pm_.c:312
msgid "Preparing installation"
msgstr "Forbereder installasjon"
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:564
+#: ../install_steps_gtk.pm_.c:544
+#, c-format
+msgid "%d packages"
+msgstr "%d pakker"
+
+#: ../install_steps_gtk.pm_.c:544
+msgid ", %U MB"
+msgstr ", %U MB"
+
+#: ../install_steps_gtk.pm_.c:549
#, c-format
msgid "Installing package %s"
msgstr "Installerer pakke %s"
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:589
+#: ../install_steps_gtk.pm_.c:574
msgid "Go on anyway?"
msgstr "Fortsette uansett?"
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:589
+#: ../install_steps_gtk.pm_.c:574
msgid "There was an error ordering packages:"
msgstr "Det var en feil ved endring av pakkenes rekkef�lge:"
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:849
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
-#: ../install_steps_gtk.pm_.c:259
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first run scandisk "
-"(and\n"
-"optionally run defrag) on this partition and backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"ADVARSEL!\n"
-"\n"
-"DrakX trenger n� � endre st�rrelsen p� Windows partisjonen din. V�r "
-"forsiktig: denne operasjonen er\n"
-"farlig. Hvis du ikke allerede har gjort det burde du kj�re scandisk f�rst "
-"(og\n"
-"som en opsjon kj�re defrag) p� denne partisjonen og ta sikkerhetskopi av "
-"dine data.\n"
-"N�r du er sikker, trykk Ok."
-
-#: ../install_steps_gtk.pm_.c:277
-msgid "Automatic resizing failed"
-msgstr "Automatisk endring av st�rrelse mislykket"
-
-#: ../install_steps_gtk.pm_.c:324
-#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr "%d MB vil bli installert. Du kan velge � installere flere programmer"
-
-#: ../install_steps_gtk.pm_.c:325
-msgid "You will be able to choose more precisely in next step"
-msgstr "Du vil kunne velge mere presist i neste trinn"
-
-#: ../install_steps_gtk.pm_.c:387
-msgid "Bad package"
-msgstr "D�rlig pakke"
-
-#: ../install_steps_gtk.pm_.c:537
-msgid "Estimating"
-msgstr "Beregner"
-
-#: ../install_steps_gtk.pm_.c:559
-#, c-format
-msgid "%d packages"
-msgstr "%d pakker"
-
-#: ../install_steps_gtk.pm_.c:559
-msgid ", %U MB"
-msgstr ", %U MB"
-
#: ../install_steps_interactive.pm_.c:37
msgid "An error occurred"
msgstr "En feil oppsto"
@@ -2150,28 +2144,27 @@ msgstr ""
"Du m� starte maskinen p� nytt for at modifiseringene av partisjonstabellen\n"
"skal tre i kraft"
-#: ../install_steps_interactive.pm_.c:204
+#: ../install_steps_interactive.pm_.c:207
msgid "Choose the partitions you want to format"
msgstr "Velg de partisjonene du �nsker � formatere"
-#: ../install_steps_interactive.pm_.c:223
+#: ../install_steps_interactive.pm_.c:211
+msgid "Check bad blocks?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:230
msgid "Looking for available packages"
msgstr "Ser etter tilgjengelige pakker"
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:236
msgid "Finding packages to upgrade"
msgstr "Finner pakker � oppgradere"
-#: ../install_steps_interactive.pm_.c:244
+#: ../install_steps_interactive.pm_.c:282
msgid "Package Group Selection"
msgstr "Valg pakkegruppe"
-#: ../install_steps_interactive.pm_.c:254
-#, c-format
-msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
-msgstr "For mange pakker er valgt: %dMB passer ikke i %dMB"
-
-#: ../install_steps_interactive.pm_.c:277
+#: ../install_steps_interactive.pm_.c:321
msgid ""
"Installing package %s\n"
"%d%%"
@@ -2179,55 +2172,55 @@ msgstr ""
"Installerer pakke %s\n"
"%d%%"
-#: ../install_steps_interactive.pm_.c:286
+#: ../install_steps_interactive.pm_.c:330
msgid "Post install configuration"
msgstr "Konfigurasjon postinstallering"
-#: ../install_steps_interactive.pm_.c:297
+#: ../install_steps_interactive.pm_.c:341
msgid "Keep the current IP configuration"
msgstr "Behold n�v�rende IP-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:298
+#: ../install_steps_interactive.pm_.c:342
msgid "Reconfigure network now"
msgstr "Rekonfigurer nettverket n�"
-#: ../install_steps_interactive.pm_.c:299
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:343
+#: ../install_steps_interactive.pm_.c:355
msgid "Do not set up networking"
msgstr "Ikke sett opp nettverk"
-#: ../install_steps_interactive.pm_.c:301
-#: ../install_steps_interactive.pm_.c:309
+#: ../install_steps_interactive.pm_.c:345
+#: ../install_steps_interactive.pm_.c:353
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../install_steps_interactive.pm_.c:302
+#: ../install_steps_interactive.pm_.c:346
msgid "Local networking has already been configured. Do you want to:"
msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:"
-#: ../install_steps_interactive.pm_.c:310
+#: ../install_steps_interactive.pm_.c:354
msgid "Do you want to configure networking for your system?"
msgstr "Vil du konfigurere nettverk for systemet ditt?"
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:355
msgid "Dialup with modem"
msgstr "Oppringt med modem"
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:355
msgid "Local LAN"
msgstr "Lokalt LAN"
-#: ../install_steps_interactive.pm_.c:320
+#: ../install_steps_interactive.pm_.c:364
msgid "no network card found"
msgstr "ingen nettverkskort funnet"
-#: ../install_steps_interactive.pm_.c:350
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:394
+#: ../install_steps_interactive.pm_.c:395
#, c-format
msgid "Configuring network device %s"
msgstr "Konfigurerer nettverksenhet %s"
-#: ../install_steps_interactive.pm_.c:352
+#: ../install_steps_interactive.pm_.c:396
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -2237,31 +2230,31 @@ msgstr ""
"Hvert element b�r entres som en IP-adresse i punkt-desimal\n"
"notasjon (f.eks, 1.2.3.4)."
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "Automatic IP"
msgstr "Automatisk IP"
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "IP address:"
msgstr "IP-adresse:"
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "Netmask:"
msgstr "Nettmaske:"
-#: ../install_steps_interactive.pm_.c:356
+#: ../install_steps_interactive.pm_.c:400
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../install_steps_interactive.pm_.c:362 ../printerdrake.pm_.c:149
+#: ../install_steps_interactive.pm_.c:406 ../printerdrake.pm_.c:149
msgid "IP address should be in format 1.2.3.4"
msgstr "IP-adresse b�r v�re i format 1.2.3.4"
-#: ../install_steps_interactive.pm_.c:380
+#: ../install_steps_interactive.pm_.c:424
msgid "Configuring network"
msgstr "Konfigurerer nettverk"
-#: ../install_steps_interactive.pm_.c:381
+#: ../install_steps_interactive.pm_.c:425
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2273,90 +2266,90 @@ msgstr ""
"s� som ``minboks.mittlab.mittfirma.no''.\n"
"Du kan ogs� entre IP-adressen til gateway'en hvis du har en"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "DNS server:"
msgstr "DNS-tjener:"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Gateway device:"
msgstr "Gateway-enhet:"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Gateway:"
msgstr "Gateway:"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Host name:"
msgstr "Vertsnavn:"
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:442
msgid "Try to find a modem?"
msgstr "Pr�ve � finne et modem?"
-#: ../install_steps_interactive.pm_.c:408
+#: ../install_steps_interactive.pm_.c:452
msgid "Which serial port is your modem connected to?"
msgstr "Hvilken serieport er modemet ditt koblet til?"
-#: ../install_steps_interactive.pm_.c:413
+#: ../install_steps_interactive.pm_.c:457
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../install_steps_interactive.pm_.c:414
+#: ../install_steps_interactive.pm_.c:458
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../install_steps_interactive.pm_.c:415
+#: ../install_steps_interactive.pm_.c:459
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:460
msgid "Login ID"
msgstr "Login ID"
-#: ../install_steps_interactive.pm_.c:417
-#: ../install_steps_interactive.pm_.c:534
-#: ../install_steps_interactive.pm_.c:580
-#: ../install_steps_interactive.pm_.c:680 ../standalone/adduserdrake_.c:40
+#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:573
+#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:719 ../standalone/adduserdrake_.c:40
msgid "Password"
msgstr "Passord"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "CHAP"
msgstr "CHAP"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "PAP"
msgstr "PAP"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../install_steps_interactive.pm_.c:419
+#: ../install_steps_interactive.pm_.c:463
msgid "Domain name"
msgstr "Domenenavn"
-#: ../install_steps_interactive.pm_.c:420
+#: ../install_steps_interactive.pm_.c:464
msgid "First DNS Server"
msgstr "F�rste DNS-tjener"
-#: ../install_steps_interactive.pm_.c:421
+#: ../install_steps_interactive.pm_.c:465
msgid "Second DNS Server"
msgstr "Andre DNS-tjener"
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:478
msgid "Bringing up the network"
msgstr "Henter opp nettverket"
-#: ../install_steps_interactive.pm_.c:443
+#: ../install_steps_interactive.pm_.c:487
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -2387,21 +2380,12 @@ msgid ""
"downloading of these software, to which customer and/or end user could\n"
"eventually have access after having sign up the present agreement.\n"
"\n"
-"The present agreement shall be governed and construed pursuant to the laws "
-"of\n"
-"France except to the extent that the application of local laws is required "
-"by\n"
-"mandatory laws of public order. However this agreement expressly excludes "
-"any\n"
-"conflict of laws, principles, choice of law or rule to the contrary. "
-"Therefore\n"
-"French laws shall prevail on any other local laws.\n"
"\n"
"For any queries relating to these agreement, please contact \n"
-"Mandrakesoft\n"
-"43, rue d'Aboukir\n"
-"75002 Paris\n"
-"FRANCE"
+"Mandrakesoft, Inc.\n"
+"2400 N. Lincoln Avenue Suite 243\n"
+"Altadena California 91001\n"
+"USA"
msgstr ""
"Du har n� muligheten til � laste ned programvare for kryptering.\n"
"\n"
@@ -2427,57 +2411,51 @@ msgstr ""
"sluttbruker til slutt kan ha tilgang til etter � ha sagt seg enig i og\n"
"undertegnet fremviste avtale.\n"
"\n"
-"Denne avtalen skal h�ndheves og tolkes etter lovene i Frankrike med unntak\n"
-"i den grad som anvendelsen av lokale lover er krevet av gjeldene lover og\n"
-"vedtekter. Imidlertid utelukker denne avtalen tvert imot en hver "
-"lovkonflikt,\n"
-"regler, valg av lover eller regler. Derfor skal franske lover st� over alle\n"
-"andre lokale lover.\n"
"\n"
"For sp�rsm�l ang�ende denne avtalen, vennligst kontakt\n"
-"Mandrakesoft\n"
-"43, rue d'Aboukir,\n"
-"75002 Paris\n"
-"FRANCE"
+"Mandrakesoft, Inc.\n"
+"2400 N. Lincoln Avenue Suite 243,\n"
+"Altadena California 91001\n"
+"USA"
-#: ../install_steps_interactive.pm_.c:479
+#: ../install_steps_interactive.pm_.c:518
msgid "Choose a mirror from which to get the packages"
msgstr "Velg et speil som pakkene kan hentes fra"
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:523
msgid "Contacting the mirror to get the list of available packages"
msgstr "Kontakter speilet for � f� en liste over tilgjengelige pakker"
-#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:527
msgid "Which packages do you want to install"
msgstr "Hvilke pakker �nsker du � installere"
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:529
msgid "Downloading cryptographic packages"
msgstr "Laster ned kryptografiske pakker"
-#: ../install_steps_interactive.pm_.c:500
+#: ../install_steps_interactive.pm_.c:539
msgid "Which is your timezone?"
msgstr "Hvilken er din tidsone?"
-#: ../install_steps_interactive.pm_.c:501
+#: ../install_steps_interactive.pm_.c:540
msgid "Is your hardware clock set to GMT?"
msgstr "Er maskinvareklokken din satt til GMT?"
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:550
msgid "Printer"
msgstr "Skriver"
-#: ../install_steps_interactive.pm_.c:512
+#: ../install_steps_interactive.pm_.c:551
msgid "Would you like to configure a printer?"
msgstr "�nsker du � konfigurere en skriver?"
-#: ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:571
msgid "No password"
msgstr "Intet passord"
-#: ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:754 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:793 ../interactive.pm_.c:74
#: ../interactive.pm_.c:84 ../interactive.pm_.c:163
#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:425
@@ -2485,79 +2463,79 @@ msgstr "Intet passord"
msgid "Ok"
msgstr "Ok"
-#: ../install_steps_interactive.pm_.c:535
-#: ../install_steps_interactive.pm_.c:581
-#: ../install_steps_interactive.pm_.c:681 ../standalone/adduserdrake_.c:41
+#: ../install_steps_interactive.pm_.c:574
+#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:720 ../standalone/adduserdrake_.c:41
msgid "Password (again)"
msgstr "Passord (igjen)"
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:576
msgid "Use shadow file"
msgstr "Bruk skyggefil"
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:576
msgid "shadow"
msgstr "skygge"
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:577
msgid "MD5"
msgstr "MD5"
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:577
msgid "Use MD5 passwords"
msgstr "Bruk MD5 passord"
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:579
msgid "Use NIS"
msgstr "Bruk NIS"
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:579
msgid "yellow pages"
msgstr "gule sider"
-#: ../install_steps_interactive.pm_.c:544
-#: ../install_steps_interactive.pm_.c:592
-#: ../install_steps_interactive.pm_.c:692 ../standalone/adduserdrake_.c:52
+#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:731 ../standalone/adduserdrake_.c:52
msgid "Please try again"
msgstr "Vennligst pr�v igjen"
-#: ../install_steps_interactive.pm_.c:544
-#: ../install_steps_interactive.pm_.c:592
-#: ../install_steps_interactive.pm_.c:692 ../standalone/adduserdrake_.c:52
+#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:731 ../standalone/adduserdrake_.c:52
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:585
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr "Dette passordet er for enkelt (m� v�re minst %d tegn langt)"
-#: ../install_steps_interactive.pm_.c:553
+#: ../install_steps_interactive.pm_.c:592
msgid "Authentification NIS"
msgstr "Autentifikasjon NIS"
-#: ../install_steps_interactive.pm_.c:554
+#: ../install_steps_interactive.pm_.c:593
msgid "NIS Domain"
msgstr "NIS-domene"
-#: ../install_steps_interactive.pm_.c:554
+#: ../install_steps_interactive.pm_.c:593
msgid "NIS Server"
msgstr "NIS-tjener"
-#: ../install_steps_interactive.pm_.c:574 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:613 ../standalone/adduserdrake_.c:34
msgid "Accept user"
msgstr "Godta bruker"
-#: ../install_steps_interactive.pm_.c:574 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:613 ../standalone/adduserdrake_.c:34
msgid "Add user"
msgstr "Legg til bruker"
-#: ../install_steps_interactive.pm_.c:575 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:35
#, c-format
msgid "(already added %s)"
msgstr "(allerede lagt til %s)"
-#: ../install_steps_interactive.pm_.c:575 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:35
#, c-format
msgid ""
"Enter a user\n"
@@ -2566,48 +2544,48 @@ msgstr ""
"Entre en bruker\n"
"%s"
-#: ../install_steps_interactive.pm_.c:577 ../standalone/adduserdrake_.c:37
+#: ../install_steps_interactive.pm_.c:616 ../standalone/adduserdrake_.c:37
msgid "Real name"
msgstr "Virkelig navn"
-#: ../install_steps_interactive.pm_.c:578 ../standalone/adduserdrake_.c:38
+#: ../install_steps_interactive.pm_.c:617 ../standalone/adduserdrake_.c:38
msgid "User name"
msgstr "Brukernavn"
-#: ../install_steps_interactive.pm_.c:583 ../standalone/adduserdrake_.c:43
+#: ../install_steps_interactive.pm_.c:622 ../standalone/adduserdrake_.c:43
msgid "Shell"
msgstr "Skall"
-#: ../install_steps_interactive.pm_.c:593 ../standalone/adduserdrake_.c:53
+#: ../install_steps_interactive.pm_.c:632 ../standalone/adduserdrake_.c:53
msgid "This password is too simple"
msgstr "Dette passordet er for enkelt"
-#: ../install_steps_interactive.pm_.c:594 ../standalone/adduserdrake_.c:54
+#: ../install_steps_interactive.pm_.c:633 ../standalone/adduserdrake_.c:54
msgid "Please give a user name"
msgstr "Vennligst oppgi et brukernavn"
-#: ../install_steps_interactive.pm_.c:595 ../standalone/adduserdrake_.c:55
+#: ../install_steps_interactive.pm_.c:634 ../standalone/adduserdrake_.c:55
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "Brukernavnet kan kun inneholde sm� bokstaver, tall, `-' og `_'"
-#: ../install_steps_interactive.pm_.c:596 ../standalone/adduserdrake_.c:56
+#: ../install_steps_interactive.pm_.c:635 ../standalone/adduserdrake_.c:56
msgid "This user name is already added"
msgstr "Denne brukeren er allerede lagt til"
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:654
msgid "First drive"
msgstr "F�rste disk"
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:655
msgid "Second drive"
msgstr "Andre disk"
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:656
msgid "Skip"
msgstr "Dropp"
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:661
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 "
@@ -2631,95 +2609,95 @@ msgstr ""
"systemsvikt.\n"
"�nsker du � opprette en oppstartsdiskett for systemet ditt?"
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:670
msgid "Sorry, no floppy drive available"
msgstr "Beklager, ingen diskettstasjon tilgjengelig"
-#: ../install_steps_interactive.pm_.c:634
+#: ../install_steps_interactive.pm_.c:673
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "Velg diskettstasjonen du �nsker � bruke for � lage oppstartsdisketten"
-#: ../install_steps_interactive.pm_.c:639
+#: ../install_steps_interactive.pm_.c:678
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Sett inn en diskett i stasjon %s"
-#: ../install_steps_interactive.pm_.c:640
-#: ../install_steps_interactive.pm_.c:998
+#: ../install_steps_interactive.pm_.c:679
+#: ../install_steps_interactive.pm_.c:1037
msgid "Creating bootdisk"
msgstr "Oppretter oppstartdiskett"
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:686
msgid "Preparing bootloader"
msgstr "Klargj�r oppstartslaster"
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:698
msgid "First sector of boot partition"
msgstr "F�rste sektor av oppstartspartisjon"
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:698
msgid "First sector of drive (MBR)"
msgstr "F�rste sektor av disk (MBR)"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:703
msgid "LILO Installation"
msgstr "LILO-installasjon"
-#: ../install_steps_interactive.pm_.c:665
+#: ../install_steps_interactive.pm_.c:704
msgid "Where do you want to install the bootloader?"
msgstr "Hvor �nsker du installere oppstartslasteren?"
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:710
msgid "Do you want to use LILO?"
msgstr "�nsker du � bruke LILO?"
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:713
msgid "Boot device"
msgstr "Oppstartsenhet"
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:714
msgid "Linear (needed for some SCSI drives)"
msgstr "Line�r (beh�ves av noen SCSI-disker)"
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:714
msgid "linear"
msgstr "line�r"
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:715
msgid "Compact"
msgstr "Kompakt"
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:715
msgid "compact"
msgstr "kompakt"
-#: ../install_steps_interactive.pm_.c:677
+#: ../install_steps_interactive.pm_.c:716
msgid "Delay before booting default image"
msgstr "Forsinkelse f�r oppstart av standard bilde"
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:717
msgid "Video mode"
msgstr "Skjermmodus"
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:721
msgid "Restrict command line options"
msgstr "Begrense kommandolinje-opsjoner"
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:721
msgid "restrict"
msgstr "begrense"
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:727
msgid "LILO main options"
msgstr "LILO hovedopsjoner"
-#: ../install_steps_interactive.pm_.c:691
+#: ../install_steps_interactive.pm_.c:730
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:741
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existing ones."
@@ -2727,163 +2705,167 @@ msgstr ""
"Her er f�lgende oppf�ringer i LILO.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../install_steps_interactive.pm_.c:704 ../standalone/rpmdrake_.c:302
+#: ../install_steps_interactive.pm_.c:743 ../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "Legg til"
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Linux"
msgstr "Linux"
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Other OS (windows...)"
msgstr "Andre OS (windows...)"
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Which type of entry do you want to add"
msgstr "Hvilken inngangstype vil du legge til"
-#: ../install_steps_interactive.pm_.c:733
+#: ../install_steps_interactive.pm_.c:772
msgid "Image"
msgstr "Bilde"
-#: ../install_steps_interactive.pm_.c:734
-#: ../install_steps_interactive.pm_.c:742
+#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:781
msgid "Root"
msgstr "Root"
-#: ../install_steps_interactive.pm_.c:735
+#: ../install_steps_interactive.pm_.c:774
msgid "Append"
msgstr "Tilf�ye"
-#: ../install_steps_interactive.pm_.c:736
+#: ../install_steps_interactive.pm_.c:775
msgid "Initrd"
msgstr "Initrd"
-#: ../install_steps_interactive.pm_.c:737
+#: ../install_steps_interactive.pm_.c:776
msgid "Read-write"
msgstr "Les-skriv"
-#: ../install_steps_interactive.pm_.c:743
+#: ../install_steps_interactive.pm_.c:782
msgid "Table"
msgstr "Tabell"
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:783
msgid "Unsafe"
msgstr "Usikker"
-#: ../install_steps_interactive.pm_.c:749
+#: ../install_steps_interactive.pm_.c:788
msgid "Label"
msgstr "Etikett"
-#: ../install_steps_interactive.pm_.c:751
+#: ../install_steps_interactive.pm_.c:790
msgid "Default"
msgstr "Standard"
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:793
msgid "Remove entry"
msgstr "Fjern inngang"
-#: ../install_steps_interactive.pm_.c:757
+#: ../install_steps_interactive.pm_.c:796
msgid "Empty label not allowed"
msgstr "Tom etikett er ikke tillatt"
-#: ../install_steps_interactive.pm_.c:758
+#: ../install_steps_interactive.pm_.c:797
msgid "This label is already in use"
msgstr "Denne etiketten er allerede i bruk"
-#: ../install_steps_interactive.pm_.c:759
+#: ../install_steps_interactive.pm_.c:798
#, c-format
msgid "A entry %s already exists"
msgstr "En inngang %s eksisterer ellerede"
-#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:812
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. F�lgende feil oppsto:"
-#: ../install_steps_interactive.pm_.c:787
+#: ../install_steps_interactive.pm_.c:826
msgid "Proxies configuration"
msgstr "Proxy-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:788
+#: ../install_steps_interactive.pm_.c:827
msgid "HTTP proxy"
msgstr "HTTP-proxy"
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:828
msgid "FTP proxy"
msgstr "FTP-proxy"
-#: ../install_steps_interactive.pm_.c:795
+#: ../install_steps_interactive.pm_.c:834
msgid "Proxy should be http://..."
msgstr "Proxy burde v�re http://..."
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:835
msgid "Proxy should be ftp://..."
msgstr "Proxy burde v�re ftp://..."
-#: ../install_steps_interactive.pm_.c:806 ../standalone/draksec_.c:20
+#: ../install_steps_interactive.pm_.c:845 ../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Velkommen til Crackers"
-#: ../install_steps_interactive.pm_.c:807 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:846 ../standalone/draksec_.c:21
msgid "Poor"
msgstr "D�rlig"
-#: ../install_steps_interactive.pm_.c:808 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:847 ../standalone/draksec_.c:22
msgid "Low"
msgstr "Lav"
-#: ../install_steps_interactive.pm_.c:809 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:848 ../standalone/draksec_.c:23
msgid "Medium"
msgstr "Medium"
-#: ../install_steps_interactive.pm_.c:810 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:849 ../standalone/draksec_.c:24
msgid "High"
msgstr "H�y"
-#: ../install_steps_interactive.pm_.c:811 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:850 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Paranoid"
-#: ../install_steps_interactive.pm_.c:824
+#: ../install_steps_interactive.pm_.c:863
msgid "Miscellaneous questions"
msgstr "Forskjellige sp�rsm�l"
-#: ../install_steps_interactive.pm_.c:825
+#: ../install_steps_interactive.pm_.c:864
msgid "(may cause data corruption)"
msgstr "(kan for�rsake korrupsjon av data)"
-#: ../install_steps_interactive.pm_.c:825
+#: ../install_steps_interactive.pm_.c:864
msgid "Use hard drive optimisations?"
msgstr "Bruk harddisk-optimisering?"
-#: ../install_steps_interactive.pm_.c:826 ../standalone/draksec_.c:46
+#: ../install_steps_interactive.pm_.c:865 ../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Velg sikkerhetsniv�"
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:866
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "Presiser RAM-st�rrelse hvis det trengs (funnet %d MB)"
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:867
msgid "Removable media automounting"
msgstr "Fjernbart media automontering"
-#: ../install_steps_interactive.pm_.c:830
+#: ../install_steps_interactive.pm_.c:869
msgid "Enable num lock at startup"
msgstr "Sl� p� num lock ved oppstart"
-#: ../install_steps_interactive.pm_.c:833
+#: ../install_steps_interactive.pm_.c:872
msgid "Give the ram size in Mb"
msgstr "Oppgi ram-st�rrelsen i Mb"
-#: ../install_steps_interactive.pm_.c:861
-#: ../install_steps_interactive.pm_.c:1031
+#: ../install_steps_interactive.pm_.c:888
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
+#: ../install_steps_interactive.pm_.c:900
+#: ../install_steps_interactive.pm_.c:1070
msgid "Try to find PCI devices?"
msgstr "Pr�ve � finne PCI-enheter?"
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:915
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -2893,7 +2875,7 @@ msgstr ""
"\n"
"�nsker du virkelig � avslutte n�?"
-#: ../install_steps_interactive.pm_.c:883
+#: ../install_steps_interactive.pm_.c:922
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2915,26 +2897,26 @@ msgstr ""
"Informasjon om konfigurering av systemet ditt finnes i post\n"
"install-kapittelet i Official Linux Mandrake User's Guide."
-#: ../install_steps_interactive.pm_.c:892
+#: ../install_steps_interactive.pm_.c:931
msgid "Shutting down"
msgstr "Stenger av"
-#: ../install_steps_interactive.pm_.c:906
+#: ../install_steps_interactive.pm_.c:945
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for %s kort %s"
-#: ../install_steps_interactive.pm_.c:907
+#: ../install_steps_interactive.pm_.c:946
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../install_steps_interactive.pm_.c:917
+#: ../install_steps_interactive.pm_.c:956
#, c-format
msgid "Which %s driver should I try?"
msgstr "Hvilken %s driver skal jeg pr�ve?"
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:964
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2953,20 +2935,20 @@ msgstr ""
"burde\n"
"ikke for�rsake noen skader."
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:969
msgid "Autoprobe"
msgstr "Automatisk sondering"
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:969
msgid "Specify options"
msgstr "Spesifiser opsjoner"
-#: ../install_steps_interactive.pm_.c:934
+#: ../install_steps_interactive.pm_.c:973
#, c-format
msgid "You may now provide its options to module %s."
msgstr "Du kan n� gi dens opsjoner til modul %s."
-#: ../install_steps_interactive.pm_.c:940
+#: ../install_steps_interactive.pm_.c:979
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2977,11 +2959,11 @@ msgstr ""
"Opsjonene er i format ``name=value name2=value2 ...''.\n"
"F.eks., ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:943
+#: ../install_steps_interactive.pm_.c:982
msgid "Module options:"
msgstr "Modulopsjoner:"
-#: ../install_steps_interactive.pm_.c:953
+#: ../install_steps_interactive.pm_.c:992
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2990,19 +2972,19 @@ msgstr ""
"Lasting av modul %s feilet.\n"
"�nsker du � pr�ve igjen med andre parametere?"
-#: ../install_steps_interactive.pm_.c:966
+#: ../install_steps_interactive.pm_.c:1005
msgid "Try to find PCMCIA cards?"
msgstr "Pr�ve � finne PCMCIA kort?"
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:1006
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA kort..."
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:1006
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:974
+#: ../install_steps_interactive.pm_.c:1013
msgid ""
"Linux does not yet fully support ultra dma 66 HPT.\n"
"As a work-around i can make a custom floppy giving access the hard drive on "
@@ -3011,7 +2993,7 @@ msgstr ""
"Linux st�tter enn� ikke ultra dma 66 HPT fullt ut.\n"
"Jeg kan lage en diskett som gir tilgang til harddisken p� ide2 og ide3"
-#: ../install_steps_interactive.pm_.c:995
+#: ../install_steps_interactive.pm_.c:1034
msgid ""
"Enter a floppy to create an HTP enabled boot\n"
"(all data on floppy will be lost)"
@@ -3019,16 +3001,16 @@ msgstr ""
"Sett inn en diskett for � opprette en oppstart med HTP sl�tt p�\n"
"(Alle data p� disketten vil g� tapt)"
-#: ../install_steps_interactive.pm_.c:1012
+#: ../install_steps_interactive.pm_.c:1051
msgid "It is necessary to restart installation booting on the floppy"
msgstr "Det er n�dvendig � starte installasjonen igjen fra disketten"
-#: ../install_steps_interactive.pm_.c:1013
+#: ../install_steps_interactive.pm_.c:1052
msgid "It is necessary to restart installation with the new parameters"
msgstr ""
"Det er n�dvendig � starte installasjonen igjen med de de nye parameterene"
-#: ../install_steps_interactive.pm_.c:1017
+#: ../install_steps_interactive.pm_.c:1056
#, c-format
msgid ""
"Failed to create an HTP boot floppy.\n"
@@ -3037,31 +3019,31 @@ msgstr ""
"Oppretting av HTP oppstartsdiskett mislykket.\n"
"Du m� muligens starte installasjonen igjen og gi ``%s'' ved klartegnet"
-#: ../install_steps_interactive.pm_.c:1037
+#: ../install_steps_interactive.pm_.c:1076
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../install_steps_interactive.pm_.c:1038
+#: ../install_steps_interactive.pm_.c:1077
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../install_steps_interactive.pm_.c:1039
+#: ../install_steps_interactive.pm_.c:1078
#, c-format
msgid "Do you have any %s interface?"
msgstr "Har du noen %s grensesnitt?"
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:1080 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
msgid "No"
msgstr "Nei"
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:1080 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424
msgid "Yes"
msgstr "Ja"
-#: ../install_steps_interactive.pm_.c:1042
+#: ../install_steps_interactive.pm_.c:1081
msgid "See hardware info"
msgstr "Se maskinvareinfo"
@@ -3203,91 +3185,91 @@ msgstr "Italiensk"
msgid "Latin American"
msgstr "Latinamerikansk"
-#: ../keyboard.pm_.c:111
+#: ../keyboard.pm_.c:112
msgid "Dutch"
msgstr "Hollansk"
-#: ../keyboard.pm_.c:112
+#: ../keyboard.pm_.c:113
msgid "Lithuanian AZERTY"
msgstr "Liauisk AZERTY"
-#: ../keyboard.pm_.c:113
+#: ../keyboard.pm_.c:114
msgid "Lithuanian \"number row\" QWERTY"
msgstr "Litauisk \"nummer-rekke\" QWERTY"
-#: ../keyboard.pm_.c:114
+#: ../keyboard.pm_.c:115
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "Litauisk \"phon�tic\" QWERTY"
-#: ../keyboard.pm_.c:115
+#: ../keyboard.pm_.c:116
msgid "Norwegian"
msgstr "Norsk"
-#: ../keyboard.pm_.c:116
+#: ../keyboard.pm_.c:117
msgid "Polish"
msgstr "Polsk"
-#: ../keyboard.pm_.c:117
+#: ../keyboard.pm_.c:118
msgid "Portuguese"
msgstr "Portugisisk"
-#: ../keyboard.pm_.c:118
+#: ../keyboard.pm_.c:119
msgid "Canadian (Quebec)"
msgstr "Canadisk (Quebec)"
-#: ../keyboard.pm_.c:119
+#: ../keyboard.pm_.c:120
msgid "Russian"
msgstr "Russisk"
-#: ../keyboard.pm_.c:120
+#: ../keyboard.pm_.c:121
msgid "Russian (Yawerty)"
msgstr "Russisk (Yawerty)"
-#: ../keyboard.pm_.c:121
+#: ../keyboard.pm_.c:122
msgid "Swedish"
msgstr "Svensk"
-#: ../keyboard.pm_.c:122
+#: ../keyboard.pm_.c:123
msgid "Slovenian"
msgstr "Slovensk"
-#: ../keyboard.pm_.c:123
+#: ../keyboard.pm_.c:124
msgid "Slovakian"
msgstr "Slovakisk"
-#: ../keyboard.pm_.c:124
+#: ../keyboard.pm_.c:125
msgid "Thai keyboard"
msgstr "Thai-tastatur"
-#: ../keyboard.pm_.c:125
+#: ../keyboard.pm_.c:126
msgid "Turkish (traditional \"F\" model)"
msgstr "Tyrkisk (tradisjonell \"F\" modell)"
-#: ../keyboard.pm_.c:126
+#: ../keyboard.pm_.c:127
msgid "Turkish (modern \"Q\" model)"
msgstr "Tyrkisk (moderne \"Q\" modell)"
-#: ../keyboard.pm_.c:127
+#: ../keyboard.pm_.c:128
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: ../keyboard.pm_.c:128
+#: ../keyboard.pm_.c:129
msgid "UK keyboard"
msgstr "UK-tastatur"
-#: ../keyboard.pm_.c:129
+#: ../keyboard.pm_.c:130
msgid "US keyboard"
msgstr "US-tastatur"
-#: ../keyboard.pm_.c:130
+#: ../keyboard.pm_.c:131
msgid "US keyboard (international)"
msgstr "US-tastatur (internasjonal)"
-#: ../keyboard.pm_.c:131
+#: ../keyboard.pm_.c:132
msgid "Yugoslavian (latin layout)"
msgstr "Jugoslavisk (latinsk oppsett)"
-#: ../lilo.pm_.c:142
+#: ../lilo.pm_.c:145
#, c-format
msgid ""
"Welcome to LILO the operating system chooser!\n"
@@ -4012,3 +3994,10 @@ msgstr "Finner tillatelser"
#: ../standalone/rpmdrake_.c:360
msgid "Finding leaves takes some time"
msgstr "Finne tillatelser vil ta litt tid"
+
+#~ msgid "Going to install %d MB. You can choose to install more programs"
+#~ msgstr ""
+#~ "%d MB vil bli installert. Du kan velge � installere flere programmer"
+
+#~ msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
+#~ msgstr "For mange pakker er valgt: %dMB passer ikke i %dMB"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index ef97dccd3..ed05ff71a 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-01-04 10:36+0100\n"
+"POT-Creation-Date: 2000-01-05 17:50+0100\n"
"PO-Revision-Date: 1999-08-09 16:39+0200\n"
"Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
"Language-Team: Serbian (cyrillic)\n"
@@ -99,11 +99,11 @@ msgstr "���������: ��������� ���� ���� ������ �� �������� �������"
msgid "Test configuration"
msgstr "��������� �������������"
-#: ../Xconfigurator.pm_.c:328
+#: ../Xconfigurator.pm_.c:329
msgid "An error occurred:"
msgstr "��, ������:"
-#: ../Xconfigurator.pm_.c:330
+#: ../Xconfigurator.pm_.c:331
msgid ""
"\n"
"try changing some parameters"
@@ -111,24 +111,24 @@ msgstr ""
"\n"
"��������� �� �������� ����������"
-#: ../Xconfigurator.pm_.c:351
+#: ../Xconfigurator.pm_.c:352
#, c-format
msgid "(leaving in %d seconds)"
msgstr "(����� �� %d �������)"
-#: ../Xconfigurator.pm_.c:355 ../my_gtk.pm_.c:425
+#: ../Xconfigurator.pm_.c:356 ../my_gtk.pm_.c:425
msgid "Is this correct?"
msgstr "�� �� �� ��� �������� ?"
-#: ../Xconfigurator.pm_.c:363
+#: ../Xconfigurator.pm_.c:364
msgid "An error occurred, try changing some parameters"
msgstr "��, ������� �� ������, �������� ��������� ���������"
-#: ../Xconfigurator.pm_.c:371 ../Xconfigurator.pm_.c:538
+#: ../Xconfigurator.pm_.c:372 ../Xconfigurator.pm_.c:541
msgid "Automatic resolutions"
msgstr "���������� ���������� ����������"
-#: ../Xconfigurator.pm_.c:372
+#: ../Xconfigurator.pm_.c:373
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -138,23 +138,23 @@ msgstr ""
"��� ����� �� ��������...\n"
"������ ������� ������� ��� ������, ���� �� ���� ������� ������� ��������"
-#: ../Xconfigurator.pm_.c:425 ../printerdrake.pm_.c:210
+#: ../Xconfigurator.pm_.c:428 ../printerdrake.pm_.c:210
msgid "Resolution"
msgstr "���������"
-#: ../Xconfigurator.pm_.c:460
+#: ../Xconfigurator.pm_.c:463
msgid "Choose resolution and color depth"
msgstr "��������� ���������� � ���� ��� ��� �������"
-#: ../Xconfigurator.pm_.c:468
+#: ../Xconfigurator.pm_.c:471
msgid "Show all"
msgstr "������� ���"
-#: ../Xconfigurator.pm_.c:492
+#: ../Xconfigurator.pm_.c:495
msgid "Resolutions"
msgstr "���������"
-#: ../Xconfigurator.pm_.c:539
+#: ../Xconfigurator.pm_.c:542
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -164,7 +164,7 @@ msgstr ""
"����, �� ���� ������� �� ��������� ��������.\n"
"�� �� ������ ��������?"
-#: ../Xconfigurator.pm_.c:544
+#: ../Xconfigurator.pm_.c:547
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -172,109 +172,109 @@ msgstr ""
"���� �������� ������������ ���\n"
"��������� �� ������ ��������� �������� ��� ���������"
-#: ../Xconfigurator.pm_.c:758
+#: ../Xconfigurator.pm_.c:761
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "��� ���������: %s\n"
-#: ../Xconfigurator.pm_.c:759
+#: ../Xconfigurator.pm_.c:762
#, c-format
msgid "Mouse type: %s\n"
msgstr "��� ����: %s\n"
-#: ../Xconfigurator.pm_.c:760
+#: ../Xconfigurator.pm_.c:763
#, c-format
msgid "Mouse device: %s\n"
msgstr "��� �� ��������� �� ������: %s\n"
-#: ../Xconfigurator.pm_.c:761
+#: ../Xconfigurator.pm_.c:764
#, c-format
msgid "Monitor: %s\n"
msgstr "�������: %s\n"
-#: ../Xconfigurator.pm_.c:762
+#: ../Xconfigurator.pm_.c:765
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "������� - ������������ ����������: %s\n"
-#: ../Xconfigurator.pm_.c:763
+#: ../Xconfigurator.pm_.c:766
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "������� - ���������� ����������: %s\n"
-#: ../Xconfigurator.pm_.c:764
+#: ../Xconfigurator.pm_.c:767
#, c-format
msgid "Graphic card: %s\n"
msgstr "�������� �������: %s\n"
-#: ../Xconfigurator.pm_.c:765
+#: ../Xconfigurator.pm_.c:768
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "������� �� ��������� �������: %s kB\n"
-#: ../Xconfigurator.pm_.c:766
+#: ../Xconfigurator.pm_.c:769
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 ������: %s\n"
-#: ../Xconfigurator.pm_.c:780
+#: ../Xconfigurator.pm_.c:783
msgid "Preparing X-Window configuration"
msgstr "������� ������������� �� X-Window ������"
-#: ../Xconfigurator.pm_.c:794
+#: ../Xconfigurator.pm_.c:797
msgid "Change Monitor"
msgstr "������� ��������"
-#: ../Xconfigurator.pm_.c:795
+#: ../Xconfigurator.pm_.c:798
msgid "Change Graphic card"
msgstr "������� �������� �������"
-#: ../Xconfigurator.pm_.c:796
+#: ../Xconfigurator.pm_.c:799
msgid "Change Server options"
msgstr "������� ������ �����"
-#: ../Xconfigurator.pm_.c:797
+#: ../Xconfigurator.pm_.c:800
msgid "Change Resolution"
msgstr "������� ����������"
-#: ../Xconfigurator.pm_.c:798
+#: ../Xconfigurator.pm_.c:801
msgid "Automatical resolutions search"
msgstr "���������� ������� ����������"
-#: ../Xconfigurator.pm_.c:802
+#: ../Xconfigurator.pm_.c:805
msgid "Show information"
msgstr "������� �����������"
-#: ../Xconfigurator.pm_.c:803
+#: ../Xconfigurator.pm_.c:806
msgid "Test again"
msgstr "�������� ������"
-#: ../Xconfigurator.pm_.c:804
+#: ../Xconfigurator.pm_.c:807 ../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "����"
-#: ../Xconfigurator.pm_.c:808
+#: ../Xconfigurator.pm_.c:811
msgid "What do you want to do?"
msgstr "��� ������ �� �������?"
-#: ../Xconfigurator.pm_.c:815
+#: ../Xconfigurator.pm_.c:818
msgid "Forget the changes?"
msgstr "�� ������� �������?"
-#: ../Xconfigurator.pm_.c:831
+#: ../Xconfigurator.pm_.c:834
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "�����, ������ ������� %s ���� ���������� �������"
-#: ../Xconfigurator.pm_.c:847
+#: ../Xconfigurator.pm_.c:850
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "����� ��� ��������� �� � ����������� (Ctrl-Alt-BackSpace) �������"
-#: ../Xconfigurator.pm_.c:850
+#: ../Xconfigurator.pm_.c:853
msgid "X at startup"
msgstr "X �������� �� ��������"
-#: ../Xconfigurator.pm_.c:851
+#: ../Xconfigurator.pm_.c:854
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -434,8 +434,8 @@ msgstr "������� (restore) �� �������"
msgid "Save on floppy"
msgstr "����� �� �������"
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:574
-#: ../install_steps_interactive.pm_.c:704 ../standalone/adduserdrake_.c:34
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:613
+#: ../install_steps_interactive.pm_.c:743 ../standalone/adduserdrake_.c:34
msgid "Done"
msgstr "�������"
@@ -542,8 +542,9 @@ msgstr "����� %s �������� %s,"
msgid "all data on this partition will be lost"
msgstr "��� ������ �� ���� ��������� �� ���� ���������"
-#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:185 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:192 ../install_steps.pm_.c:67
#: ../install_steps_interactive.pm_.c:37 ../standalone/diskdrake_.c:60
+#: ../standalone/rpmdrake_.c:294 ../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "������"
@@ -735,7 +736,7 @@ msgstr "�����������"
msgid "Formatting"
msgstr "�����������"
-#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:214
+#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:221
#, c-format
msgid "Formatting partition %s"
msgstr "����������� ��������� %s"
@@ -798,9 +799,8 @@ msgstr "������� ��������"
msgid "Choose the new size"
msgstr "��������� ���� ��������"
-#: ../diskdrake.pm_.c:534 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:327
-#: ../install_steps_gtk.pm_.c:376
+#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:317
+#: ../install_steps_gtk.pm_.c:361
msgid "MB"
msgstr "MB"
@@ -1730,8 +1730,8 @@ msgstr "������ ��������� ����"
msgid "Configure printer"
msgstr "������ �������"
-#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:533
+#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:572
msgid "Set root password"
msgstr "����� root �������"
@@ -1785,7 +1785,7 @@ msgstr ""
msgid "Not enough swap to fulfill installation, please add some"
msgstr "���� ������� swap-� �� ������ �����������, ������� ��� swap-�"
-#: ../install_any.pm_.c:186 ../standalone/diskdrake_.c:61
+#: ../install_any.pm_.c:193 ../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
@@ -1793,7 +1793,7 @@ msgstr ""
"�� ���� ��������� ������ ��������, ����� �� ��������� �� ���� :(\n"
"�������� ���� ����������� ���� ���������"
-#: ../install_any.pm_.c:202
+#: ../install_any.pm_.c:209
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -1801,32 +1801,32 @@ msgstr ""
"DiskDrake �� ���� �� �������� ������� ������ ��������.\n"
"���� �������� ��� �� ��� ����� !"
-#: ../install_any.pm_.c:212
+#: ../install_any.pm_.c:219
msgid "Searching root partition."
msgstr "������ root ���������."
-#: ../install_any.pm_.c:241
+#: ../install_any.pm_.c:248
msgid "Information"
msgstr "�����������"
-#: ../install_any.pm_.c:242
+#: ../install_any.pm_.c:249
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr "%s: ��� ���� root ��������, ��������� ���� �����."
-#: ../install_any.pm_.c:244
+#: ../install_any.pm_.c:251
msgid "No root partition found"
msgstr "���� root ���������"
-#: ../install_any.pm_.c:281
+#: ../install_any.pm_.c:288
msgid "Can't use broadcast with no NIS domain"
msgstr "���� ����� ������ ��� NIS ������"
-#: ../install_any.pm_.c:456
+#: ../install_any.pm_.c:463
msgid "Error reading file $f"
msgstr "������ ��� �������� ����� $f"
-#: ../install_any.pm_.c:462
+#: ../install_any.pm_.c:469
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr "�������� kickstart ���� %s (���� ����� %s)"
@@ -1844,7 +1844,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "����� ����� ��������� %s"
-#: ../install_steps.pm_.c:504
+#: ../install_steps.pm_.c:516
msgid "No floppy drive available"
msgstr "������������� floppy ������"
@@ -1853,12 +1853,36 @@ msgstr "������������� floppy ������"
msgid "Entering step `%s'\n"
msgstr "�������� ����� `%s'\n"
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:293
+#: ../install_steps_gtk.pm_.c:259
+#, fuzzy
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+"�����, ����� !\n"
+"\n"
+"DrakX ����� �� ������ �������� Windows ���������. ������ �������: ���\n"
+"�������� �� ������. ������� �� ������ ����� ������, ���� ����� �� ���������\n"
+"scandisk (���������� � defrag) �� ���� ��������� � ��������� backup "
+"��������.\n"
+"��� ��� �������, ���������� \"� ����\"."
+
+#: ../install_steps_gtk.pm_.c:278
+msgid "Automatic resizing failed"
+msgstr "���������� ������ �������� ��������"
+
+#: ../install_steps_gtk.pm_.c:294
#, fuzzy
msgid "You must have a swap partition"
msgstr "������ ����� swap ��������� �� ����� ��������� �� ������������."
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:295
+#: ../install_steps_gtk.pm_.c:296
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -1868,126 +1892,99 @@ msgstr ""
"\n"
"�������� ��������� ���� ?"
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:327
+#: ../install_steps_gtk.pm_.c:312
+msgid ""
+"Now that you've selected desired groups, please choose \n"
+"how many packages you want, ranging from minimal to full \n"
+"installation of each selected groups."
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:315
+msgid "You will be able to choose more precisely in next step"
+msgstr "���� ���� �� ���������� ������ � �������� ������"
+
+#: ../install_steps_gtk.pm_.c:317
msgid "Choose the size you want to install"
msgstr "��������� �������� ���������� �� �����������"
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:376
+#: ../install_steps_gtk.pm_.c:361
msgid "Total size: "
msgstr "������ ��������: "
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:388
+#: ../install_steps_gtk.pm_.c:372
+#, fuzzy
+msgid "Bad package"
+msgstr "%d ������"
+
+#: ../install_steps_gtk.pm_.c:373 ../standalone/rpmdrake_.c:136
#, c-format
msgid "Version: %s\n"
msgstr "������: %s\n"
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:389
+#: ../install_steps_gtk.pm_.c:374 ../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
msgstr "��������: %d KB\n"
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:504
+#: ../install_steps_gtk.pm_.c:489
msgid "Choose the packages you want to install"
msgstr "������� ������ �� �����������"
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:507
+#: ../install_steps_gtk.pm_.c:492
msgid "Info"
msgstr "����"
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:515
-#: ../install_steps_interactive.pm_.c:81
+#: ../install_steps_gtk.pm_.c:500 ../install_steps_interactive.pm_.c:81
+#: ../standalone/rpmdrake_.c:161
msgid "Install"
msgstr "����������"
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:534
-#: ../install_steps_interactive.pm_.c:268
+#: ../install_steps_gtk.pm_.c:519 ../install_steps_interactive.pm_.c:312
msgid "Installing"
msgstr "����������"
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:541
+#: ../install_steps_gtk.pm_.c:522
+msgid "Estimating"
+msgstr "����������"
+
+#: ../install_steps_gtk.pm_.c:526
msgid "Please wait, "
msgstr "����� ���������"
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:543
+#: ../install_steps_gtk.pm_.c:528
msgid "Time remaining "
msgstr "��������� �����"
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:544
+#: ../install_steps_gtk.pm_.c:529
msgid "Total time "
msgstr "������ �����"
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:549
-#: ../install_steps_interactive.pm_.c:268
+#: ../install_steps_gtk.pm_.c:534 ../install_steps_interactive.pm_.c:312
msgid "Preparing installation"
msgstr "��������� �����������"
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:564
+#: ../install_steps_gtk.pm_.c:544
+#, c-format
+msgid "%d packages"
+msgstr "%d ������"
+
+#: ../install_steps_gtk.pm_.c:544
+msgid ", %U MB"
+msgstr ", %U MB"
+
+#: ../install_steps_gtk.pm_.c:549
#, c-format
msgid "Installing package %s"
msgstr "���������� ����� %s"
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:589
+#: ../install_steps_gtk.pm_.c:574
msgid "Go on anyway?"
msgstr "�������� ��������� ���� ?"
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:589
+#: ../install_steps_gtk.pm_.c:574
msgid "There was an error ordering packages:"
msgstr "������ � ����� ������:"
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:849
-msgid "Use existing configuration for X11?"
-msgstr "�� �������� ��������� ������������� �� X11 ?"
-
-#: ../install_steps_gtk.pm_.c:259
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first run scandisk "
-"(and\n"
-"optionally run defrag) on this partition and backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"�����, ����� !\n"
-"\n"
-"DrakX ����� �� ������ �������� Windows ���������. ������ �������: ���\n"
-"�������� �� ������. ������� �� ������ ����� ������, ���� ����� �� ���������\n"
-"scandisk (���������� � defrag) �� ���� ��������� � ��������� backup "
-"��������.\n"
-"��� ��� �������, ���������� \"� ����\"."
-
-#: ../install_steps_gtk.pm_.c:277
-msgid "Automatic resizing failed"
-msgstr "���������� ������ �������� ��������"
-
-#: ../install_steps_gtk.pm_.c:324
-#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr "����������� %d MB. ������ �������� �� ����������� ��� ��������"
-
-#: ../install_steps_gtk.pm_.c:325
-msgid "You will be able to choose more precisely in next step"
-msgstr "���� ���� �� ���������� ������ � �������� ������"
-
-#: ../install_steps_gtk.pm_.c:387
-#, fuzzy
-msgid "Bad package"
-msgstr "%d ������"
-
-#: ../install_steps_gtk.pm_.c:537
-msgid "Estimating"
-msgstr "����������"
-
-#: ../install_steps_gtk.pm_.c:559
-#, c-format
-msgid "%d packages"
-msgstr "%d ������"
-
-#: ../install_steps_gtk.pm_.c:559
-msgid ", %U MB"
-msgstr ", %U MB"
-
#: ../install_steps_interactive.pm_.c:37
#, fuzzy
msgid "An error occurred"
@@ -2095,28 +2092,27 @@ msgstr "��������� ����� ���������"
msgid "You need to reboot for the partition table modifications to take place"
msgstr "����� �� ���������� ������ �� ������� ������ � ������ ��������"
-#: ../install_steps_interactive.pm_.c:204
+#: ../install_steps_interactive.pm_.c:207
msgid "Choose the partitions you want to format"
msgstr "������� ��������� �� �����������"
-#: ../install_steps_interactive.pm_.c:223
+#: ../install_steps_interactive.pm_.c:211
+msgid "Check bad blocks?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:230
msgid "Looking for available packages"
msgstr "������ ������"
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:236
msgid "Finding packages to upgrade"
msgstr "������ ������ �� ���������..."
-#: ../install_steps_interactive.pm_.c:244
+#: ../install_steps_interactive.pm_.c:282
msgid "Package Group Selection"
msgstr "������ ����� ������"
-#: ../install_steps_interactive.pm_.c:254
-#, c-format
-msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
-msgstr ""
-
-#: ../install_steps_interactive.pm_.c:277
+#: ../install_steps_interactive.pm_.c:321
msgid ""
"Installing package %s\n"
"%d%%"
@@ -2124,56 +2120,56 @@ msgstr ""
"���������� ������ %s\n"
"%d%%"
-#: ../install_steps_interactive.pm_.c:286
+#: ../install_steps_interactive.pm_.c:330
msgid "Post install configuration"
msgstr "���������������� ������������"
-#: ../install_steps_interactive.pm_.c:297
+#: ../install_steps_interactive.pm_.c:341
msgid "Keep the current IP configuration"
msgstr "������� ������ IP ���������"
-#: ../install_steps_interactive.pm_.c:298
+#: ../install_steps_interactive.pm_.c:342
msgid "Reconfigure network now"
msgstr "������������� �����"
-#: ../install_steps_interactive.pm_.c:299
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:343
+#: ../install_steps_interactive.pm_.c:355
msgid "Do not set up networking"
msgstr "����� ���������� �����"
-#: ../install_steps_interactive.pm_.c:301
-#: ../install_steps_interactive.pm_.c:309
+#: ../install_steps_interactive.pm_.c:345
+#: ../install_steps_interactive.pm_.c:353
msgid "Network Configuration"
msgstr "������ ����������"
-#: ../install_steps_interactive.pm_.c:302
+#: ../install_steps_interactive.pm_.c:346
msgid "Local networking has already been configured. Do you want to:"
msgstr "������� ����� �� ��� ��������. �� �� ������ ��:"
-#: ../install_steps_interactive.pm_.c:310
+#: ../install_steps_interactive.pm_.c:354
msgid "Do you want to configure networking for your system?"
msgstr "�� �� ������ �� �������� ����� �� ��� ������?"
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:355
msgid "Dialup with modem"
msgstr "����������� �� �������"
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:355
#, fuzzy
msgid "Local LAN"
msgstr "������� �����"
-#: ../install_steps_interactive.pm_.c:320
+#: ../install_steps_interactive.pm_.c:364
msgid "no network card found"
msgstr "���� ��������� ������ �������"
-#: ../install_steps_interactive.pm_.c:350
-#: ../install_steps_interactive.pm_.c:351
+#: ../install_steps_interactive.pm_.c:394
+#: ../install_steps_interactive.pm_.c:395
#, c-format
msgid "Configuring network device %s"
msgstr "���������� ������� ������ %s"
-#: ../install_steps_interactive.pm_.c:352
+#: ../install_steps_interactive.pm_.c:396
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -2183,31 +2179,31 @@ msgstr ""
"����� ������ ����� �� ���� tavka ����� �� ���� ����� ���\n"
"IP ������ (�� ������, 123.45.67.89)."
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "Automatic IP"
msgstr "���������� IP"
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "IP address:"
msgstr "IP ������:"
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:399
msgid "Netmask:"
msgstr "������ �����:"
-#: ../install_steps_interactive.pm_.c:356
+#: ../install_steps_interactive.pm_.c:400
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../install_steps_interactive.pm_.c:362 ../printerdrake.pm_.c:149
+#: ../install_steps_interactive.pm_.c:406 ../printerdrake.pm_.c:149
msgid "IP address should be in format 1.2.3.4"
msgstr "IP ������ ����� �� ���� � ������� 1.2.3.4"
-#: ../install_steps_interactive.pm_.c:380
+#: ../install_steps_interactive.pm_.c:424
msgid "Configuring network"
msgstr "���������� �����"
-#: ../install_steps_interactive.pm_.c:381
+#: ../install_steps_interactive.pm_.c:425
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2219,92 +2215,92 @@ msgstr ""
"��� �� ��. ``mybox.mylab.myco.com''.\n"
"��� ������ �������� 'nameserver'-�, �������� �� ���� ������."
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "DNS server:"
msgstr "DNS ������:"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Gateway device:"
msgstr "Gateway ������:"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Gateway:"
msgstr "Gateway:"
-#: ../install_steps_interactive.pm_.c:385
+#: ../install_steps_interactive.pm_.c:429
msgid "Host name:"
msgstr "��� �����:"
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:442
msgid "Try to find a modem?"
msgstr "�� �������� ����� ?"
-#: ../install_steps_interactive.pm_.c:408
+#: ../install_steps_interactive.pm_.c:452
msgid "Which serial port is your modem connected to?"
msgstr "�� ���� �� �������� ���� ����� ������� ?"
-#: ../install_steps_interactive.pm_.c:413
+#: ../install_steps_interactive.pm_.c:457
#, fuzzy
msgid "Dialup options"
msgstr "�������� ������"
-#: ../install_steps_interactive.pm_.c:414
+#: ../install_steps_interactive.pm_.c:458
msgid "Connection name"
msgstr "��� ���������"
-#: ../install_steps_interactive.pm_.c:415
+#: ../install_steps_interactive.pm_.c:459
msgid "Phone number"
msgstr "���� ��������"
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:460
msgid "Login ID"
msgstr "ID �� ��������"
-#: ../install_steps_interactive.pm_.c:417
-#: ../install_steps_interactive.pm_.c:534
-#: ../install_steps_interactive.pm_.c:580
-#: ../install_steps_interactive.pm_.c:680 ../standalone/adduserdrake_.c:40
+#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:573
+#: ../install_steps_interactive.pm_.c:619
+#: ../install_steps_interactive.pm_.c:719 ../standalone/adduserdrake_.c:40
msgid "Password"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Authentication"
msgstr "��������������"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "CHAP"
msgstr "CHAP"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "PAP"
msgstr "PAP"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Script-based"
msgstr "�������� �� �������"
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:462
msgid "Terminal-based"
msgstr "�������� �� ���������"
-#: ../install_steps_interactive.pm_.c:419
+#: ../install_steps_interactive.pm_.c:463
msgid "Domain name"
msgstr "��� ������"
-#: ../install_steps_interactive.pm_.c:420
+#: ../install_steps_interactive.pm_.c:464
msgid "First DNS Server"
msgstr "���� DNS ������"
-#: ../install_steps_interactive.pm_.c:421
+#: ../install_steps_interactive.pm_.c:465
msgid "Second DNS Server"
msgstr "����� DNS ������"
-#: ../install_steps_interactive.pm_.c:434
+#: ../install_steps_interactive.pm_.c:478
#, fuzzy
msgid "Bringing up the network"
msgstr "�������� �����"
-#: ../install_steps_interactive.pm_.c:443
+#: ../install_steps_interactive.pm_.c:487
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -2335,61 +2331,52 @@ msgid ""
"downloading of these software, to which customer and/or end user could\n"
"eventually have access after having sign up the present agreement.\n"
"\n"
-"The present agreement shall be governed and construed pursuant to the laws "
-"of\n"
-"France except to the extent that the application of local laws is required "
-"by\n"
-"mandatory laws of public order. However this agreement expressly excludes "
-"any\n"
-"conflict of laws, principles, choice of law or rule to the contrary. "
-"Therefore\n"
-"French laws shall prevail on any other local laws.\n"
"\n"
"For any queries relating to these agreement, please contact \n"
-"Mandrakesoft\n"
-"43, rue d'Aboukir\n"
-"75002 Paris\n"
-"FRANCE"
+"Mandrakesoft, Inc.\n"
+"2400 N. Lincoln Avenue Suite 243\n"
+"Altadena California 91001\n"
+"USA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:479
+#: ../install_steps_interactive.pm_.c:518
msgid "Choose a mirror from which to get the packages"
msgstr "��������� mirror �� ��� ���� ������� ������"
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:523
msgid "Contacting the mirror to get the list of available packages"
msgstr "������������� mirror �� ����� ������� ������"
-#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:527
msgid "Which packages do you want to install"
msgstr "������� ������ �� �����������"
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:529
msgid "Downloading cryptographic packages"
msgstr "������ ������ ������"
-#: ../install_steps_interactive.pm_.c:500
+#: ../install_steps_interactive.pm_.c:539
msgid "Which is your timezone?"
msgstr "��� �� ���� ��������� ���� ?"
-#: ../install_steps_interactive.pm_.c:501
+#: ../install_steps_interactive.pm_.c:540
msgid "Is your hardware clock set to GMT?"
msgstr "�� �� �� ��� ��������� (BIOS) �������� ������� �� GMT ?"
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:550
msgid "Printer"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:512
+#: ../install_steps_interactive.pm_.c:551
msgid "Would you like to configure a printer?"
msgstr "�� �� ����� �� �������� �������?"
-#: ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:571
msgid "No password"
msgstr "���� �������"
-#: ../install_steps_interactive.pm_.c:532
-#: ../install_steps_interactive.pm_.c:754 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:793 ../interactive.pm_.c:74
#: ../interactive.pm_.c:84 ../interactive.pm_.c:163
#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:425
@@ -2397,80 +2384,80 @@ msgstr "���� �������"
msgid "Ok"
msgstr "� ����"
-#: ../install_steps_interactive.pm_.c:535
-#: ../install_steps_interactive.pm_.c:581
-#: ../install_steps_interactive.pm_.c:681 ../standalone/adduserdrake_.c:41
+#: ../install_steps_interactive.pm_.c:574
+#: ../install_steps_interactive.pm_.c:620
+#: ../install_steps_interactive.pm_.c:720 ../standalone/adduserdrake_.c:41
msgid "Password (again)"
msgstr "������� (��������)"
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:576
msgid "Use shadow file"
msgstr "������� shadow ����"
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:576
msgid "shadow"
msgstr "shadow"
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:577
msgid "MD5"
msgstr "MD5"
-#: ../install_steps_interactive.pm_.c:538
+#: ../install_steps_interactive.pm_.c:577
#, fuzzy
msgid "Use MD5 passwords"
msgstr "����� MD5 �������"
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:579
msgid "Use NIS"
msgstr "������� NIS"
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:579
msgid "yellow pages"
msgstr "���� ��������"
-#: ../install_steps_interactive.pm_.c:544
-#: ../install_steps_interactive.pm_.c:592
-#: ../install_steps_interactive.pm_.c:692 ../standalone/adduserdrake_.c:52
+#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:731 ../standalone/adduserdrake_.c:52
msgid "Please try again"
msgstr "�������� ������"
-#: ../install_steps_interactive.pm_.c:544
-#: ../install_steps_interactive.pm_.c:592
-#: ../install_steps_interactive.pm_.c:692 ../standalone/adduserdrake_.c:52
+#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:731 ../standalone/adduserdrake_.c:52
msgid "The passwords do not match"
msgstr "������������� �������"
-#: ../install_steps_interactive.pm_.c:546
+#: ../install_steps_interactive.pm_.c:585
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:553
+#: ../install_steps_interactive.pm_.c:592
msgid "Authentification NIS"
msgstr "�������������� NIS"
-#: ../install_steps_interactive.pm_.c:554
+#: ../install_steps_interactive.pm_.c:593
msgid "NIS Domain"
msgstr "NIS ������"
-#: ../install_steps_interactive.pm_.c:554
+#: ../install_steps_interactive.pm_.c:593
msgid "NIS Server"
msgstr "NIS ������"
-#: ../install_steps_interactive.pm_.c:574 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:613 ../standalone/adduserdrake_.c:34
msgid "Accept user"
msgstr "�������� ���������"
-#: ../install_steps_interactive.pm_.c:574 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:613 ../standalone/adduserdrake_.c:34
msgid "Add user"
msgstr "����� ���������"
-#: ../install_steps_interactive.pm_.c:575 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:35
#, c-format
msgid "(already added %s)"
msgstr "(��� ������� %s)"
-#: ../install_steps_interactive.pm_.c:575 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:35
#, c-format
msgid ""
"Enter a user\n"
@@ -2479,50 +2466,50 @@ msgstr ""
"����� ���������\n"
"%s"
-#: ../install_steps_interactive.pm_.c:577 ../standalone/adduserdrake_.c:37
+#: ../install_steps_interactive.pm_.c:616 ../standalone/adduserdrake_.c:37
msgid "Real name"
msgstr "����� ���"
-#: ../install_steps_interactive.pm_.c:578 ../standalone/adduserdrake_.c:38
+#: ../install_steps_interactive.pm_.c:617 ../standalone/adduserdrake_.c:38
msgid "User name"
msgstr "���������� ���"
-#: ../install_steps_interactive.pm_.c:583 ../standalone/adduserdrake_.c:43
+#: ../install_steps_interactive.pm_.c:622 ../standalone/adduserdrake_.c:43
msgid "Shell"
msgstr "Shell"
-#: ../install_steps_interactive.pm_.c:593 ../standalone/adduserdrake_.c:53
+#: ../install_steps_interactive.pm_.c:632 ../standalone/adduserdrake_.c:53
msgid "This password is too simple"
msgstr "��� ������� �� ������� ������"
-#: ../install_steps_interactive.pm_.c:594 ../standalone/adduserdrake_.c:54
+#: ../install_steps_interactive.pm_.c:633 ../standalone/adduserdrake_.c:54
msgid "Please give a user name"
msgstr "�������� ���������� ���"
-#: ../install_steps_interactive.pm_.c:595 ../standalone/adduserdrake_.c:55
+#: ../install_steps_interactive.pm_.c:634 ../standalone/adduserdrake_.c:55
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "���������� ��� ���� �������� ���� ���� �����, �������, `-' � `_'"
-#: ../install_steps_interactive.pm_.c:596 ../standalone/adduserdrake_.c:56
+#: ../install_steps_interactive.pm_.c:635 ../standalone/adduserdrake_.c:56
msgid "This user name is already added"
msgstr "��� ���������� ��� ��� �������"
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:654
#, fuzzy
msgid "First drive"
msgstr "���� DNS ������"
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:655
#, fuzzy
msgid "Second drive"
msgstr "����� DNS ������"
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:656
msgid "Skip"
msgstr "��������"
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:661
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 "
@@ -2542,95 +2529,95 @@ msgstr ""
"'������ �� ���������', ��� �������� �������� � ������� ���� ��������.\n"
"�� �� ����� �� �������� ������� ������� �� ��� ������?"
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:670
msgid "Sorry, no floppy drive available"
msgstr "�� ������, ���� floppy-�"
-#: ../install_steps_interactive.pm_.c:634
+#: ../install_steps_interactive.pm_.c:673
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "���������� floppy ������ ���� ���� �������� �� �������� ������ �������"
-#: ../install_steps_interactive.pm_.c:639
+#: ../install_steps_interactive.pm_.c:678
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "������� ������ ������� � ������ %s"
-#: ../install_steps_interactive.pm_.c:640
-#: ../install_steps_interactive.pm_.c:998
+#: ../install_steps_interactive.pm_.c:679
+#: ../install_steps_interactive.pm_.c:1037
msgid "Creating bootdisk"
msgstr "������� ������� ����..."
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:686
msgid "Preparing bootloader"
msgstr "��������� �������..."
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:698
msgid "First sector of boot partition"
msgstr "���� ������ ������� ���������"
-#: ../install_steps_interactive.pm_.c:659
+#: ../install_steps_interactive.pm_.c:698
msgid "First sector of drive (MBR)"
msgstr "���� ������ ����� (MBR)"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:703
msgid "LILO Installation"
msgstr "LILO ����������"
-#: ../install_steps_interactive.pm_.c:665
+#: ../install_steps_interactive.pm_.c:704
msgid "Where do you want to install the bootloader?"
msgstr "��� ����� �� ����������� �������?"
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:710
msgid "Do you want to use LILO?"
msgstr "�� �� ������ �� ��������� LILO ?"
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:713
msgid "Boot device"
msgstr "������� (boot) ������"
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:714
msgid "Linear (needed for some SCSI drives)"
msgstr "������� �������� ��� (�������� ����� SCSI ����������)"
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:714
msgid "linear"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:715
msgid "Compact"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:676
+#: ../install_steps_interactive.pm_.c:715
msgid "compact"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:677
+#: ../install_steps_interactive.pm_.c:716
msgid "Delay before booting default image"
msgstr "����� ��� �������� default image-�"
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:717
msgid "Video mode"
msgstr "����� ���"
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:721
msgid "Restrict command line options"
msgstr "���������� �������� ������ - ������"
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:721
msgid "restrict"
msgstr "����������"
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:727
msgid "LILO main options"
msgstr "LILO ������ ������"
-#: ../install_steps_interactive.pm_.c:691
+#: ../install_steps_interactive.pm_.c:730
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"����� ``���������� �������� ������ - ������'' �� ������������� ��� �������"
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:741
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existing ones."
@@ -2638,164 +2625,168 @@ msgstr ""
"��� �� ��������� ������ � LILO-�.\n"
"������ ������ ���� ��� �������� �����."
-#: ../install_steps_interactive.pm_.c:704
+#: ../install_steps_interactive.pm_.c:743 ../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "�����"
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Linux"
msgstr "Linux"
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
msgid "Other OS (windows...)"
msgstr "����� ��-��� (Windows,BSD,BeOS,...)"
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:752
#, fuzzy
msgid "Which type of entry do you want to add"
msgstr "���� ����� �������� �����?"
-#: ../install_steps_interactive.pm_.c:733
+#: ../install_steps_interactive.pm_.c:772
msgid "Image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:734
-#: ../install_steps_interactive.pm_.c:742
+#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:781
msgid "Root"
msgstr "Root"
-#: ../install_steps_interactive.pm_.c:735
+#: ../install_steps_interactive.pm_.c:774
msgid "Append"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:736
+#: ../install_steps_interactive.pm_.c:775
msgid "Initrd"
msgstr "Initrd"
-#: ../install_steps_interactive.pm_.c:737
+#: ../install_steps_interactive.pm_.c:776
msgid "Read-write"
msgstr "������-������ RW"
-#: ../install_steps_interactive.pm_.c:743
+#: ../install_steps_interactive.pm_.c:782
msgid "Table"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:783
msgid "Unsafe"
msgstr "���������"
-#: ../install_steps_interactive.pm_.c:749
+#: ../install_steps_interactive.pm_.c:788
msgid "Label"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:751
+#: ../install_steps_interactive.pm_.c:790
msgid "Default"
msgstr "�������������"
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:793
msgid "Remove entry"
msgstr "������� ����"
-#: ../install_steps_interactive.pm_.c:757
+#: ../install_steps_interactive.pm_.c:796
msgid "Empty label not allowed"
msgstr "������ ������ ���� ���������"
-#: ../install_steps_interactive.pm_.c:758
+#: ../install_steps_interactive.pm_.c:797
msgid "This label is already in use"
msgstr "��� ������ �� ��� � ��������"
-#: ../install_steps_interactive.pm_.c:759
+#: ../install_steps_interactive.pm_.c:798
#, c-format
msgid "A entry %s already exists"
msgstr "���� %s ��� �������"
-#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:812
msgid "Installation of LILO failed. The following error occured:"
msgstr "���������� LILO-� ��������. ������ ��:"
-#: ../install_steps_interactive.pm_.c:787
+#: ../install_steps_interactive.pm_.c:826
msgid "Proxies configuration"
msgstr "������������ proxy-�"
-#: ../install_steps_interactive.pm_.c:788
+#: ../install_steps_interactive.pm_.c:827
msgid "HTTP proxy"
msgstr "HTTP proxy"
-#: ../install_steps_interactive.pm_.c:789
+#: ../install_steps_interactive.pm_.c:828
msgid "FTP proxy"
msgstr "FTP proxy"
-#: ../install_steps_interactive.pm_.c:795
+#: ../install_steps_interactive.pm_.c:834
msgid "Proxy should be http://..."
msgstr "Proxy ����� �� ���� http://..."
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:835
msgid "Proxy should be ftp://..."
msgstr "Proxy ����� �� ���� ftp://..."
-#: ../install_steps_interactive.pm_.c:806 ../standalone/draksec_.c:20
+#: ../install_steps_interactive.pm_.c:845 ../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "�������� ��� Crackers-�"
-#: ../install_steps_interactive.pm_.c:807 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:846 ../standalone/draksec_.c:21
msgid "Poor"
msgstr "�����"
-#: ../install_steps_interactive.pm_.c:808 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:847 ../standalone/draksec_.c:22
msgid "Low"
msgstr "����"
-#: ../install_steps_interactive.pm_.c:809 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:848 ../standalone/draksec_.c:23
msgid "Medium"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:810 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:849 ../standalone/draksec_.c:24
msgid "High"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:811 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:850 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "����������"
-#: ../install_steps_interactive.pm_.c:824
+#: ../install_steps_interactive.pm_.c:863
msgid "Miscellaneous questions"
msgstr "����� ������"
-#: ../install_steps_interactive.pm_.c:825
+#: ../install_steps_interactive.pm_.c:864
msgid "(may cause data corruption)"
msgstr "(���� ���������� ������)"
-#: ../install_steps_interactive.pm_.c:825
+#: ../install_steps_interactive.pm_.c:864
msgid "Use hard drive optimisations?"
msgstr "��������� ���� ���� ������������ ?"
-#: ../install_steps_interactive.pm_.c:826 ../standalone/draksec_.c:46
+#: ../install_steps_interactive.pm_.c:865 ../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "��������� ���������� ����"
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:866
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "�������� �������� RAM ��� �� �������� (����������� �� %d MB)"
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:867
msgid "Removable media automounting"
msgstr "������������� ���������� �����"
-#: ../install_steps_interactive.pm_.c:830
+#: ../install_steps_interactive.pm_.c:869
msgid "Enable num lock at startup"
msgstr "��������� Num Lock ������ ��� ��������"
-#: ../install_steps_interactive.pm_.c:833
+#: ../install_steps_interactive.pm_.c:872
msgid "Give the ram size in Mb"
msgstr "������� �������� RAM-� � Mb"
-#: ../install_steps_interactive.pm_.c:861
-#: ../install_steps_interactive.pm_.c:1031
+#: ../install_steps_interactive.pm_.c:888
+msgid "Use existing configuration for X11?"
+msgstr "�� �������� ��������� ������������� �� X11 ?"
+
+#: ../install_steps_interactive.pm_.c:900
+#: ../install_steps_interactive.pm_.c:1070
msgid "Try to find PCI devices?"
msgstr "�� �� �� ������ PCI ������� ?"
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:915
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -2805,7 +2796,7 @@ msgstr ""
"\n"
"�� �� ������� ������ �� �������� ?"
-#: ../install_steps_interactive.pm_.c:883
+#: ../install_steps_interactive.pm_.c:922
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2827,26 +2818,26 @@ msgstr ""
"����������� � ������������� ����� ������� ������ ���� � ����-�������������\n"
"�������� ��������� Linux Mandrake '������ �� ���������'."
-#: ../install_steps_interactive.pm_.c:892
+#: ../install_steps_interactive.pm_.c:931
msgid "Shutting down"
msgstr "����� ������"
-#: ../install_steps_interactive.pm_.c:906
+#: ../install_steps_interactive.pm_.c:945
#, c-format
msgid "Installing driver for %s card %s"
msgstr "���������� ������� �� %s ������� %s"
-#: ../install_steps_interactive.pm_.c:907
+#: ../install_steps_interactive.pm_.c:946
#, c-format
msgid "(module %s)"
msgstr "(����� %s)"
-#: ../install_steps_interactive.pm_.c:917
+#: ../install_steps_interactive.pm_.c:956
#, c-format
msgid "Which %s driver should I try?"
msgstr "���� %s ������� �� ������?"
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:964
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2862,20 +2853,20 @@ msgstr ""
"���� �� ������� ������� ������� �� ����, ��� �� �� ������� ��� ������?\n"
"������ �� �� �� ����� ��������� ��� �������, ��� ���� ������ ������� �����."
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:969
msgid "Autoprobe"
msgstr "���������� �����"
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:969
msgid "Specify options"
msgstr "�������� ������"
-#: ../install_steps_interactive.pm_.c:934
+#: ../install_steps_interactive.pm_.c:973
#, c-format
msgid "You may now provide its options to module %s."
msgstr "������ ������� ������ ������ �� ����� %s."
-#: ../install_steps_interactive.pm_.c:940
+#: ../install_steps_interactive.pm_.c:979
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2886,11 +2877,11 @@ msgstr ""
"������ �� � ������� ``���=�������� ���2=��������2 ...''.\n"
"�� ������, ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:943
+#: ../install_steps_interactive.pm_.c:982
msgid "Module options:"
msgstr "������ ������:"
-#: ../install_steps_interactive.pm_.c:953
+#: ../install_steps_interactive.pm_.c:992
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2899,26 +2890,26 @@ msgstr ""
"�������� ������ %s ��������.\n"
"�� �� ������ �������� ������ �� ������ ����������� ?"
-#: ../install_steps_interactive.pm_.c:966
+#: ../install_steps_interactive.pm_.c:1005
msgid "Try to find PCMCIA cards?"
msgstr "�� �� �� ������ PCMCIA ������� ?"
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:1006
msgid "Configuring PCMCIA cards..."
msgstr "������������ PCMCIA �������..."
-#: ../install_steps_interactive.pm_.c:967
+#: ../install_steps_interactive.pm_.c:1006
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:974
+#: ../install_steps_interactive.pm_.c:1013
msgid ""
"Linux does not yet fully support ultra dma 66 HPT.\n"
"As a work-around i can make a custom floppy giving access the hard drive on "
"ide2 and ide3"
msgstr ""
-#: ../install_steps_interactive.pm_.c:995
+#: ../install_steps_interactive.pm_.c:1034
#, fuzzy
msgid ""
"Enter a floppy to create an HTP enabled boot\n"
@@ -2927,46 +2918,46 @@ msgstr ""
"������� ������� � ������\n"
"��� ������ �� ������� �� ���� ��������� !"
-#: ../install_steps_interactive.pm_.c:1012
+#: ../install_steps_interactive.pm_.c:1051
msgid "It is necessary to restart installation booting on the floppy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1013
+#: ../install_steps_interactive.pm_.c:1052
msgid "It is necessary to restart installation with the new parameters"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1017
+#: ../install_steps_interactive.pm_.c:1056
#, c-format
msgid ""
"Failed to create an HTP boot floppy.\n"
"You may have to restart installation and give ``%s'' at the prompt"
msgstr ""
-#: ../install_steps_interactive.pm_.c:1037
+#: ../install_steps_interactive.pm_.c:1076
#, c-format
msgid "Found %s %s interfaces"
msgstr "�������� %s %s ���������"
-#: ../install_steps_interactive.pm_.c:1038
+#: ../install_steps_interactive.pm_.c:1077
msgid "Do you have another one?"
msgstr "�� �� ����� ��� �����?"
-#: ../install_steps_interactive.pm_.c:1039
+#: ../install_steps_interactive.pm_.c:1078
#, c-format
msgid "Do you have any %s interface?"
msgstr "����� �� ��� %s ����������?"
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:1080 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
msgid "No"
msgstr "��"
-#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:1080 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424
msgid "Yes"
msgstr "��"
-#: ../install_steps_interactive.pm_.c:1042
+#: ../install_steps_interactive.pm_.c:1081
msgid "See hardware info"
msgstr "�������� ����������� � ��������"
@@ -3108,91 +3099,91 @@ msgstr "����������"
msgid "Latin American"
msgstr "������-��������"
-#: ../keyboard.pm_.c:111
+#: ../keyboard.pm_.c:112
msgid "Dutch"
msgstr ""
-#: ../keyboard.pm_.c:112
+#: ../keyboard.pm_.c:113
msgid "Lithuanian AZERTY"
msgstr "��������� AZERTY"
-#: ../keyboard.pm_.c:113
+#: ../keyboard.pm_.c:114
msgid "Lithuanian \"number row\" QWERTY"
msgstr "��������� QWERTY"
-#: ../keyboard.pm_.c:114
+#: ../keyboard.pm_.c:115
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "��������� \"��������\" QWERTY"
-#: ../keyboard.pm_.c:115
+#: ../keyboard.pm_.c:116
msgid "Norwegian"
msgstr "��������"
-#: ../keyboard.pm_.c:116
+#: ../keyboard.pm_.c:117
msgid "Polish"
msgstr "������"
-#: ../keyboard.pm_.c:117
+#: ../keyboard.pm_.c:118
msgid "Portuguese"
msgstr "�����������"
-#: ../keyboard.pm_.c:118
+#: ../keyboard.pm_.c:119
msgid "Canadian (Quebec)"
msgstr "�������� (������)"
-#: ../keyboard.pm_.c:119
+#: ../keyboard.pm_.c:120
msgid "Russian"
msgstr "�����"
-#: ../keyboard.pm_.c:120
+#: ../keyboard.pm_.c:121
msgid "Russian (Yawerty)"
msgstr "����� (������)"
-#: ../keyboard.pm_.c:121
+#: ../keyboard.pm_.c:122
msgid "Swedish"
msgstr "�������"
-#: ../keyboard.pm_.c:122
+#: ../keyboard.pm_.c:123
msgid "Slovenian"
msgstr "����������"
-#: ../keyboard.pm_.c:123
+#: ../keyboard.pm_.c:124
msgid "Slovakian"
msgstr "��������"
-#: ../keyboard.pm_.c:124
+#: ../keyboard.pm_.c:125
msgid "Thai keyboard"
msgstr "���� ���������"
-#: ../keyboard.pm_.c:125
+#: ../keyboard.pm_.c:126
msgid "Turkish (traditional \"F\" model)"
msgstr "������ (������������� \"F\" �����)"
-#: ../keyboard.pm_.c:126
+#: ../keyboard.pm_.c:127
msgid "Turkish (modern \"Q\" model)"
msgstr "������ (������� \"Q\" �����)"
-#: ../keyboard.pm_.c:127
+#: ../keyboard.pm_.c:128
msgid "Ukrainian"
msgstr "����������"
-#: ../keyboard.pm_.c:128
+#: ../keyboard.pm_.c:129
msgid "UK keyboard"
msgstr ""
-#: ../keyboard.pm_.c:129
+#: ../keyboard.pm_.c:130
msgid "US keyboard"
msgstr ""
-#: ../keyboard.pm_.c:130
+#: ../keyboard.pm_.c:131
msgid "US keyboard (international)"
msgstr ""
-#: ../keyboard.pm_.c:131
+#: ../keyboard.pm_.c:132
msgid "Yugoslavian (latin layout)"
msgstr "������ (��������� �����)"
-#: ../lilo.pm_.c:142
+#: ../lilo.pm_.c:145
#, c-format
msgid ""
"Welcome to LILO the operating system chooser!\n"
@@ -3712,6 +3703,239 @@ msgstr "���� �������� serial_usb\n"
msgid "Emulate third button?"
msgstr "�� �������� ��� 3 �������?"
+#: ../standalone/rpmdrake_.c:25
+#, fuzzy
+msgid "reading configuration"
+msgstr "��������� �������������"
+
+#: ../standalone/rpmdrake_.c:45 ../standalone/rpmdrake_.c:50
+#: ../standalone/rpmdrake_.c:253
+msgid "File"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:48 ../standalone/rpmdrake_.c:229
+#: ../standalone/rpmdrake_.c:253 ../standalone/rpmdrake_.c:269
+msgid "Search"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:49 ../standalone/rpmdrake_.c:56
+#, fuzzy
+msgid "Package"
+msgstr "%d ������"
+
+#: ../standalone/rpmdrake_.c:51
+#, fuzzy
+msgid "Text"
+msgstr "�������"
+
+#: ../standalone/rpmdrake_.c:53
+#, fuzzy
+msgid "Tree"
+msgstr "�����"
+
+#: ../standalone/rpmdrake_.c:54
+msgid "Sort by"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:55
+msgid "Category"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:58
+#, fuzzy
+msgid "See"
+msgstr "������"
+
+#: ../standalone/rpmdrake_.c:59 ../standalone/rpmdrake_.c:163
+#, fuzzy
+msgid "Installed packages"
+msgstr "���������� ����� %s"
+
+#: ../standalone/rpmdrake_.c:60
+#, fuzzy
+msgid "Available packages"
+msgstr "������ ������"
+
+#: ../standalone/rpmdrake_.c:62
+#, fuzzy
+msgid "Show only leaves"
+msgstr "������� ���"
+
+#: ../standalone/rpmdrake_.c:67
+msgid "Expand all"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:68
+#, fuzzy
+msgid "Collapse all"
+msgstr "������ ���"
+
+#: ../standalone/rpmdrake_.c:70
+#, fuzzy
+msgid "Configuration"
+msgstr "��������� �������������"
+
+#: ../standalone/rpmdrake_.c:71
+msgid "Add location of packages"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:75
+msgid "Update location"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:79 ../standalone/rpmdrake_.c:328
+#, fuzzy
+msgid "Remove"
+msgstr "������� ����"
+
+#: ../standalone/rpmdrake_.c:100
+msgid "Configuration: Add Location"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:101
+msgid "Expand Tree"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:102
+msgid "Collapse Tree"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:103
+#, fuzzy
+msgid "Find Package"
+msgstr "%d ������"
+
+#: ../standalone/rpmdrake_.c:104
+msgid "Find Package containing file"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:105
+msgid "Toggle between Installed and Available"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:139
+msgid "Files:\n"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:161 ../standalone/rpmdrake_.c:209
+#, fuzzy
+msgid "Uninstall"
+msgstr "����������"
+
+#: ../standalone/rpmdrake_.c:163
+#, fuzzy
+msgid "Choose package to install"
+msgstr "������ �� �����������"
+
+#: ../standalone/rpmdrake_.c:190
+msgid "Checking dependencies"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:190 ../standalone/rpmdrake_.c:409
+msgid "Wait"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:209
+#, fuzzy
+msgid "The following packages are going to be uninstalled"
+msgstr "������ �� �����������"
+
+#: ../standalone/rpmdrake_.c:210
+#, fuzzy
+msgid "Uninstalling the RPMs"
+msgstr "���������� ����� %s"
+
+#: ../standalone/rpmdrake_.c:229 ../standalone/rpmdrake_.c:269
+msgid "Regexp"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:229
+msgid "Which package are looking for"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:238 ../standalone/rpmdrake_.c:262
+#: ../standalone/rpmdrake_.c:278
+#, c-format
+msgid "%s not found"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:238 ../standalone/rpmdrake_.c:262
+#: ../standalone/rpmdrake_.c:278
+msgid "No match"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:238 ../standalone/rpmdrake_.c:262
+#: ../standalone/rpmdrake_.c:278
+msgid "No more match"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:246
+msgid ""
+"rpmdrake is currently in ``low memory'' mode.\n"
+"I'm going to relaunch rpmdrake to allow searching files"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:253
+msgid "Which file are you looking for"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:269
+msgid "What are looking for"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:289
+msgid "Give a name (eg: `extra', `commercial')"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:291
+#, fuzzy
+msgid "Directory"
+msgstr "������"
+
+#: ../standalone/rpmdrake_.c:294
+msgid "No cdrom available (nothing in /mnt/cdrom)"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:298
+msgid "URL of the directory containing the RPMs"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:299
+msgid ""
+"For FTP and HTTP, you need to give the location for hdlist\n"
+"It must be relative to the URL above"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:302
+msgid "Please submit the following information"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:304
+#, fuzzy, c-format
+msgid "%s is already in use"
+msgstr "��� ������ �� ��� � ��������"
+
+#: ../standalone/rpmdrake_.c:315 ../standalone/rpmdrake_.c:321
+#: ../standalone/rpmdrake_.c:329
+msgid "Updating the RPMs base"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:328
+#, fuzzy, c-format
+msgid "Going to remove entry %s"
+msgstr "������� ����"
+
+#: ../standalone/rpmdrake_.c:360
+msgid "Finding leaves"
+msgstr ""
+
+#: ../standalone/rpmdrake_.c:360
+msgid "Finding leaves takes some time"
+msgstr ""
+
+#~ msgid "Going to install %d MB. You can choose to install more programs"
+#~ msgstr "����������� %d MB. ������ �������� �� ����������� ��� ��������"
+
#, fuzzy
#~ msgid "Enter a floppy (all data will be lost)"
#~ msgstr ""