summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install_steps_interactive.pm7
-rw-r--r--perl-install/share/po/DrakX.pot390
-rw-r--r--perl-install/share/po/no.po423
-rw-r--r--perl-install/share/po/sp.po397
4 files changed, 693 insertions, 524 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 4af34d80c..a78072326 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -455,8 +455,11 @@ mandatory laws of public order. However this agreement expressly excludes any
conflict of laws, principles, choice of law or rule to the contrary. Therefore
French laws shall prevail on any other local laws.
-For any queries relating to these agreement, please contact Mandrakesoft 43, rue
-d'Aboukir, 75002 Paris FRANCE")) || return;
+For any queries relating to these agreement, please contact
+Mandrakesoft
+43, rue d'Aboukir
+75002 Paris
+FRANCE")) || return;
require crypto;
eval {
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 1077b4bc8..6ee57e572 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-27 05:58+0100\n"
+"POT-Creation-Date: 1999-12-27 16:45+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"
@@ -115,7 +115,7 @@ msgstr ""
msgid "An error occurred, try changing some parameters"
msgstr ""
-#: ../Xconfigurator.pm_.c:370 ../Xconfigurator.pm_.c:535
+#: ../Xconfigurator.pm_.c:370 ../Xconfigurator.pm_.c:536
msgid "Automatic resolutions"
msgstr ""
@@ -126,138 +126,138 @@ msgid ""
"You can switch if off if you want, you'll hear a beep when it's over"
msgstr ""
-#: ../Xconfigurator.pm_.c:422 ../printerdrake.pm_.c:210
+#: ../Xconfigurator.pm_.c:423 ../printerdrake.pm_.c:210
msgid "Resolution"
msgstr ""
-#: ../Xconfigurator.pm_.c:457
+#: ../Xconfigurator.pm_.c:458
msgid "Choose resolution and color depth"
msgstr ""
-#: ../Xconfigurator.pm_.c:465
+#: ../Xconfigurator.pm_.c:466
msgid "Show all"
msgstr ""
-#: ../Xconfigurator.pm_.c:489
+#: ../Xconfigurator.pm_.c:490
msgid "Resolutions"
msgstr ""
-#: ../Xconfigurator.pm_.c:536
+#: ../Xconfigurator.pm_.c:537
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:541
+#: ../Xconfigurator.pm_.c:542
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:733
+#: ../Xconfigurator.pm_.c:734
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:734
+#: ../Xconfigurator.pm_.c:735
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:735
+#: ../Xconfigurator.pm_.c:736
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:736
+#: ../Xconfigurator.pm_.c:737
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:737
+#: ../Xconfigurator.pm_.c:738
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:738
+#: ../Xconfigurator.pm_.c:739
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:740
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:740
+#: ../Xconfigurator.pm_.c:741
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:741
+#: ../Xconfigurator.pm_.c:742
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../Xconfigurator.pm_.c:755
+#: ../Xconfigurator.pm_.c:756
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../Xconfigurator.pm_.c:769
+#: ../Xconfigurator.pm_.c:770
msgid "Change Monitor"
msgstr ""
-#: ../Xconfigurator.pm_.c:770
+#: ../Xconfigurator.pm_.c:771
msgid "Change Graphic card"
msgstr ""
-#: ../Xconfigurator.pm_.c:771
+#: ../Xconfigurator.pm_.c:772
msgid "Change Server options"
msgstr ""
-#: ../Xconfigurator.pm_.c:772
+#: ../Xconfigurator.pm_.c:773
msgid "Change Resolution"
msgstr ""
-#: ../Xconfigurator.pm_.c:773
+#: ../Xconfigurator.pm_.c:774
msgid "Automatical resolutions search"
msgstr ""
-#: ../Xconfigurator.pm_.c:777
+#: ../Xconfigurator.pm_.c:778
msgid "Show information"
msgstr ""
-#: ../Xconfigurator.pm_.c:778
+#: ../Xconfigurator.pm_.c:779
msgid "Test again"
msgstr ""
-#: ../Xconfigurator.pm_.c:779
+#: ../Xconfigurator.pm_.c:780
msgid "Quit"
msgstr ""
-#: ../Xconfigurator.pm_.c:783
+#: ../Xconfigurator.pm_.c:784
msgid "What do you want to do?"
msgstr ""
-#: ../Xconfigurator.pm_.c:790
+#: ../Xconfigurator.pm_.c:791
msgid "Forget the changes?"
msgstr ""
-#: ../Xconfigurator.pm_.c:805
+#: ../Xconfigurator.pm_.c:806
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../Xconfigurator.pm_.c:821
+#: ../Xconfigurator.pm_.c:822
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../Xconfigurator.pm_.c:824
+#: ../Xconfigurator.pm_.c:825
msgid "X at startup"
msgstr ""
-#: ../Xconfigurator.pm_.c:825
+#: ../Xconfigurator.pm_.c:826
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:531
-#: ../install_steps_interactive.pm_.c:655 ../standalone/adduserdrake_.c:27
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:561
+#: ../install_steps_interactive.pm_.c:685 ../standalone/adduserdrake_.c:27
msgid "Done"
msgstr ""
@@ -1397,8 +1397,8 @@ msgstr ""
msgid "Configure printer"
msgstr ""
-#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:490
+#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:519
+#: ../install_steps_interactive.pm_.c:520
msgid "Set root password"
msgstr ""
@@ -1502,7 +1502,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr ""
-#: ../install_steps.pm_.c:502
+#: ../install_steps.pm_.c:503
msgid "No floppy drive available"
msgstr ""
@@ -1588,7 +1588,7 @@ msgstr ""
msgid "There was an error ordering packages:"
msgstr ""
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:800
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:830
msgid "Use existing configuration for X11?"
msgstr ""
@@ -1885,9 +1885,9 @@ msgid "Login ID"
msgstr ""
#: ../install_steps_interactive.pm_.c:404
-#: ../install_steps_interactive.pm_.c:491
-#: ../install_steps_interactive.pm_.c:537
-#: ../install_steps_interactive.pm_.c:631 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:521
+#: ../install_steps_interactive.pm_.c:567
+#: ../install_steps_interactive.pm_.c:661 ../standalone/adduserdrake_.c:33
msgid "Password"
msgstr ""
@@ -1927,44 +1927,92 @@ msgstr ""
msgid "Bringing up the network"
msgstr ""
-#: ../install_steps_interactive.pm_.c:436
+#: ../install_steps_interactive.pm_.c:430
+msgid ""
+"You have now the possibility to download software aimed for encryption.\n"
+"\n"
+"WARNING:\n"
+"\n"
+"Due to different general requirements applicable to these software and "
+"imposed\n"
+"by various jurisdictions, customer and/or end user of theses software "
+"should\n"
+"ensure that the laws of his/their jurisdiction allow him/them to download, "
+"stock\n"
+"and/or use these software.\n"
+"\n"
+"In addition customer and/or end user shall particularly be aware to not "
+"infringe\n"
+"the laws of his/their jurisdiction. Should customer and/or end user do not\n"
+"respect the provision of these applicable laws, he/they will incur serious\n"
+"sanctions.\n"
+"\n"
+"In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
+"liable\n"
+"for special, indirect or incidental damages whatsoever (including, but not\n"
+"limited to loss of profits, business interruption, loss of commercial data "
+"and\n"
+"other pecuniary losses, and eventual liabilities and indemnification to be "
+"paid\n"
+"pursuant to a court decision) arising out of use, possession, or the sole\n"
+"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"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:466
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:441
+#: ../install_steps_interactive.pm_.c:471
msgid "Contacting the mirror to get the list of available packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:445
+#: ../install_steps_interactive.pm_.c:475
msgid "Which packages do you want to install"
msgstr ""
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:477
msgid "Downloading cryptographic packages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:457
+#: ../install_steps_interactive.pm_.c:487
msgid "Which is your timezone?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:458
+#: ../install_steps_interactive.pm_.c:488
msgid "Is your hardware clock set to GMT?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:498
msgid "Printer"
msgstr ""
-#: ../install_steps_interactive.pm_.c:469
+#: ../install_steps_interactive.pm_.c:499
msgid "Would you like to configure a printer?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:519
msgid "No password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:705 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:519
+#: ../install_steps_interactive.pm_.c:735 ../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
@@ -1972,111 +2020,111 @@ msgstr ""
msgid "Ok"
msgstr ""
-#: ../install_steps_interactive.pm_.c:492
-#: ../install_steps_interactive.pm_.c:538
-#: ../install_steps_interactive.pm_.c:632 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:522
+#: ../install_steps_interactive.pm_.c:568
+#: ../install_steps_interactive.pm_.c:662 ../standalone/adduserdrake_.c:34
msgid "Password (again)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:494
+#: ../install_steps_interactive.pm_.c:524
msgid "Use shadow file"
msgstr ""
-#: ../install_steps_interactive.pm_.c:494
+#: ../install_steps_interactive.pm_.c:524
msgid "shadow"
msgstr ""
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:525
msgid "MD5"
msgstr ""
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:525
msgid "Use MD5 passwords"
msgstr ""
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:527
msgid "Use NIS"
msgstr ""
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:527
msgid "yellow pages"
msgstr ""
-#: ../install_steps_interactive.pm_.c:501
-#: ../install_steps_interactive.pm_.c:549
-#: ../install_steps_interactive.pm_.c:643 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:579
+#: ../install_steps_interactive.pm_.c:673 ../standalone/adduserdrake_.c:45
msgid "Please try again"
msgstr ""
-#: ../install_steps_interactive.pm_.c:501
-#: ../install_steps_interactive.pm_.c:549
-#: ../install_steps_interactive.pm_.c:643 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:579
+#: ../install_steps_interactive.pm_.c:673 ../standalone/adduserdrake_.c:45
msgid "The passwords do not match"
msgstr ""
-#: ../install_steps_interactive.pm_.c:503
-#: ../install_steps_interactive.pm_.c:550 ../standalone/adduserdrake_.c:46
+#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:580 ../standalone/adduserdrake_.c:46
msgid "This password is too simple"
msgstr ""
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:540
msgid "Authentification NIS"
msgstr ""
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:541
msgid "NIS Domain"
msgstr ""
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:541
msgid "NIS Server"
msgstr ""
-#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:561 ../standalone/adduserdrake_.c:27
msgid "Accept user"
msgstr ""
-#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:561 ../standalone/adduserdrake_.c:27
msgid "Add user"
msgstr ""
-#: ../install_steps_interactive.pm_.c:532 ../standalone/adduserdrake_.c:28
+#: ../install_steps_interactive.pm_.c:562 ../standalone/adduserdrake_.c:28
#, c-format
msgid "(already added %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:532 ../standalone/adduserdrake_.c:28
+#: ../install_steps_interactive.pm_.c:562 ../standalone/adduserdrake_.c:28
#, c-format
msgid ""
"Enter a user\n"
"%s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:30
+#: ../install_steps_interactive.pm_.c:564 ../standalone/adduserdrake_.c:30
msgid "Real name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:31
+#: ../install_steps_interactive.pm_.c:565 ../standalone/adduserdrake_.c:31
msgid "User name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:540 ../standalone/adduserdrake_.c:36
+#: ../install_steps_interactive.pm_.c:570 ../standalone/adduserdrake_.c:36
msgid "Shell"
msgstr ""
-#: ../install_steps_interactive.pm_.c:551 ../standalone/adduserdrake_.c:47
+#: ../install_steps_interactive.pm_.c:581 ../standalone/adduserdrake_.c:47
msgid "Please give a user name"
msgstr ""
-#: ../install_steps_interactive.pm_.c:552 ../standalone/adduserdrake_.c:48
+#: ../install_steps_interactive.pm_.c:582 ../standalone/adduserdrake_.c:48
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: ../install_steps_interactive.pm_.c:553 ../standalone/adduserdrake_.c:49
+#: ../install_steps_interactive.pm_.c:583 ../standalone/adduserdrake_.c:49
msgid "This user name is already added"
msgstr ""
-#: ../install_steps_interactive.pm_.c:574
+#: ../install_steps_interactive.pm_.c:604
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 "
@@ -2090,266 +2138,266 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:613
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:616
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../install_steps_interactive.pm_.c:587
+#: ../install_steps_interactive.pm_.c:617
msgid "Skip"
msgstr ""
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:621
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:622
msgid "Creating bootdisk"
msgstr ""
-#: ../install_steps_interactive.pm_.c:599
+#: ../install_steps_interactive.pm_.c:629
msgid "Preparing bootloader"
msgstr ""
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:641
msgid "First sector of boot partition"
msgstr ""
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:641
msgid "First sector of drive (MBR)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:646
msgid "LILO Installation"
msgstr ""
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:647
msgid "Where do you want to install the bootloader?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:652
msgid "Do you want to use LILO?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:625
+#: ../install_steps_interactive.pm_.c:655
msgid "Boot device"
msgstr ""
-#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:656
msgid "Linear (needed for some SCSI drives)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:656
msgid "linear"
msgstr ""
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:657
msgid "Compact"
msgstr ""
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:657
msgid "compact"
msgstr ""
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:658
msgid "Delay before booting default image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:659
msgid "Video mode"
msgstr ""
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:663
msgid "Restrict command line options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:663
msgid "restrict"
msgstr ""
-#: ../install_steps_interactive.pm_.c:639
+#: ../install_steps_interactive.pm_.c:669
msgid "LILO main options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:642
+#: ../install_steps_interactive.pm_.c:672
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:653
+#: ../install_steps_interactive.pm_.c:683
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:655
+#: ../install_steps_interactive.pm_.c:685
msgid "Add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Linux"
msgstr ""
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Other OS (windows...)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Which type of entry do you want to add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:684
+#: ../install_steps_interactive.pm_.c:714
msgid "Image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:685
-#: ../install_steps_interactive.pm_.c:693
+#: ../install_steps_interactive.pm_.c:715
+#: ../install_steps_interactive.pm_.c:723
msgid "Root"
msgstr ""
-#: ../install_steps_interactive.pm_.c:686
+#: ../install_steps_interactive.pm_.c:716
msgid "Append"
msgstr ""
-#: ../install_steps_interactive.pm_.c:687
+#: ../install_steps_interactive.pm_.c:717
msgid "Initrd"
msgstr ""
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:718
msgid "Read-write"
msgstr ""
-#: ../install_steps_interactive.pm_.c:694
+#: ../install_steps_interactive.pm_.c:724
msgid "Table"
msgstr ""
-#: ../install_steps_interactive.pm_.c:695
+#: ../install_steps_interactive.pm_.c:725
msgid "Unsafe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:700
+#: ../install_steps_interactive.pm_.c:730
msgid "Label"
msgstr ""
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:732
msgid "Default"
msgstr ""
-#: ../install_steps_interactive.pm_.c:705
+#: ../install_steps_interactive.pm_.c:735
msgid "Remove entry"
msgstr ""
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:738
msgid "Empty label not allowed"
msgstr ""
-#: ../install_steps_interactive.pm_.c:709
+#: ../install_steps_interactive.pm_.c:739
msgid "This label is already in use"
msgstr ""
-#: ../install_steps_interactive.pm_.c:710
+#: ../install_steps_interactive.pm_.c:740
#, c-format
msgid "A entry %s already exists"
msgstr ""
-#: ../install_steps_interactive.pm_.c:724
+#: ../install_steps_interactive.pm_.c:754
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:738
+#: ../install_steps_interactive.pm_.c:768
msgid "Proxies configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:739
+#: ../install_steps_interactive.pm_.c:769
msgid "HTTP proxy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:770
msgid "FTP proxy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:746
+#: ../install_steps_interactive.pm_.c:776
msgid "Proxy should be http://..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:747
+#: ../install_steps_interactive.pm_.c:777
msgid "Proxy should be ftp://..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:757 ../standalone/draksec_.c:20
+#: ../install_steps_interactive.pm_.c:787 ../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr ""
-#: ../install_steps_interactive.pm_.c:758 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:788 ../standalone/draksec_.c:21
msgid "Poor"
msgstr ""
-#: ../install_steps_interactive.pm_.c:759 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:789 ../standalone/draksec_.c:22
msgid "Low"
msgstr ""
-#: ../install_steps_interactive.pm_.c:760 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:790 ../standalone/draksec_.c:23
msgid "Medium"
msgstr ""
-#: ../install_steps_interactive.pm_.c:761 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:791 ../standalone/draksec_.c:24
msgid "High"
msgstr ""
-#: ../install_steps_interactive.pm_.c:762 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:792 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr ""
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:805
msgid "Miscellaneous questions"
msgstr ""
-#: ../install_steps_interactive.pm_.c:776
+#: ../install_steps_interactive.pm_.c:806
msgid "(may cause data corruption)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:776
+#: ../install_steps_interactive.pm_.c:806
msgid "Use hard drive optimisations?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:777 ../standalone/draksec_.c:39
+#: ../install_steps_interactive.pm_.c:807 ../standalone/draksec_.c:39
msgid "Choose security level"
msgstr ""
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:808
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:779
+#: ../install_steps_interactive.pm_.c:809
msgid "Removable media automounting"
msgstr ""
-#: ../install_steps_interactive.pm_.c:781
+#: ../install_steps_interactive.pm_.c:811
msgid "Enable num lock at startup"
msgstr ""
-#: ../install_steps_interactive.pm_.c:784
+#: ../install_steps_interactive.pm_.c:814
msgid "Give the ram size in Mb"
msgstr ""
-#: ../install_steps_interactive.pm_.c:812
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:842
+#: ../install_steps_interactive.pm_.c:955
msgid "Try to find PCI devices?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:857
msgid ""
"Some steps are not completed.\n"
"\n"
"Do you really want to quit now?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:834
+#: ../install_steps_interactive.pm_.c:864
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2362,26 +2410,26 @@ msgid ""
"install chapter of the Official Linux-Mandrake User's Guide."
msgstr ""
-#: ../install_steps_interactive.pm_.c:843
+#: ../install_steps_interactive.pm_.c:873
msgid "Shutting down"
msgstr ""
-#: ../install_steps_interactive.pm_.c:857
+#: ../install_steps_interactive.pm_.c:887
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:858
+#: ../install_steps_interactive.pm_.c:888
#, c-format
msgid "(module %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:868
+#: ../install_steps_interactive.pm_.c:898
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:906
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2393,20 +2441,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../install_steps_interactive.pm_.c:881
+#: ../install_steps_interactive.pm_.c:911
msgid "Autoprobe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:881
+#: ../install_steps_interactive.pm_.c:911
msgid "Specify options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:885
+#: ../install_steps_interactive.pm_.c:915
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../install_steps_interactive.pm_.c:891
+#: ../install_steps_interactive.pm_.c:921
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2414,54 +2462,54 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../install_steps_interactive.pm_.c:894
+#: ../install_steps_interactive.pm_.c:924
msgid "Module options:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:904
+#: ../install_steps_interactive.pm_.c:934
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:917
+#: ../install_steps_interactive.pm_.c:947
msgid "Try to find PCMCIA cards?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:918
+#: ../install_steps_interactive.pm_.c:948
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:918
+#: ../install_steps_interactive.pm_.c:948
msgid "PCMCIA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:929
+#: ../install_steps_interactive.pm_.c:959
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:960
msgid "Do you have another one?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:931
+#: ../install_steps_interactive.pm_.c:961
#, c-format
msgid "Do you have any %s interface?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:933 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:963 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
msgid "No"
msgstr ""
-#: ../install_steps_interactive.pm_.c:933 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:963 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424
msgid "Yes"
msgstr ""
-#: ../install_steps_interactive.pm_.c:934
+#: ../install_steps_interactive.pm_.c:964
msgid "See hardware info"
msgstr ""
@@ -3051,8 +3099,10 @@ msgstr ""
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
-"Does it work properly? Printing status:\n"
-"%s"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
msgstr ""
#: ../printerdrake.pm_.c:258
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index f9601af61..a87849ec4 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: 1999-12-27 05:58+0100\n"
+"POT-Creation-Date: 1999-12-27 16:45+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -95,7 +95,7 @@ msgstr "Vil du teste konfigurasjonen?"
#: ../Xconfigurator.pm_.c:292
msgid "Warning: testing is dangerous on this graphic card"
-msgstr ""
+msgstr "Advarsel: testing er farlig med dette grafikk-kortet"
#: ../Xconfigurator.pm_.c:295
msgid "Test configuration"
@@ -126,7 +126,7 @@ msgstr "Er dette riktig?"
msgid "An error occurred, try changing some parameters"
msgstr "En feil oppsto, pr�v � endre noen parametere"
-#: ../Xconfigurator.pm_.c:370 ../Xconfigurator.pm_.c:535
+#: ../Xconfigurator.pm_.c:370 ../Xconfigurator.pm_.c:536
msgid "Automatic resolutions"
msgstr "Automatiske oppl�sninger"
@@ -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:422 ../printerdrake.pm_.c:210
+#: ../Xconfigurator.pm_.c:423 ../printerdrake.pm_.c:210
msgid "Resolution"
msgstr "Oppl�sning"
-#: ../Xconfigurator.pm_.c:457
+#: ../Xconfigurator.pm_.c:458
msgid "Choose resolution and color depth"
msgstr "Velg oppl�sning og fargedybde"
-#: ../Xconfigurator.pm_.c:465
+#: ../Xconfigurator.pm_.c:466
msgid "Show all"
msgstr "Vis alle"
-#: ../Xconfigurator.pm_.c:489
+#: ../Xconfigurator.pm_.c:490
msgid "Resolutions"
msgstr "Oppl�sninger"
-#: ../Xconfigurator.pm_.c:536
+#: ../Xconfigurator.pm_.c:537
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:541
+#: ../Xconfigurator.pm_.c:542
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:733
+#: ../Xconfigurator.pm_.c:734
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../Xconfigurator.pm_.c:734
+#: ../Xconfigurator.pm_.c:735
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../Xconfigurator.pm_.c:735
+#: ../Xconfigurator.pm_.c:736
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../Xconfigurator.pm_.c:736
+#: ../Xconfigurator.pm_.c:737
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../Xconfigurator.pm_.c:737
+#: ../Xconfigurator.pm_.c:738
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../Xconfigurator.pm_.c:738
+#: ../Xconfigurator.pm_.c:739
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:740
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../Xconfigurator.pm_.c:740
+#: ../Xconfigurator.pm_.c:741
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../Xconfigurator.pm_.c:741
+#: ../Xconfigurator.pm_.c:742
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../Xconfigurator.pm_.c:755
+#: ../Xconfigurator.pm_.c:756
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../Xconfigurator.pm_.c:769
+#: ../Xconfigurator.pm_.c:770
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../Xconfigurator.pm_.c:770
+#: ../Xconfigurator.pm_.c:771
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../Xconfigurator.pm_.c:771
+#: ../Xconfigurator.pm_.c:772
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../Xconfigurator.pm_.c:772
+#: ../Xconfigurator.pm_.c:773
msgid "Change Resolution"
msgstr "Endre oppl�sning"
-#: ../Xconfigurator.pm_.c:773
+#: ../Xconfigurator.pm_.c:774
msgid "Automatical resolutions search"
msgstr "Automatisk oppl�sningss�k"
-#: ../Xconfigurator.pm_.c:777
+#: ../Xconfigurator.pm_.c:778
msgid "Show information"
msgstr "Vis informasjon"
-#: ../Xconfigurator.pm_.c:778
+#: ../Xconfigurator.pm_.c:779
msgid "Test again"
msgstr "Test igjen"
-#: ../Xconfigurator.pm_.c:779
+#: ../Xconfigurator.pm_.c:780
msgid "Quit"
msgstr "Avslutt"
-#: ../Xconfigurator.pm_.c:783
+#: ../Xconfigurator.pm_.c:784
msgid "What do you want to do?"
msgstr "Hva �nsker du � gj�re?"
-#: ../Xconfigurator.pm_.c:790
+#: ../Xconfigurator.pm_.c:791
msgid "Forget the changes?"
msgstr "Glem endringene?"
-#: ../Xconfigurator.pm_.c:805
+#: ../Xconfigurator.pm_.c:806
#, 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:821
+#: ../Xconfigurator.pm_.c:822
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk s� Ctrl-Alt-BackSpace"
-#: ../Xconfigurator.pm_.c:824
+#: ../Xconfigurator.pm_.c:825
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../Xconfigurator.pm_.c:825
+#: ../Xconfigurator.pm_.c:826
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:531
-#: ../install_steps_interactive.pm_.c:655 ../standalone/adduserdrake_.c:27
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:561
+#: ../install_steps_interactive.pm_.c:685 ../standalone/adduserdrake_.c:27
msgid "Done"
msgstr "Ferdig"
@@ -1774,8 +1774,8 @@ msgstr "Konfigurer tidssone"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:490
+#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:519
+#: ../install_steps_interactive.pm_.c:520
msgid "Set root password"
msgstr "Sett root-passord"
@@ -1821,6 +1821,9 @@ msgid ""
"For this, create a partition (or click on an existing one).\n"
"Then choose action ``Mount point'' and set it to `/'"
msgstr ""
+"Du m� ha en root-partisjon.\n"
+"Opprett en partisjon for dette (eller klikk p� en eksisterende).\n"
+"Velg s� ``Monteringspunkt'' og sett dette til `/'"
#: ../install2.pm_.c:324
msgid "Not enough swap to fulfill installation, please add some"
@@ -1887,7 +1890,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "Dupliser monteringspunkt %s"
-#: ../install_steps.pm_.c:502
+#: ../install_steps.pm_.c:503
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
@@ -1976,7 +1979,7 @@ msgstr "Fortsette uansett?"
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:800
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:830
msgid "Use existing configuration for X11?"
msgstr "Bruke eksisterende konfigurasjon for X11?"
@@ -2293,9 +2296,9 @@ msgid "Login ID"
msgstr "Login ID"
#: ../install_steps_interactive.pm_.c:404
-#: ../install_steps_interactive.pm_.c:491
-#: ../install_steps_interactive.pm_.c:537
-#: ../install_steps_interactive.pm_.c:631 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:521
+#: ../install_steps_interactive.pm_.c:567
+#: ../install_steps_interactive.pm_.c:661 ../standalone/adduserdrake_.c:33
msgid "Password"
msgstr "Passord"
@@ -2335,44 +2338,92 @@ msgstr "Andre DNS-tjener"
msgid "Bringing up the network"
msgstr "Henter opp nettverket"
-#: ../install_steps_interactive.pm_.c:436
+#: ../install_steps_interactive.pm_.c:430
+msgid ""
+"You have now the possibility to download software aimed for encryption.\n"
+"\n"
+"WARNING:\n"
+"\n"
+"Due to different general requirements applicable to these software and "
+"imposed\n"
+"by various jurisdictions, customer and/or end user of theses software "
+"should\n"
+"ensure that the laws of his/their jurisdiction allow him/them to download, "
+"stock\n"
+"and/or use these software.\n"
+"\n"
+"In addition customer and/or end user shall particularly be aware to not "
+"infringe\n"
+"the laws of his/their jurisdiction. Should customer and/or end user do not\n"
+"respect the provision of these applicable laws, he/they will incur serious\n"
+"sanctions.\n"
+"\n"
+"In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
+"liable\n"
+"for special, indirect or incidental damages whatsoever (including, but not\n"
+"limited to loss of profits, business interruption, loss of commercial data "
+"and\n"
+"other pecuniary losses, and eventual liabilities and indemnification to be "
+"paid\n"
+"pursuant to a court decision) arising out of use, possession, or the sole\n"
+"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"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:466
msgid "Choose a mirror from which to get the packages"
msgstr "Velg et speil som pakkene kan hentes fra"
-#: ../install_steps_interactive.pm_.c:441
+#: ../install_steps_interactive.pm_.c:471
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:445
+#: ../install_steps_interactive.pm_.c:475
msgid "Which packages do you want to install"
msgstr "Hvilke pakker �nsker du � installere"
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:477
msgid "Downloading cryptographic packages"
msgstr "Laster ned kryptografiske pakker"
-#: ../install_steps_interactive.pm_.c:457
+#: ../install_steps_interactive.pm_.c:487
msgid "Which is your timezone?"
msgstr "Hvilken er tidsonen din?"
-#: ../install_steps_interactive.pm_.c:458
+#: ../install_steps_interactive.pm_.c:488
msgid "Is your hardware clock set to GMT?"
msgstr "Er maskinvareklokken din satt til GMT?"
-#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:498
msgid "Printer"
msgstr "Skriver"
-#: ../install_steps_interactive.pm_.c:469
+#: ../install_steps_interactive.pm_.c:499
msgid "Would you like to configure a printer?"
msgstr "�nsker du � konfigurere en skriver?"
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:519
msgid "No password"
msgstr "Intet passord"
-#: ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:705 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:519
+#: ../install_steps_interactive.pm_.c:735 ../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
@@ -2380,79 +2431,79 @@ msgstr "Intet passord"
msgid "Ok"
msgstr "Ok"
-#: ../install_steps_interactive.pm_.c:492
-#: ../install_steps_interactive.pm_.c:538
-#: ../install_steps_interactive.pm_.c:632 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:522
+#: ../install_steps_interactive.pm_.c:568
+#: ../install_steps_interactive.pm_.c:662 ../standalone/adduserdrake_.c:34
msgid "Password (again)"
msgstr "Passord (igjen)"
-#: ../install_steps_interactive.pm_.c:494
+#: ../install_steps_interactive.pm_.c:524
msgid "Use shadow file"
msgstr "Bruk skyggefil"
-#: ../install_steps_interactive.pm_.c:494
+#: ../install_steps_interactive.pm_.c:524
msgid "shadow"
msgstr "skygge"
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:525
msgid "MD5"
msgstr "MD5"
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:525
msgid "Use MD5 passwords"
msgstr "Bruk MD5 passord"
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:527
msgid "Use NIS"
msgstr "Bruk NIS"
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:527
msgid "yellow pages"
msgstr "gule sider"
-#: ../install_steps_interactive.pm_.c:501
-#: ../install_steps_interactive.pm_.c:549
-#: ../install_steps_interactive.pm_.c:643 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:579
+#: ../install_steps_interactive.pm_.c:673 ../standalone/adduserdrake_.c:45
msgid "Please try again"
msgstr "Vennligst pr�v igjen"
-#: ../install_steps_interactive.pm_.c:501
-#: ../install_steps_interactive.pm_.c:549
-#: ../install_steps_interactive.pm_.c:643 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:579
+#: ../install_steps_interactive.pm_.c:673 ../standalone/adduserdrake_.c:45
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
-#: ../install_steps_interactive.pm_.c:503
-#: ../install_steps_interactive.pm_.c:550 ../standalone/adduserdrake_.c:46
+#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:580 ../standalone/adduserdrake_.c:46
msgid "This password is too simple"
msgstr "Dette passordet er for enkelt"
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:540
msgid "Authentification NIS"
msgstr "Autentifikasjon NIS"
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:541
msgid "NIS Domain"
msgstr "NIS-domene"
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:541
msgid "NIS Server"
msgstr "NIS-tjener"
-#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:561 ../standalone/adduserdrake_.c:27
msgid "Accept user"
msgstr "Godta bruker"
-#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:561 ../standalone/adduserdrake_.c:27
msgid "Add user"
msgstr "Legg til bruker"
-#: ../install_steps_interactive.pm_.c:532 ../standalone/adduserdrake_.c:28
+#: ../install_steps_interactive.pm_.c:562 ../standalone/adduserdrake_.c:28
#, c-format
msgid "(already added %s)"
msgstr "(allerede lagt til %s)"
-#: ../install_steps_interactive.pm_.c:532 ../standalone/adduserdrake_.c:28
+#: ../install_steps_interactive.pm_.c:562 ../standalone/adduserdrake_.c:28
#, c-format
msgid ""
"Enter a user\n"
@@ -2461,32 +2512,32 @@ msgstr ""
"Entre en bruker\n"
"%s"
-#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:30
+#: ../install_steps_interactive.pm_.c:564 ../standalone/adduserdrake_.c:30
msgid "Real name"
msgstr "Virkelig navn"
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:31
+#: ../install_steps_interactive.pm_.c:565 ../standalone/adduserdrake_.c:31
msgid "User name"
msgstr "Brukernavn"
-#: ../install_steps_interactive.pm_.c:540 ../standalone/adduserdrake_.c:36
+#: ../install_steps_interactive.pm_.c:570 ../standalone/adduserdrake_.c:36
msgid "Shell"
msgstr "Skall"
-#: ../install_steps_interactive.pm_.c:551 ../standalone/adduserdrake_.c:47
+#: ../install_steps_interactive.pm_.c:581 ../standalone/adduserdrake_.c:47
msgid "Please give a user name"
msgstr "Vennligst oppgi et brukernavn"
-#: ../install_steps_interactive.pm_.c:552 ../standalone/adduserdrake_.c:48
+#: ../install_steps_interactive.pm_.c:582 ../standalone/adduserdrake_.c:48
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:553 ../standalone/adduserdrake_.c:49
+#: ../install_steps_interactive.pm_.c:583 ../standalone/adduserdrake_.c:49
msgid "This user name is already added"
msgstr "Denne brukeren er allerede lagt til"
-#: ../install_steps_interactive.pm_.c:574
+#: ../install_steps_interactive.pm_.c:604
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 "
@@ -2510,98 +2561,98 @@ msgstr ""
"systemsvikt.\n"
"�nsker du � opprette en oppstartsdiskett for systemet ditt?"
-#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:613
msgid "Sorry, no floppy drive available"
msgstr "Beklager, ingen diskettstasjon tilgjengelig"
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:616
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:587
+#: ../install_steps_interactive.pm_.c:617
msgid "Skip"
msgstr "Dropp"
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:621
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Sett inn en diskett i stasjon %s"
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:622
msgid "Creating bootdisk"
msgstr "Oppretter oppstartdiskett"
-#: ../install_steps_interactive.pm_.c:599
+#: ../install_steps_interactive.pm_.c:629
msgid "Preparing bootloader"
msgstr "Klargj�r oppstartslaster"
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:641
msgid "First sector of boot partition"
msgstr "F�rste sektor av oppstartspartisjon"
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:641
msgid "First sector of drive (MBR)"
msgstr "F�rste sektor av disk (MBR)"
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:646
msgid "LILO Installation"
msgstr "LILO-installasjon"
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:647
msgid "Where do you want to install the bootloader?"
msgstr "Hvor vil du installere oppstartslasteren?"
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:652
msgid "Do you want to use LILO?"
msgstr "�nsker du � bruke LILO?"
-#: ../install_steps_interactive.pm_.c:625
+#: ../install_steps_interactive.pm_.c:655
msgid "Boot device"
msgstr "Oppstartsenhet"
-#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:656
msgid "Linear (needed for some SCSI drives)"
msgstr "Line�r (beh�ves av noen SCSI-disker)"
-#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:656
msgid "linear"
msgstr "line�r"
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:657
msgid "Compact"
msgstr "Kompakt"
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:657
msgid "compact"
msgstr "kompakt"
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:658
msgid "Delay before booting default image"
msgstr "Forsinkelse f�r oppstart av standard bilde"
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:659
msgid "Video mode"
msgstr "Skjermmodus"
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:663
msgid "Restrict command line options"
msgstr "Begrense kommandolinje-opsjoner"
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:663
msgid "restrict"
msgstr "begrense"
-#: ../install_steps_interactive.pm_.c:639
+#: ../install_steps_interactive.pm_.c:669
msgid "LILO main options"
msgstr "LILO hovedopsjoner"
-#: ../install_steps_interactive.pm_.c:642
+#: ../install_steps_interactive.pm_.c:672
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:653
+#: ../install_steps_interactive.pm_.c:683
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existing ones."
@@ -2609,163 +2660,163 @@ msgstr ""
"Her er f�lgende oppf�ringer i LILO.\n"
"Du kan legge til noen flere eller endre de eksisterende."
-#: ../install_steps_interactive.pm_.c:655
+#: ../install_steps_interactive.pm_.c:685
msgid "Add"
msgstr "Legg til"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Linux"
msgstr "Linux"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Other OS (windows...)"
msgstr "Andre OS (windows...)"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Which type of entry do you want to add"
msgstr "Hvilken inngangstype vil du legge til"
-#: ../install_steps_interactive.pm_.c:684
+#: ../install_steps_interactive.pm_.c:714
msgid "Image"
msgstr "Bilde"
-#: ../install_steps_interactive.pm_.c:685
-#: ../install_steps_interactive.pm_.c:693
+#: ../install_steps_interactive.pm_.c:715
+#: ../install_steps_interactive.pm_.c:723
msgid "Root"
msgstr "Root"
-#: ../install_steps_interactive.pm_.c:686
+#: ../install_steps_interactive.pm_.c:716
msgid "Append"
msgstr "Tilf�ye"
-#: ../install_steps_interactive.pm_.c:687
+#: ../install_steps_interactive.pm_.c:717
msgid "Initrd"
msgstr "Initrd"
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:718
msgid "Read-write"
msgstr "Les-skriv"
-#: ../install_steps_interactive.pm_.c:694
+#: ../install_steps_interactive.pm_.c:724
msgid "Table"
msgstr "Tabell"
-#: ../install_steps_interactive.pm_.c:695
+#: ../install_steps_interactive.pm_.c:725
msgid "Unsafe"
msgstr "Usikker"
-#: ../install_steps_interactive.pm_.c:700
+#: ../install_steps_interactive.pm_.c:730
msgid "Label"
msgstr "Etikett"
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:732
msgid "Default"
msgstr "Standard"
-#: ../install_steps_interactive.pm_.c:705
+#: ../install_steps_interactive.pm_.c:735
msgid "Remove entry"
msgstr "Fjern inngang"
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:738
msgid "Empty label not allowed"
msgstr "Tom etikett er ikke tillatt"
-#: ../install_steps_interactive.pm_.c:709
+#: ../install_steps_interactive.pm_.c:739
msgid "This label is already in use"
msgstr "Denne etiketten er allerede i bruk"
-#: ../install_steps_interactive.pm_.c:710
+#: ../install_steps_interactive.pm_.c:740
#, c-format
msgid "A entry %s already exists"
msgstr "En inngang %s eksisterer ellerede"
-#: ../install_steps_interactive.pm_.c:724
+#: ../install_steps_interactive.pm_.c:754
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. F�lgende feil oppsto:"
-#: ../install_steps_interactive.pm_.c:738
+#: ../install_steps_interactive.pm_.c:768
msgid "Proxies configuration"
msgstr "Proxy-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:739
+#: ../install_steps_interactive.pm_.c:769
msgid "HTTP proxy"
msgstr "HTTP-proxy"
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:770
msgid "FTP proxy"
msgstr "FTP-proxy"
-#: ../install_steps_interactive.pm_.c:746
+#: ../install_steps_interactive.pm_.c:776
msgid "Proxy should be http://..."
msgstr "Proxy burde v�re http://..."
-#: ../install_steps_interactive.pm_.c:747
+#: ../install_steps_interactive.pm_.c:777
msgid "Proxy should be ftp://..."
msgstr "Proxy burde v�re ftp://..."
-#: ../install_steps_interactive.pm_.c:757 ../standalone/draksec_.c:20
+#: ../install_steps_interactive.pm_.c:787 ../standalone/draksec_.c:20
msgid "Welcome To Crackers"
-msgstr ""
+msgstr "Velkommen til Crackers"
-#: ../install_steps_interactive.pm_.c:758 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:788 ../standalone/draksec_.c:21
msgid "Poor"
msgstr "D�rlig"
-#: ../install_steps_interactive.pm_.c:759 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:789 ../standalone/draksec_.c:22
msgid "Low"
msgstr "Lav"
-#: ../install_steps_interactive.pm_.c:760 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:790 ../standalone/draksec_.c:23
msgid "Medium"
msgstr "Medium"
-#: ../install_steps_interactive.pm_.c:761 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:791 ../standalone/draksec_.c:24
msgid "High"
msgstr "H�y"
-#: ../install_steps_interactive.pm_.c:762 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:792 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Paranoid"
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:805
msgid "Miscellaneous questions"
msgstr "Forskjellige sp�rsm�l"
-#: ../install_steps_interactive.pm_.c:776
+#: ../install_steps_interactive.pm_.c:806
msgid "(may cause data corruption)"
msgstr "(kan for�rsake korrupsjon av data)"
-#: ../install_steps_interactive.pm_.c:776
+#: ../install_steps_interactive.pm_.c:806
msgid "Use hard drive optimisations?"
msgstr "Bruk harddisk-optimisering?"
-#: ../install_steps_interactive.pm_.c:777 ../standalone/draksec_.c:39
+#: ../install_steps_interactive.pm_.c:807 ../standalone/draksec_.c:39
msgid "Choose security level"
msgstr "Velg sikkerhetsniv�"
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:808
#, 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:779
+#: ../install_steps_interactive.pm_.c:809
msgid "Removable media automounting"
msgstr "Fjernbart media automontering"
-#: ../install_steps_interactive.pm_.c:781
+#: ../install_steps_interactive.pm_.c:811
msgid "Enable num lock at startup"
msgstr "Sl� p� num lock ved oppstart"
-#: ../install_steps_interactive.pm_.c:784
+#: ../install_steps_interactive.pm_.c:814
msgid "Give the ram size in Mb"
msgstr "Oppgi ram-st�rrelsen i Mb"
-#: ../install_steps_interactive.pm_.c:812
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:842
+#: ../install_steps_interactive.pm_.c:955
msgid "Try to find PCI devices?"
msgstr "Pr�ve � finne PCI-enheter?"
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:857
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -2775,7 +2826,7 @@ msgstr ""
"\n"
"�nsker du virkelig � slutte n�?"
-#: ../install_steps_interactive.pm_.c:834
+#: ../install_steps_interactive.pm_.c:864
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2797,26 +2848,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:843
+#: ../install_steps_interactive.pm_.c:873
msgid "Shutting down"
msgstr "Stenger av"
-#: ../install_steps_interactive.pm_.c:857
+#: ../install_steps_interactive.pm_.c:887
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for %s kort %s"
-#: ../install_steps_interactive.pm_.c:858
+#: ../install_steps_interactive.pm_.c:888
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../install_steps_interactive.pm_.c:868
+#: ../install_steps_interactive.pm_.c:898
#, c-format
msgid "Which %s driver should I try?"
msgstr "Hvilken %s driver skal jeg pr�ve?"
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:906
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2835,20 +2886,20 @@ msgstr ""
"burde\n"
"ikke for�rsake noen skade."
-#: ../install_steps_interactive.pm_.c:881
+#: ../install_steps_interactive.pm_.c:911
msgid "Autoprobe"
msgstr "Automatisk sondering"
-#: ../install_steps_interactive.pm_.c:881
+#: ../install_steps_interactive.pm_.c:911
msgid "Specify options"
msgstr "Spesifiser opsjoner"
-#: ../install_steps_interactive.pm_.c:885
+#: ../install_steps_interactive.pm_.c:915
#, 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:891
+#: ../install_steps_interactive.pm_.c:921
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2859,11 +2910,11 @@ msgstr ""
"Opsjonene er i format ``name=value name2=value2 ...''.\n"
"F.eks., ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:894
+#: ../install_steps_interactive.pm_.c:924
msgid "Module options:"
msgstr "Modulopsjoner:"
-#: ../install_steps_interactive.pm_.c:904
+#: ../install_steps_interactive.pm_.c:934
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2872,43 +2923,43 @@ msgstr ""
"Lasting av modul %s feilet.\n"
"�nsker du � pr�ve igjen med andre parametere?"
-#: ../install_steps_interactive.pm_.c:917
+#: ../install_steps_interactive.pm_.c:947
msgid "Try to find PCMCIA cards?"
msgstr "Pr�ve � finne PCMCIA-kort?"
-#: ../install_steps_interactive.pm_.c:918
+#: ../install_steps_interactive.pm_.c:948
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA-kort..."
-#: ../install_steps_interactive.pm_.c:918
+#: ../install_steps_interactive.pm_.c:948
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:929
+#: ../install_steps_interactive.pm_.c:959
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:960
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../install_steps_interactive.pm_.c:931
+#: ../install_steps_interactive.pm_.c:961
#, c-format
msgid "Do you have any %s interface?"
msgstr "Har du noen %s grensesnitt?"
-#: ../install_steps_interactive.pm_.c:933 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:963 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
msgid "No"
msgstr "Nei"
-#: ../install_steps_interactive.pm_.c:933 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:963 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424
msgid "Yes"
msgstr "Ja"
-#: ../install_steps_interactive.pm_.c:934
+#: ../install_steps_interactive.pm_.c:964
msgid "See hardware info"
msgstr "Se maskinvareinfo"
@@ -3526,13 +3577,17 @@ msgstr "Skriver ut testside(r)..."
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
-"Does it work properly? Printing status:\n"
-"%s"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
msgstr ""
"Testsiden(e) har blitt sendt til skriver-daemonen.\n"
"Det kan ta litt tid f�r skriveren starter.\n"
-"Virker det ordentlig? Utskriftstatus:\n"
-"%s"
+"Utskriftstatus:\n"
+"%s\n"
+"\n"
+"Virker det ordentlig?"
#: ../printerdrake.pm_.c:258
msgid ""
@@ -3564,24 +3619,33 @@ msgid ""
"but very sensitive: it must not be used for a machine connected to others or "
"to the Internet. There is no password access."
msgstr ""
+"Dette niv�et b�r brukes med forsiktighet. Det gj�r systemet ditt lettere �\n"
+"bruke, men mer utsatt: det m� ikke brukes p� en maskin koblet til andre\n"
+"eller til Internett. Det er ingen adgang med passord."
#: ../standalone/draksec_.c:29
msgid ""
"Password are now enabled, but use as a networked computer is still not "
"recommended."
msgstr ""
+"Passord er n� aktivert, men bruk som nettverksmaskin er fortsatt ikke "
+"anbefalt."
#: ../standalone/draksec_.c:30
msgid ""
"Few improvements for this security level, the main one is that there are "
"more security warnings and checks."
msgstr ""
+"F� endringer for dette sikkerhetsniv�et, hovedforskjellen er at det er\n"
+"flere advarsler og sikkerhetskontroller."
#: ../standalone/draksec_.c:31
msgid ""
"This is the standard security recommended for a computer that will be used "
"to connect to the Internet as a client. There are now security checks. "
msgstr ""
+"Dette er standard sikkerhet anbefalt for en maskin som vil bli brukt til\n"
+"tilkobling mot Internett som klient. Det er n� sikkerhetskontroller. "
#: ../standalone/draksec_.c:32
msgid ""
@@ -3589,12 +3653,17 @@ msgid ""
"possible. The security is now high enough to use the system as a server "
"which accept connections from many clients. "
msgstr ""
+"Med dette sikkerhetsniv�et kan systemet brukes som tjener.\n"
+"Sikkerheten er n� h�y nok til � bruke systemet som en tjener som\n"
+"godtar oppkoblinger fra mange klienter. "
#: ../standalone/draksec_.c:33
msgid ""
"We take level 4 features, but now the system is entirely closed. Security "
"features are at their maximum."
msgstr ""
+"Vi tar funksjonene for niv� 4, men n� er systemet fullstendig stengt.\n"
+"Sikkerhetsfunksjonene er n� p� maksimum."
#: ../standalone/draksec_.c:42
msgid "Setting security level"
@@ -3615,9 +3684,3 @@ msgstr "ingen serie_usb funnet\n"
#: ../standalone/mousedrake_.c:35
msgid "Emulate third button?"
msgstr "Emulere tredje knapp?"
-
-#~ msgid "Windows(TM)"
-#~ msgstr "Windows(TM)"
-
-#~ msgid "Partitioning failed: no root filesystem"
-#~ msgstr "Partisjonering feilet: intet root-filsystem"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 6474debed..b228fd98d 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: 1999-12-27 05:58+0100\n"
+"POT-Creation-Date: 1999-12-27 16:45+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"
@@ -124,7 +124,7 @@ msgstr "�� �� �� ��� �������� ?"
msgid "An error occurred, try changing some parameters"
msgstr "��,������� �� ������,�������� ��������� ���������"
-#: ../Xconfigurator.pm_.c:370 ../Xconfigurator.pm_.c:535
+#: ../Xconfigurator.pm_.c:370 ../Xconfigurator.pm_.c:536
msgid "Automatic resolutions"
msgstr "���������� ���������� ����������"
@@ -138,23 +138,23 @@ msgstr ""
"��� ����� �� ��������...\n"
"������ ������� ������� ��� ������,���� �� ���� ������� ������ ��������"
-#: ../Xconfigurator.pm_.c:422 ../printerdrake.pm_.c:210
+#: ../Xconfigurator.pm_.c:423 ../printerdrake.pm_.c:210
msgid "Resolution"
msgstr "���������"
-#: ../Xconfigurator.pm_.c:457
+#: ../Xconfigurator.pm_.c:458
msgid "Choose resolution and color depth"
msgstr "��������� ���������� � ���� ��� ��� �������"
-#: ../Xconfigurator.pm_.c:465
+#: ../Xconfigurator.pm_.c:466
msgid "Show all"
msgstr "������� ���"
-#: ../Xconfigurator.pm_.c:489
+#: ../Xconfigurator.pm_.c:490
msgid "Resolutions"
msgstr "���������"
-#: ../Xconfigurator.pm_.c:536
+#: ../Xconfigurator.pm_.c:537
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:541
+#: ../Xconfigurator.pm_.c:542
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -172,109 +172,109 @@ msgstr ""
"���� ��������� ������������ ���\n"
"��������� �� ������ ��������� �������� ��� ���������"
-#: ../Xconfigurator.pm_.c:733
+#: ../Xconfigurator.pm_.c:734
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "��� ���������: %s\n"
-#: ../Xconfigurator.pm_.c:734
+#: ../Xconfigurator.pm_.c:735
#, c-format
msgid "Mouse type: %s\n"
msgstr "��� ����: %s\n"
-#: ../Xconfigurator.pm_.c:735
+#: ../Xconfigurator.pm_.c:736
#, c-format
msgid "Mouse device: %s\n"
msgstr "��� �� ��������� �� ������: %s\n"
-#: ../Xconfigurator.pm_.c:736
+#: ../Xconfigurator.pm_.c:737
#, c-format
msgid "Monitor: %s\n"
msgstr "�������: %s\n"
-#: ../Xconfigurator.pm_.c:737
+#: ../Xconfigurator.pm_.c:738
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "������� - ������������ ����������: %s\n"
-#: ../Xconfigurator.pm_.c:738
+#: ../Xconfigurator.pm_.c:739
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "������� - ���������� ����������: %s\n"
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:740
#, c-format
msgid "Graphic card: %s\n"
msgstr "�������� �������: %s\n"
-#: ../Xconfigurator.pm_.c:740
+#: ../Xconfigurator.pm_.c:741
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "������� �� ��������� �������: %s kB\n"
-#: ../Xconfigurator.pm_.c:741
+#: ../Xconfigurator.pm_.c:742
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 ������: %s\n"
-#: ../Xconfigurator.pm_.c:755
+#: ../Xconfigurator.pm_.c:756
msgid "Preparing X-Window configuration"
msgstr "������� ������������� �� X-Window ������"
-#: ../Xconfigurator.pm_.c:769
+#: ../Xconfigurator.pm_.c:770
msgid "Change Monitor"
msgstr "������� ��������"
-#: ../Xconfigurator.pm_.c:770
+#: ../Xconfigurator.pm_.c:771
msgid "Change Graphic card"
msgstr "������� �������� �������"
-#: ../Xconfigurator.pm_.c:771
+#: ../Xconfigurator.pm_.c:772
msgid "Change Server options"
msgstr "������� ������ �����"
-#: ../Xconfigurator.pm_.c:772
+#: ../Xconfigurator.pm_.c:773
msgid "Change Resolution"
msgstr "������� ����������"
-#: ../Xconfigurator.pm_.c:773
+#: ../Xconfigurator.pm_.c:774
msgid "Automatical resolutions search"
msgstr "���������� ������� ����������"
-#: ../Xconfigurator.pm_.c:777
+#: ../Xconfigurator.pm_.c:778
msgid "Show information"
msgstr "������� �����������"
-#: ../Xconfigurator.pm_.c:778
+#: ../Xconfigurator.pm_.c:779
msgid "Test again"
msgstr "�������� ������"
-#: ../Xconfigurator.pm_.c:779
+#: ../Xconfigurator.pm_.c:780
msgid "Quit"
msgstr "����"
-#: ../Xconfigurator.pm_.c:783
+#: ../Xconfigurator.pm_.c:784
msgid "What do you want to do?"
msgstr "��� ������ �� �������?"
-#: ../Xconfigurator.pm_.c:790
+#: ../Xconfigurator.pm_.c:791
msgid "Forget the changes?"
msgstr "�� ������� �������?"
-#: ../Xconfigurator.pm_.c:805
+#: ../Xconfigurator.pm_.c:806
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "�����,������ ������� %s ���� ���������� �������"
-#: ../Xconfigurator.pm_.c:821
+#: ../Xconfigurator.pm_.c:822
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "����� ��� ��������� �� � ����������� (Ctrl-Alt-BackSpace) �������"
-#: ../Xconfigurator.pm_.c:824
+#: ../Xconfigurator.pm_.c:825
msgid "X at startup"
msgstr "X �������� �� ��������"
-#: ../Xconfigurator.pm_.c:825
+#: ../Xconfigurator.pm_.c:826
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:531
-#: ../install_steps_interactive.pm_.c:655 ../standalone/adduserdrake_.c:27
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:561
+#: ../install_steps_interactive.pm_.c:685 ../standalone/adduserdrake_.c:27
msgid "Done"
msgstr "��������"
@@ -1705,8 +1705,8 @@ msgstr "������ ��������� ����"
msgid "Configure printer"
msgstr "������ �������"
-#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:490
+#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:519
+#: ../install_steps_interactive.pm_.c:520
msgid "Set root password"
msgstr "����� root �������"
@@ -1816,7 +1816,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "����� ����� ��������� %s"
-#: ../install_steps.pm_.c:502
+#: ../install_steps.pm_.c:503
msgid "No floppy drive available"
msgstr "������������� ������� ������"
@@ -1907,7 +1907,7 @@ msgstr "�������� ��������� ���� ?"
msgid "There was an error ordering packages:"
msgstr "������ � ����� ������:"
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:800
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:830
msgid "Use existing configuration for X11?"
msgstr "�� �������� ��������� ������������� �� X11 ?"
@@ -2228,9 +2228,9 @@ msgid "Login ID"
msgstr "ID �� ��������"
#: ../install_steps_interactive.pm_.c:404
-#: ../install_steps_interactive.pm_.c:491
-#: ../install_steps_interactive.pm_.c:537
-#: ../install_steps_interactive.pm_.c:631 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:521
+#: ../install_steps_interactive.pm_.c:567
+#: ../install_steps_interactive.pm_.c:661 ../standalone/adduserdrake_.c:33
msgid "Password"
msgstr "�������"
@@ -2271,45 +2271,93 @@ msgstr "����� DNS ������"
msgid "Bringing up the network"
msgstr "�������� �����"
-#: ../install_steps_interactive.pm_.c:436
+#: ../install_steps_interactive.pm_.c:430
+msgid ""
+"You have now the possibility to download software aimed for encryption.\n"
+"\n"
+"WARNING:\n"
+"\n"
+"Due to different general requirements applicable to these software and "
+"imposed\n"
+"by various jurisdictions, customer and/or end user of theses software "
+"should\n"
+"ensure that the laws of his/their jurisdiction allow him/them to download, "
+"stock\n"
+"and/or use these software.\n"
+"\n"
+"In addition customer and/or end user shall particularly be aware to not "
+"infringe\n"
+"the laws of his/their jurisdiction. Should customer and/or end user do not\n"
+"respect the provision of these applicable laws, he/they will incur serious\n"
+"sanctions.\n"
+"\n"
+"In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
+"liable\n"
+"for special, indirect or incidental damages whatsoever (including, but not\n"
+"limited to loss of profits, business interruption, loss of commercial data "
+"and\n"
+"other pecuniary losses, and eventual liabilities and indemnification to be "
+"paid\n"
+"pursuant to a court decision) arising out of use, possession, or the sole\n"
+"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"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:466
msgid "Choose a mirror from which to get the packages"
msgstr "��������� mirror �� ��� ���� ������� ������"
-#: ../install_steps_interactive.pm_.c:441
+#: ../install_steps_interactive.pm_.c:471
msgid "Contacting the mirror to get the list of available packages"
msgstr "������������� mirror �� ����� ������� ������"
-#: ../install_steps_interactive.pm_.c:445
+#: ../install_steps_interactive.pm_.c:475
#, fuzzy
msgid "Which packages do you want to install"
msgstr "������� ������ �� �����������"
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:477
msgid "Downloading cryptographic packages"
msgstr "������ ������ ������"
-#: ../install_steps_interactive.pm_.c:457
+#: ../install_steps_interactive.pm_.c:487
msgid "Which is your timezone?"
msgstr "��� �� ���� ��������� ���� ?"
-#: ../install_steps_interactive.pm_.c:458
+#: ../install_steps_interactive.pm_.c:488
msgid "Is your hardware clock set to GMT?"
msgstr "�� �� �� ��� ��������� (BIOS) �������� ������� �� GMT ?"
-#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:498
msgid "Printer"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:469
+#: ../install_steps_interactive.pm_.c:499
msgid "Would you like to configure a printer?"
msgstr "�� �� ����� �� �������� �������?"
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:519
msgid "No password"
msgstr "���� �������"
-#: ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:705 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:519
+#: ../install_steps_interactive.pm_.c:735 ../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
@@ -2317,80 +2365,80 @@ msgstr "���� �������"
msgid "Ok"
msgstr "� ����"
-#: ../install_steps_interactive.pm_.c:492
-#: ../install_steps_interactive.pm_.c:538
-#: ../install_steps_interactive.pm_.c:632 ../standalone/adduserdrake_.c:34
+#: ../install_steps_interactive.pm_.c:522
+#: ../install_steps_interactive.pm_.c:568
+#: ../install_steps_interactive.pm_.c:662 ../standalone/adduserdrake_.c:34
msgid "Password (again)"
msgstr "������� (��������)"
-#: ../install_steps_interactive.pm_.c:494
+#: ../install_steps_interactive.pm_.c:524
msgid "Use shadow file"
msgstr ""
-#: ../install_steps_interactive.pm_.c:494
+#: ../install_steps_interactive.pm_.c:524
msgid "shadow"
msgstr ""
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:525
msgid "MD5"
msgstr "MD5"
-#: ../install_steps_interactive.pm_.c:495
+#: ../install_steps_interactive.pm_.c:525
#, fuzzy
msgid "Use MD5 passwords"
msgstr "����� MD5 �������"
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:527
msgid "Use NIS"
msgstr "������� NIS"
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:527
msgid "yellow pages"
msgstr "���� ��������"
-#: ../install_steps_interactive.pm_.c:501
-#: ../install_steps_interactive.pm_.c:549
-#: ../install_steps_interactive.pm_.c:643 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:579
+#: ../install_steps_interactive.pm_.c:673 ../standalone/adduserdrake_.c:45
msgid "Please try again"
msgstr "�������� ������"
-#: ../install_steps_interactive.pm_.c:501
-#: ../install_steps_interactive.pm_.c:549
-#: ../install_steps_interactive.pm_.c:643 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:579
+#: ../install_steps_interactive.pm_.c:673 ../standalone/adduserdrake_.c:45
msgid "The passwords do not match"
msgstr "������������� �������"
-#: ../install_steps_interactive.pm_.c:503
-#: ../install_steps_interactive.pm_.c:550 ../standalone/adduserdrake_.c:46
+#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:580 ../standalone/adduserdrake_.c:46
msgid "This password is too simple"
msgstr "��� ������� �� ������� ������"
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:540
msgid "Authentification NIS"
msgstr "�������������� NIS"
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:541
msgid "NIS Domain"
msgstr "NIS ������"
-#: ../install_steps_interactive.pm_.c:511
+#: ../install_steps_interactive.pm_.c:541
msgid "NIS Server"
msgstr "NIS ������"
-#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:561 ../standalone/adduserdrake_.c:27
msgid "Accept user"
msgstr "�������� ���������"
-#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:561 ../standalone/adduserdrake_.c:27
msgid "Add user"
msgstr "����� ���������"
-#: ../install_steps_interactive.pm_.c:532 ../standalone/adduserdrake_.c:28
+#: ../install_steps_interactive.pm_.c:562 ../standalone/adduserdrake_.c:28
#, c-format
msgid "(already added %s)"
msgstr "(��� ������� %s)"
-#: ../install_steps_interactive.pm_.c:532 ../standalone/adduserdrake_.c:28
+#: ../install_steps_interactive.pm_.c:562 ../standalone/adduserdrake_.c:28
#, c-format
msgid ""
"Enter a user\n"
@@ -2399,32 +2447,32 @@ msgstr ""
"����� ���������\n"
"%s"
-#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:30
+#: ../install_steps_interactive.pm_.c:564 ../standalone/adduserdrake_.c:30
msgid "Real name"
msgstr "����� ���"
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:31
+#: ../install_steps_interactive.pm_.c:565 ../standalone/adduserdrake_.c:31
msgid "User name"
msgstr "���������� ���"
-#: ../install_steps_interactive.pm_.c:540 ../standalone/adduserdrake_.c:36
+#: ../install_steps_interactive.pm_.c:570 ../standalone/adduserdrake_.c:36
msgid "Shell"
msgstr "Shell"
-#: ../install_steps_interactive.pm_.c:551 ../standalone/adduserdrake_.c:47
+#: ../install_steps_interactive.pm_.c:581 ../standalone/adduserdrake_.c:47
msgid "Please give a user name"
msgstr "�������� ���������� ���"
-#: ../install_steps_interactive.pm_.c:552 ../standalone/adduserdrake_.c:48
+#: ../install_steps_interactive.pm_.c:582 ../standalone/adduserdrake_.c:48
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "���������� ��� ���� �������� ���� ���� �����, �������, `-' � `_'"
-#: ../install_steps_interactive.pm_.c:553 ../standalone/adduserdrake_.c:49
+#: ../install_steps_interactive.pm_.c:583 ../standalone/adduserdrake_.c:49
msgid "This user name is already added"
msgstr "��� ���������� ��� ��� �������"
-#: ../install_steps_interactive.pm_.c:574
+#: ../install_steps_interactive.pm_.c:604
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 "
@@ -2444,98 +2492,98 @@ msgstr ""
"'������ �� ���������', ��� �������� �������� � ������� ���� ��������.\n"
"�� �� ����� �� �������� ������� ������� �� ��� ������?"
-#: ../install_steps_interactive.pm_.c:583
+#: ../install_steps_interactive.pm_.c:613
msgid "Sorry, no floppy drive available"
msgstr "�� ������, ���� floppy-�"
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:616
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "���������� floppy ������ ���� ���� �������� �� �������� ������ �������"
-#: ../install_steps_interactive.pm_.c:587
+#: ../install_steps_interactive.pm_.c:617
msgid "Skip"
msgstr "��������"
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:621
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "������� ������ ������� � ������ %s"
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:622
msgid "Creating bootdisk"
msgstr "������� ������� ����..."
-#: ../install_steps_interactive.pm_.c:599
+#: ../install_steps_interactive.pm_.c:629
msgid "Preparing bootloader"
msgstr "��������� �������..."
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:641
msgid "First sector of boot partition"
msgstr "���� ������ ������� ���������"
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:641
msgid "First sector of drive (MBR)"
msgstr "���� ������ ����� (MBR)"
-#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:646
msgid "LILO Installation"
msgstr "LILO ����������"
-#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:647
msgid "Where do you want to install the bootloader?"
msgstr "��� ����� �� ����������� �������?"
-#: ../install_steps_interactive.pm_.c:622
+#: ../install_steps_interactive.pm_.c:652
msgid "Do you want to use LILO?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:625
+#: ../install_steps_interactive.pm_.c:655
msgid "Boot device"
msgstr "������� (boot) ������"
-#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:656
msgid "Linear (needed for some SCSI drives)"
msgstr "������� �������� ��� (�������� ����� SCSI ����������)"
-#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:656
msgid "linear"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:657
msgid "Compact"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:627
+#: ../install_steps_interactive.pm_.c:657
msgid "compact"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:658
msgid "Delay before booting default image"
msgstr "����� ��� �������� default image-�"
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:659
msgid "Video mode"
msgstr "����� ���"
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:663
msgid "Restrict command line options"
msgstr "���������� �������� ������ - ������"
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:663
msgid "restrict"
msgstr "����������"
-#: ../install_steps_interactive.pm_.c:639
+#: ../install_steps_interactive.pm_.c:669
msgid "LILO main options"
msgstr "LILO ������ ������"
-#: ../install_steps_interactive.pm_.c:642
+#: ../install_steps_interactive.pm_.c:672
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"����� ``���������� �������� ������ - ������'' �� ������������� ��� �������"
-#: ../install_steps_interactive.pm_.c:653
+#: ../install_steps_interactive.pm_.c:683
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existing ones."
@@ -2543,164 +2591,164 @@ msgstr ""
"��� �� ��������� ������ � LILO-�.\n"
"������ ������ ���� ��� �������� �����."
-#: ../install_steps_interactive.pm_.c:655
+#: ../install_steps_interactive.pm_.c:685
msgid "Add"
msgstr "�����"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Linux"
msgstr "Linux"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
msgid "Other OS (windows...)"
msgstr "����� ��-��� (Windows,BSD,BeOS,...)"
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:694
#, fuzzy
msgid "Which type of entry do you want to add"
msgstr "���� ����� �������� �����?"
-#: ../install_steps_interactive.pm_.c:684
+#: ../install_steps_interactive.pm_.c:714
msgid "Image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:685
-#: ../install_steps_interactive.pm_.c:693
+#: ../install_steps_interactive.pm_.c:715
+#: ../install_steps_interactive.pm_.c:723
msgid "Root"
msgstr "Root"
-#: ../install_steps_interactive.pm_.c:686
+#: ../install_steps_interactive.pm_.c:716
msgid "Append"
msgstr "�������"
-#: ../install_steps_interactive.pm_.c:687
+#: ../install_steps_interactive.pm_.c:717
msgid "Initrd"
msgstr "Initrd"
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:718
msgid "Read-write"
msgstr "������-������ RW"
-#: ../install_steps_interactive.pm_.c:694
+#: ../install_steps_interactive.pm_.c:724
msgid "Table"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:695
+#: ../install_steps_interactive.pm_.c:725
msgid "Unsafe"
msgstr "���������"
-#: ../install_steps_interactive.pm_.c:700
+#: ../install_steps_interactive.pm_.c:730
msgid "Label"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:732
msgid "Default"
msgstr "�������������"
-#: ../install_steps_interactive.pm_.c:705
+#: ../install_steps_interactive.pm_.c:735
msgid "Remove entry"
msgstr "������� ����"
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:738
msgid "Empty label not allowed"
msgstr "������ ������ ���� ���������"
-#: ../install_steps_interactive.pm_.c:709
+#: ../install_steps_interactive.pm_.c:739
msgid "This label is already in use"
msgstr "��� ������ �� ��� � ��������"
-#: ../install_steps_interactive.pm_.c:710
+#: ../install_steps_interactive.pm_.c:740
#, c-format
msgid "A entry %s already exists"
msgstr "���� %s ��� �������"
-#: ../install_steps_interactive.pm_.c:724
+#: ../install_steps_interactive.pm_.c:754
msgid "Installation of LILO failed. The following error occured:"
msgstr "���������� LILO-� ��������. ������ ��:"
-#: ../install_steps_interactive.pm_.c:738
+#: ../install_steps_interactive.pm_.c:768
msgid "Proxies configuration"
msgstr "������������ proxy-�"
-#: ../install_steps_interactive.pm_.c:739
+#: ../install_steps_interactive.pm_.c:769
msgid "HTTP proxy"
msgstr "HTTP proxy"
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:770
msgid "FTP proxy"
msgstr "FTP proxy"
-#: ../install_steps_interactive.pm_.c:746
+#: ../install_steps_interactive.pm_.c:776
msgid "Proxy should be http://..."
msgstr "Proxy ����� �� ���� http://..."
-#: ../install_steps_interactive.pm_.c:747
+#: ../install_steps_interactive.pm_.c:777
msgid "Proxy should be ftp://..."
msgstr "Proxy ����� �� ���� ftp://..."
-#: ../install_steps_interactive.pm_.c:757 ../standalone/draksec_.c:20
+#: ../install_steps_interactive.pm_.c:787 ../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr ""
-#: ../install_steps_interactive.pm_.c:758 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:788 ../standalone/draksec_.c:21
msgid "Poor"
msgstr "�����"
-#: ../install_steps_interactive.pm_.c:759 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:789 ../standalone/draksec_.c:22
msgid "Low"
msgstr "����"
-#: ../install_steps_interactive.pm_.c:760 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:790 ../standalone/draksec_.c:23
msgid "Medium"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:761 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:791 ../standalone/draksec_.c:24
msgid "High"
msgstr "������"
-#: ../install_steps_interactive.pm_.c:762 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:792 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "����������"
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:805
msgid "Miscellaneous questions"
msgstr "����� ������"
-#: ../install_steps_interactive.pm_.c:776
+#: ../install_steps_interactive.pm_.c:806
msgid "(may cause data corruption)"
msgstr "(���� ���������� ������)"
-#: ../install_steps_interactive.pm_.c:776
+#: ../install_steps_interactive.pm_.c:806
msgid "Use hard drive optimisations?"
msgstr "��������� ���� ���� ������������ ?"
-#: ../install_steps_interactive.pm_.c:777 ../standalone/draksec_.c:39
+#: ../install_steps_interactive.pm_.c:807 ../standalone/draksec_.c:39
msgid "Choose security level"
msgstr "��������� ���������� ����"
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:808
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "�������� �������� RAM ��� �� �������� (����������� %d MB)"
-#: ../install_steps_interactive.pm_.c:779
+#: ../install_steps_interactive.pm_.c:809
msgid "Removable media automounting"
msgstr "������������� ���������� �����"
-#: ../install_steps_interactive.pm_.c:781
+#: ../install_steps_interactive.pm_.c:811
msgid "Enable num lock at startup"
msgstr "��������� Num Lock ��� ��������"
-#: ../install_steps_interactive.pm_.c:784
+#: ../install_steps_interactive.pm_.c:814
msgid "Give the ram size in Mb"
msgstr "������� �������� RAM-� � Mb"
-#: ../install_steps_interactive.pm_.c:812
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:842
+#: ../install_steps_interactive.pm_.c:955
msgid "Try to find PCI devices?"
msgstr "�� �� �� ������ PCI ������� ?"
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:857
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -2710,7 +2758,7 @@ msgstr ""
"\n"
"�� �� ������� ������ �� �������� ?"
-#: ../install_steps_interactive.pm_.c:834
+#: ../install_steps_interactive.pm_.c:864
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2732,26 +2780,26 @@ msgstr ""
"����������� � ������������� ����� ������� ������ ���� � ����-�������������\n"
"�������� ��������� Linux Mandrake '������ �� ���������'."
-#: ../install_steps_interactive.pm_.c:843
+#: ../install_steps_interactive.pm_.c:873
msgid "Shutting down"
msgstr "����� ������"
-#: ../install_steps_interactive.pm_.c:857
+#: ../install_steps_interactive.pm_.c:887
#, c-format
msgid "Installing driver for %s card %s"
msgstr "���������� ������� �� %s ������� %s"
-#: ../install_steps_interactive.pm_.c:858
+#: ../install_steps_interactive.pm_.c:888
#, c-format
msgid "(module %s)"
msgstr "(����� %s)"
-#: ../install_steps_interactive.pm_.c:868
+#: ../install_steps_interactive.pm_.c:898
#, c-format
msgid "Which %s driver should I try?"
msgstr "���� %s ������� �� ������?"
-#: ../install_steps_interactive.pm_.c:876
+#: ../install_steps_interactive.pm_.c:906
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2767,20 +2815,20 @@ msgstr ""
"���� �� ������� ������� ������� �� ����, ��� �� �� ������� ��� ������?\n"
"������ �� �� �� ����� ��������� ��� �������, ��� ���� ������ ������� �����."
-#: ../install_steps_interactive.pm_.c:881
+#: ../install_steps_interactive.pm_.c:911
msgid "Autoprobe"
msgstr "���������� �����"
-#: ../install_steps_interactive.pm_.c:881
+#: ../install_steps_interactive.pm_.c:911
msgid "Specify options"
msgstr "�������� ������"
-#: ../install_steps_interactive.pm_.c:885
+#: ../install_steps_interactive.pm_.c:915
#, c-format
msgid "You may now provide its options to module %s."
msgstr "������ ������� ������ ������ �� ����� %s."
-#: ../install_steps_interactive.pm_.c:891
+#: ../install_steps_interactive.pm_.c:921
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2791,11 +2839,11 @@ msgstr ""
"������ �� � ������� ``���=�������� ���2=��������2 ...''.\n"
"�� ������, ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:894
+#: ../install_steps_interactive.pm_.c:924
msgid "Module options:"
msgstr "������ ������:"
-#: ../install_steps_interactive.pm_.c:904
+#: ../install_steps_interactive.pm_.c:934
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2804,43 +2852,43 @@ msgstr ""
"�������� ������ %s ��������.\n"
"�� �� ������ �������� ������ �� ������ ����������� ?"
-#: ../install_steps_interactive.pm_.c:917
+#: ../install_steps_interactive.pm_.c:947
msgid "Try to find PCMCIA cards?"
msgstr "�� �� �� ������ PCMCIA ������� ?"
-#: ../install_steps_interactive.pm_.c:918
+#: ../install_steps_interactive.pm_.c:948
msgid "Configuring PCMCIA cards..."
msgstr "������������ PCMCIA �������..."
-#: ../install_steps_interactive.pm_.c:918
+#: ../install_steps_interactive.pm_.c:948
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:929
+#: ../install_steps_interactive.pm_.c:959
#, c-format
msgid "Found %s %s interfaces"
msgstr "��������� %s %s ���������"
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:960
msgid "Do you have another one?"
msgstr "�� �� ����� ��� �����?"
-#: ../install_steps_interactive.pm_.c:931
+#: ../install_steps_interactive.pm_.c:961
#, c-format
msgid "Do you have any %s interface?"
msgstr "����� �� ��� %s ����������?"
-#: ../install_steps_interactive.pm_.c:933 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:963 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
msgid "No"
msgstr "��"
-#: ../install_steps_interactive.pm_.c:933 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:963 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:424
msgid "Yes"
msgstr "��"
-#: ../install_steps_interactive.pm_.c:934
+#: ../install_steps_interactive.pm_.c:964
msgid "See hardware info"
msgstr "�������� ����������� � ��������"
@@ -3466,13 +3514,17 @@ msgstr "������� ���� �����(���)�..."
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
-"Does it work properly? Printing status:\n"
-"%s"
+"Printing status:\n"
+"%s\n"
+"\n"
+"Does it work properly?"
msgstr ""
"���� �����(���)� �� ������� ������� ������.\n"
"�� ���� ������� �� ����� �������� ������ ��������.\n"
-"�� �� ���� OK ? ������ ��������:\n"
-"%s"
+"������ ��������:\n"
+"%s\n"
+"\n"
+"�� �� ���� OK ?"
#: ../printerdrake.pm_.c:258
msgid ""
@@ -3555,3 +3607,4 @@ msgstr "���� �������� serial_usb\n"
#: ../standalone/mousedrake_.c:35
msgid "Emulate third button?"
msgstr "�� �������� ��� 3 �������?"
+