summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2000-08-30 17:48:46 +0000
committerPablo Saratxaga <pablo@mandriva.com>2000-08-30 17:48:46 +0000
commit14034634f914544f3f5c4ee62c87352055c1b57a (patch)
treef42dea7121194a134d56aa263abc40489958f7c0
parent18aaa8cd39e680fc54116128c24469f7afadb78d (diff)
downloaddrakx-14034634f914544f3f5c4ee62c87352055c1b57a.tar
drakx-14034634f914544f3f5c4ee62c87352055c1b57a.tar.gz
drakx-14034634f914544f3f5c4ee62c87352055c1b57a.tar.bz2
drakx-14034634f914544f3f5c4ee62c87352055c1b57a.tar.xz
drakx-14034634f914544f3f5c4ee62c87352055c1b57a.zip
fixed English typo
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/share/po/DrakX.pot340
-rw-r--r--perl-install/share/po/no.po354
-rw-r--r--perl-install/share/po/sp.po347
4 files changed, 532 insertions, 511 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6f5f4d79e..0285fb95e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -347,7 +347,7 @@ sub choosePackages {
my @l = (300, 700, round_up(min($max_size, $availableC) / sqr(1024), 100));
$l[2] > $l[1] + 200 or splice(@l, 1, 1); #- not worth proposing too alike stuff
$l[1] > $l[0] + 100 or splice(@l, 0, 1);
- my @text = (__("Minimum (%dMB)"), __("Recommanded (%dMB)"), __("Complete (%dMB)"));
+ my @text = (__("Minimum (%dMB)"), __("Recommended (%dMB)"), __("Complete (%dMB)"));
$o->ask_from_listf('', 'TODOMESSAGE', sub { _ ($text[$_[1]], $_[0]) }, \@l) * sqr(1024);
} else {
$o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) || goto &choosePackages;
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index d45167be4..d86f0fd36 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-08-29 23:38+0200\n"
+"POT-Creation-Date: 2000-08-30 19:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -482,15 +482,15 @@ msgstr ""
msgid "Delay before booting default image"
msgstr ""
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:682
-#: ../../install_steps_interactive.pm_.c:733 ../../netconnect.pm_.c:482
+#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:739 ../../netconnect.pm_.c:482
#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:110
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr ""
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:683
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:689
+#: ../../install_steps_interactive.pm_.c:740
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr ""
@@ -512,14 +512,14 @@ msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
+#: ../../install_steps_interactive.pm_.c:753
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr ""
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
+#: ../../install_steps_interactive.pm_.c:753
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr ""
@@ -536,7 +536,7 @@ msgid "Add"
msgstr ""
#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:727 ../../printerdrake.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:733 ../../printerdrake.pm_.c:244
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr ""
@@ -594,7 +594,7 @@ msgid "Default"
msgstr ""
#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:680 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:686 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
@@ -831,7 +831,7 @@ msgstr ""
#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:212 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
msgid "Formatting loopback file %s"
msgstr ""
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:298
+#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:304
#, c-format
msgid "Formatting partition %s"
msgstr ""
@@ -1840,7 +1840,7 @@ msgstr ""
msgid "Choose your keyboard"
msgstr ""
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:368
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:374
msgid "Miscellaneous"
msgstr ""
@@ -1880,8 +1880,8 @@ msgstr ""
msgid "Configure printer"
msgstr ""
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:680
-#: ../../install_steps_interactive.pm_.c:681
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:687
msgid "Set root password"
msgstr ""
@@ -2217,12 +2217,12 @@ msgid "Info"
msgstr ""
#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:272
-#: ../../install_steps_interactive.pm_.c:126 ../../standalone/rpmdrake_.c:161
+#: ../../install_steps_interactive.pm_.c:132 ../../standalone/rpmdrake_.c:161
msgid "Install"
msgstr ""
#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:444
msgid "Installing"
msgstr ""
@@ -2239,7 +2239,7 @@ msgid "Total time "
msgstr ""
#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:444
msgid "Preparing installation"
msgstr ""
@@ -2258,7 +2258,7 @@ msgid "There was an error ordering packages:"
msgstr ""
#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:938
+#: ../../install_steps_interactive.pm_.c:944
msgid "Use existing configuration for X11?"
msgstr ""
@@ -2411,51 +2411,51 @@ msgstr ""
msgid "Please, choose a language to use."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:80
#: ../../standalone/keyboarddrake_.c:22
msgid "Keyboard"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:75
+#: ../../install_steps_interactive.pm_.c:81
msgid "Please, choose your keyboard layout."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:84
+#: ../../install_steps_interactive.pm_.c:90
msgid "You can choose other languages that will be available after install"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:93
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:99
+#: ../../install_steps_interactive.pm_.c:143
msgid "Install Class"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:99
msgid "Which installation class do you want?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:95
-msgid "Install/Upgrade"
+#: ../../install_steps_interactive.pm_.c:101
+msgid "Install/Rescue"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:95
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:101
+msgid "Is this an install or a rescue?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:104
+#: ../../install_steps_interactive.pm_.c:110
msgid "Recommended"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:106
-#: ../../install_steps_interactive.pm_.c:121
+#: ../../install_steps_interactive.pm_.c:112
+#: ../../install_steps_interactive.pm_.c:127
msgid "Customized"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:107
-#: ../../install_steps_interactive.pm_.c:121
+#: ../../install_steps_interactive.pm_.c:113
+#: ../../install_steps_interactive.pm_.c:127
msgid "Expert"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:116
+#: ../../install_steps_interactive.pm_.c:122
msgid ""
"Are you sure you are an expert? \n"
"You will be allowed to make powerful but dangerous things here.\n"
@@ -2464,55 +2464,55 @@ msgid ""
"are you ready to answer that kind of questions?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:126
+#: ../../install_steps_interactive.pm_.c:132
msgid "Upgrade"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:132
+#: ../../install_steps_interactive.pm_.c:138
msgid "Normal"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:133
+#: ../../install_steps_interactive.pm_.c:139
msgid "Development"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:140
msgid "Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:138
+#: ../../install_steps_interactive.pm_.c:144
msgid "Which usage is your system used for ?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:158
msgid "Please, choose the type of your mouse."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:159 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:160
+#: ../../install_steps_interactive.pm_.c:166
msgid "Please choose on which serial port your mouse is connected to."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:184
msgid "Configuring IDE"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:184
msgid "IDE"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:195
msgid "no available partitions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:202
msgid "Choose the mount points"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:219
#, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
@@ -2520,146 +2520,148 @@ msgid ""
"(%s)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:228
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:230
+#: ../../install_steps_interactive.pm_.c:236
msgid "Root Partition"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_interactive.pm_.c:237
msgid "What is the root partition (/) of your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:250
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:253
#, c-format
msgid "Partitioning failed: %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:261
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:287
msgid "Choose the partitions you want to format"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:285
+#: ../../install_steps_interactive.pm_.c:291
msgid "Check bad blocks?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:299
msgid "Formatting partitions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:297
+#: ../../install_steps_interactive.pm_.c:303
#, c-format
msgid "Creating and formatting file %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:300
+#: ../../install_steps_interactive.pm_.c:306
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:312
msgid "Looking for available packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:318
msgid "Finding packages to upgrade"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:329
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:335
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
#, c-format
msgid "Complete (%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
#, c-format
msgid "Minimum (%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
#, c-format
-msgid "Recommanded (%dMB)"
+msgid "Recommended (%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:367
+#: ../../install_steps_interactive.pm_.c:373
msgid "Package Group Selection"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:370
+#: ../../install_steps_interactive.pm_.c:376
msgid "Individual package selection"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:416
+#: ../../install_steps_interactive.pm_.c:422
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
"If only some CDs are missing, unselect them, then click Ok."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:419
+#: ../../install_steps_interactive.pm_.c:425
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr ""
-#: ../../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:453
msgid ""
"Installing package %s\n"
"%d%%"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:456
+#: ../../install_steps_interactive.pm_.c:462
msgid "Post-install configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:472
msgid "Keep the current IP configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:473
msgid "Reconfigure network now"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:468
+#: ../../install_steps_interactive.pm_.c:474
msgid "Do not set up networking"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:471
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
+#: ../../install_steps_interactive.pm_.c:482
msgid "Network Configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:478
msgid "Local networking has already been configured. Do you want to:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:477
+#: ../../install_steps_interactive.pm_.c:483
msgid "Do you want to configure a local network for your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:483
+#: ../../install_steps_interactive.pm_.c:489
msgid "no network card found"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:501
-#: ../../install_steps_interactive.pm_.c:555
+#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:561
msgid "Configuring network"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:508
msgid ""
"Please enter your host name if you know it.\n"
"Some DHCP servers require the hostname to work.\n"
@@ -2667,45 +2669,45 @@ msgid ""
"such as ``mybox.mylab.myco.com''."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:506
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:512
+#: ../../install_steps_interactive.pm_.c:566
msgid "Host name:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:525
-#: ../../install_steps_interactive.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:532
#, c-format
msgid "Configuring network device %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:527
+#: ../../install_steps_interactive.pm_.c:533
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:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "Automatic IP"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "IP address:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "Netmask:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:537
msgid "(bootp/dhcp)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:537 ../../printerdrake.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
msgid "IP address should be in format 1.2.3.4"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:556
+#: ../../install_steps_interactive.pm_.c:562
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2713,19 +2715,19 @@ msgid ""
"You may also enter the IP address of the gateway if you have one"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "DNS server:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "Gateway device:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "Gateway:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:576
+#: ../../install_steps_interactive.pm_.c:582
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -2764,88 +2766,88 @@ msgid ""
"USA"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:613
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:621
msgid "Contacting the mirror to get the list of available packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:619
+#: ../../install_steps_interactive.pm_.c:625
msgid "Please choose the packages you want to install."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:638
msgid "Which is your timezone?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:633
+#: ../../install_steps_interactive.pm_.c:639
msgid "Is your hardware clock set to GMT?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:680
+#: ../../install_steps_interactive.pm_.c:686
msgid "No password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:691
msgid "Use shadow file"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:691
msgid "shadow"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:692
msgid "MD5"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:692
msgid "Use MD5 passwords"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:694
msgid "Use NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:694
msgid "yellow pages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:700
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:701
+#: ../../install_steps_interactive.pm_.c:707
msgid "Authentification NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:708
msgid "NIS Domain"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:708
msgid "NIS Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:727
+#: ../../install_steps_interactive.pm_.c:733
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:727
+#: ../../install_steps_interactive.pm_.c:733
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:734
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:734
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -2853,48 +2855,48 @@ msgid ""
"%s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:736
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:731 ../../printerdrake.pm_.c:84
+#: ../../install_steps_interactive.pm_.c:737 ../../printerdrake.pm_.c:84
#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:736
+#: ../../install_steps_interactive.pm_.c:742
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:738
+#: ../../install_steps_interactive.pm_.c:744
#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:754
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:755
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:756
#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:751
+#: ../../install_steps_interactive.pm_.c:757
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:782
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 "
@@ -2912,19 +2914,19 @@ msgid ""
"drive and press \"Ok\"."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:792
+#: ../../install_steps_interactive.pm_.c:798
msgid "First floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:793
+#: ../../install_steps_interactive.pm_.c:799
msgid "Second floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../install_steps_interactive.pm_.c:800
msgid "Skip"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:805
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 "
@@ -2938,131 +2940,131 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:808
+#: ../../install_steps_interactive.pm_.c:814
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:811
+#: ../../install_steps_interactive.pm_.c:817
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:817
+#: ../../install_steps_interactive.pm_.c:823
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:820
+#: ../../install_steps_interactive.pm_.c:826
msgid "Creating bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:833
msgid "Preparing bootloader"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:835
+#: ../../install_steps_interactive.pm_.c:841
msgid "Do you want to use aboot?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:838
+#: ../../install_steps_interactive.pm_.c:844
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:847
+#: ../../install_steps_interactive.pm_.c:853
msgid "Installation of bootloader failed. The following error occured:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:862
+#: ../../install_steps_interactive.pm_.c:868
msgid "Proxies configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:863
+#: ../../install_steps_interactive.pm_.c:869
msgid "HTTP proxy"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:870
msgid "FTP proxy"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:876
msgid "Proxy should be http://..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:877
msgid "Proxy should be ftp://..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:881 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:882 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:883 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:22
msgid "Low"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:884 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:885 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:24
msgid "High"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:892 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../install_steps_interactive.pm_.c:905
msgid "Miscellaneous questions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:900
+#: ../../install_steps_interactive.pm_.c:906
msgid "(may cause data corruption)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:900
+#: ../../install_steps_interactive.pm_.c:906
msgid "Use hard drive optimisations?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:901 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:908
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:910
msgid "Removable media automounting"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:912
msgid "Clean /tmp at each boot"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:915
msgid "Enable multi profiles"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:917
msgid "Enable num lock at startup"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:920
msgid "Give the ram size in MB"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:922
msgid "Can't use supermount in high security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:924
msgid ""
"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
"If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3071,13 +3073,13 @@ msgid ""
"You have been warned."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:929
msgid ""
"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
"give digits instead of normal letters (eg: pressing `p' gives `6')"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:950
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
"By default, the 4.0 server is used unless your card is not supported.\n"
@@ -3085,16 +3087,16 @@ msgid ""
"Do you want to keep XFree 3.3?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:975
+#: ../../install_steps_interactive.pm_.c:981
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:983
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:997
msgid "Creating auto install floppy"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 049544c59..2569f5f64 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-08-29 23:38+0200\n"
+"POT-Creation-Date: 2000-08-30 19:27+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -507,15 +507,15 @@ msgstr "Skjermmodus"
msgid "Delay before booting default image"
msgstr "Forsinkelse fјr oppstart av standard bilde"
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:682
-#: ../../install_steps_interactive.pm_.c:733 ../../netconnect.pm_.c:482
+#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:739 ../../netconnect.pm_.c:482
#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:110
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "Passord"
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:683
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:689
+#: ../../install_steps_interactive.pm_.c:740
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "Passord (igjen)"
@@ -538,14 +538,14 @@ msgid ""
msgstr ""
"Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
+#: ../../install_steps_interactive.pm_.c:753
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "Vennligst prјv igjen"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
+#: ../../install_steps_interactive.pm_.c:753
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
@@ -564,7 +564,7 @@ msgid "Add"
msgstr "Legg til"
#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:727 ../../printerdrake.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:733 ../../printerdrake.pm_.c:244
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Ferdig"
@@ -622,7 +622,7 @@ msgid "Default"
msgstr "Standard"
#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:680 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:686 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
@@ -921,7 +921,7 @@ msgstr "Vцr forsiktig: denne operasjonen er farlig."
# #: ../install_steps_interactive.pm_.c:37
#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:212 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "Feil"
@@ -1176,7 +1176,7 @@ msgstr "Formatering"
msgid "Formatting loopback file %s"
msgstr "Formaterer loopback-fil %s"
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:298
+#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:304
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
@@ -2344,7 +2344,7 @@ msgstr "Konfigurer mus"
msgid "Choose your keyboard"
msgstr "Velg tastatur"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:368
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:374
msgid "Miscellaneous"
msgstr "Forskjellig"
@@ -2384,8 +2384,8 @@ msgstr "Konfigurer tjenester"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:680
-#: ../../install_steps_interactive.pm_.c:681
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:687
msgid "Set root password"
msgstr "Sett root-passord"
@@ -2762,12 +2762,12 @@ msgid "Info"
msgstr "Info"
#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:272
-#: ../../install_steps_interactive.pm_.c:126 ../../standalone/rpmdrake_.c:161
+#: ../../install_steps_interactive.pm_.c:132 ../../standalone/rpmdrake_.c:161
msgid "Install"
msgstr "Installer"
#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:444
msgid "Installing"
msgstr "Installerer"
@@ -2784,7 +2784,7 @@ msgid "Total time "
msgstr "Total tid "
#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:444
msgid "Preparing installation"
msgstr "Forbereder installasjon"
@@ -2803,7 +2803,7 @@ 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:938
+#: ../../install_steps_interactive.pm_.c:944
msgid "Use existing configuration for X11?"
msgstr "Bruke eksisterende konfigurasjon for X11?"
@@ -2980,51 +2980,53 @@ msgstr "En feil oppsto"
msgid "Please, choose a language to use."
msgstr "Vennligst velg sprхk som skal brukes."
-#: ../../install_steps_interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:80
#: ../../standalone/keyboarddrake_.c:22
msgid "Keyboard"
msgstr "Tastatur"
-#: ../../install_steps_interactive.pm_.c:75
+#: ../../install_steps_interactive.pm_.c:81
msgid "Please, choose your keyboard layout."
msgstr "Vennligst velg tastatur-oppsettet ditt."
-#: ../../install_steps_interactive.pm_.c:84
+#: ../../install_steps_interactive.pm_.c:90
msgid "You can choose other languages that will be available after install"
msgstr "Du kan velge andre sprхk som vil vцre tilgjengelige etter installasjon"
-#: ../../install_steps_interactive.pm_.c:93
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:99
+#: ../../install_steps_interactive.pm_.c:143
msgid "Install Class"
msgstr "Installeringsklasse"
-#: ../../install_steps_interactive.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:99
msgid "Which installation class do you want?"
msgstr "Hvilken installasjonsklasse јnsker du?"
-#: ../../install_steps_interactive.pm_.c:95
-msgid "Install/Upgrade"
-msgstr "Installer/Oppgrader"
+#: ../../install_steps_interactive.pm_.c:101
+#, fuzzy
+msgid "Install/Rescue"
+msgstr "Installer"
-#: ../../install_steps_interactive.pm_.c:95
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:101
+#, fuzzy
+msgid "Is this an install or a rescue?"
msgstr "Er dette en installering eller en oppgradering?"
-#: ../../install_steps_interactive.pm_.c:104
+#: ../../install_steps_interactive.pm_.c:110
msgid "Recommended"
msgstr "Anbefalt"
-#: ../../install_steps_interactive.pm_.c:106
-#: ../../install_steps_interactive.pm_.c:121
+#: ../../install_steps_interactive.pm_.c:112
+#: ../../install_steps_interactive.pm_.c:127
msgid "Customized"
msgstr "Egendefinert"
-#: ../../install_steps_interactive.pm_.c:107
-#: ../../install_steps_interactive.pm_.c:121
+#: ../../install_steps_interactive.pm_.c:113
+#: ../../install_steps_interactive.pm_.c:127
msgid "Expert"
msgstr "Ekspert"
-#: ../../install_steps_interactive.pm_.c:116
+#: ../../install_steps_interactive.pm_.c:122
msgid ""
"Are you sure you are an expert? \n"
"You will be allowed to make powerful but dangerous things here.\n"
@@ -3035,55 +3037,55 @@ msgstr ""
"Er du sikker pх at du er en ekspert? \n"
"Du fхr tilgang til х gjјre kraftige, men farlige ting her."
-#: ../../install_steps_interactive.pm_.c:126
+#: ../../install_steps_interactive.pm_.c:132
msgid "Upgrade"
msgstr "Oppgrader"
-#: ../../install_steps_interactive.pm_.c:132
+#: ../../install_steps_interactive.pm_.c:138
msgid "Normal"
msgstr "Normal"
-#: ../../install_steps_interactive.pm_.c:133
+#: ../../install_steps_interactive.pm_.c:139
msgid "Development"
msgstr "Utvikling"
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:140
msgid "Server"
msgstr "Tjener"
-#: ../../install_steps_interactive.pm_.c:138
+#: ../../install_steps_interactive.pm_.c:144
msgid "Which usage is your system used for ?"
msgstr "Hva slags bruk er systemet ditt brukt til?"
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:158
msgid "Please, choose the type of your mouse."
msgstr "Vennligst velg din musetype."
-#: ../../install_steps_interactive.pm_.c:159 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr "Museport"
-#: ../../install_steps_interactive.pm_.c:160
+#: ../../install_steps_interactive.pm_.c:166
msgid "Please choose on which serial port your mouse is connected to."
msgstr "Vennligst velg hvilken serieport musen din koblet til."
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:184
msgid "Configuring IDE"
msgstr "Konfigurerer IDE"
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:184
msgid "IDE"
msgstr "IDE"
-#: ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:195
msgid "no available partitions"
msgstr "ingen tilgjengelige partisjoner"
-#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:202
msgid "Choose the mount points"
msgstr "Velg monteringspunktene"
-#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:219
#, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
@@ -3094,7 +3096,7 @@ msgstr ""
"Jeg vil fјrsјke х blanke ut dхrlige partisjoner, ALLE DATA vil gх tapt\n"
"(%s)"
-#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:228
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -3102,84 +3104,91 @@ msgstr ""
"DiskDrake klarte ikke х lese partisjonstabellen korrekt.\n"
"Fortsett pх eget ansvar!"
-#: ../../install_steps_interactive.pm_.c:230
+#: ../../install_steps_interactive.pm_.c:236
msgid "Root Partition"
msgstr "Root-partisjon"
-#: ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_interactive.pm_.c:237
msgid "What is the root partition (/) of your system?"
msgstr "Hva er root-partisjonen (/) pх systemet ditt?"
-#: ../../install_steps_interactive.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:250
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX partisjonsveiviseren fant disse lјsningene:"
-#: ../../install_steps_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:253
#, c-format
msgid "Partitioning failed: %s"
msgstr "Partisjonering feilet: %s"
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:261
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
"Du mх starte maskinen pх nytt for at modifiseringene av partisjonstabellen\n"
"skal tre i kraft"
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:287
msgid "Choose the partitions you want to format"
msgstr "Velg de partisjonene du јnsker х formatere"
-#: ../../install_steps_interactive.pm_.c:285
+#: ../../install_steps_interactive.pm_.c:291
msgid "Check bad blocks?"
msgstr "Sjekke dхrlige blokker?"
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:299
msgid "Formatting partitions"
msgstr "Formaterer partisjoner"
-#: ../../install_steps_interactive.pm_.c:297
+#: ../../install_steps_interactive.pm_.c:303
#, c-format
msgid "Creating and formatting file %s"
msgstr "Oppretter og formaterer fil %s"
-#: ../../install_steps_interactive.pm_.c:300
+#: ../../install_steps_interactive.pm_.c:306
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
"Ikke nok vekslingsplass til х fullfјre installasjonen, vennligst legg til mer"
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:312
msgid "Looking for available packages"
msgstr "Ser etter tilgjengelige pakker"
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:318
msgid "Finding packages to upgrade"
msgstr "Finner pakker х oppgradere"
-#: ../../install_steps_interactive.pm_.c:329
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr "Systemet ditt har ikke nok plass for installasjon eller oppgradering"
+#: ../../install_steps_interactive.pm_.c:335
+#, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
+msgstr ""
+"Systemet ditt har ikke nok plass for installasjon eller oppgradering (%d > "
+"%d)"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
+#, c-format
msgid "Complete (%dMB)"
msgstr "Ferdig (%dMB)"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
+#, c-format
msgid "Minimum (%dMB)"
msgstr "Minimum (%dMB)"
-#: ../../install_steps_interactive.pm_.c:344
-msgid "Recommanded (%dMB)"
+#: ../../install_steps_interactive.pm_.c:350
+#, c-format
+msgid "Recommended (%dMB)"
msgstr "Anbefalt (%dMB)"
-#: ../../install_steps_interactive.pm_.c:367
+#: ../../install_steps_interactive.pm_.c:373
msgid "Package Group Selection"
msgstr "Valg pakkegruppe"
-#: ../../install_steps_interactive.pm_.c:370
+#: ../../install_steps_interactive.pm_.c:376
msgid "Individual package selection"
msgstr "Individuelt pakkevalg"
-#: ../../install_steps_interactive.pm_.c:416
+#: ../../install_steps_interactive.pm_.c:422
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -3189,12 +3198,12 @@ msgstr ""
"Hvis du ikke har noen av CDene, klikk Avbryt.\n"
"Hvis bare noen av CDene mangler, fjern disse, klikk sх Ok."
-#: ../../install_steps_interactive.pm_.c:419
+#: ../../install_steps_interactive.pm_.c:425
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "CD-ROM merket \"%s\""
-#: ../../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:453
msgid ""
"Installing package %s\n"
"%d%%"
@@ -3202,45 +3211,45 @@ msgstr ""
"Installerer pakke %s\n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:456
+#: ../../install_steps_interactive.pm_.c:462
msgid "Post-install configuration"
msgstr "Konfigurasjon postinstallering"
-#: ../../install_steps_interactive.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:472
msgid "Keep the current IP configuration"
msgstr "Behold nхvцrende IP-konfigurasjon"
-#: ../../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:473
msgid "Reconfigure network now"
msgstr "Rekonfigurer nettverket nх"
-#: ../../install_steps_interactive.pm_.c:468
+#: ../../install_steps_interactive.pm_.c:474
msgid "Do not set up networking"
msgstr "Ikke sett opp nettverk"
-#: ../../install_steps_interactive.pm_.c:471
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
+#: ../../install_steps_interactive.pm_.c:482
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:478
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:477
+#: ../../install_steps_interactive.pm_.c:483
msgid "Do you want to configure a local network for your system?"
msgstr "Vil du konfigurere lokalt LAN-nettverk for systemet ditt?"
-#: ../../install_steps_interactive.pm_.c:483
+#: ../../install_steps_interactive.pm_.c:489
msgid "no network card found"
msgstr "ingen nettverkskort funnet"
-#: ../../install_steps_interactive.pm_.c:501
-#: ../../install_steps_interactive.pm_.c:555
+#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:561
msgid "Configuring network"
msgstr "Konfigurerer nettverk"
-#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:508
msgid ""
"Please enter your host name if you know it.\n"
"Some DHCP servers require the hostname to work.\n"
@@ -3252,18 +3261,18 @@ msgstr ""
"Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
"som ``minboks.mittlab.mittfirma.no''."
-#: ../../install_steps_interactive.pm_.c:506
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:512
+#: ../../install_steps_interactive.pm_.c:566
msgid "Host name:"
msgstr "Vertsnavn:"
-#: ../../install_steps_interactive.pm_.c:525
-#: ../../install_steps_interactive.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:532
#, c-format
msgid "Configuring network device %s"
msgstr "Konfigurerer nettverksenhet %s"
-#: ../../install_steps_interactive.pm_.c:527
+#: ../../install_steps_interactive.pm_.c:533
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -3273,27 +3282,27 @@ 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:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "Automatic IP"
msgstr "Automatisk IP"
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "IP address:"
msgstr "IP-adresse:"
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "Netmask:"
msgstr "Nettmaske:"
-#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:537
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../install_steps_interactive.pm_.c:537 ../../printerdrake.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
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:556
+#: ../../install_steps_interactive.pm_.c:562
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -3305,19 +3314,19 @@ 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:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "DNS server:"
msgstr "DNS-tjener:"
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "Gateway device:"
msgstr "Gateway-enhet:"
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "Gateway:"
msgstr "Gateway:"
-#: ../../install_steps_interactive.pm_.c:576
+#: ../../install_steps_interactive.pm_.c:582
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -3391,88 +3400,88 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:613
msgid "Choose a mirror from which to get the packages"
msgstr "Velg et speil som pakkene kan hentes fra"
-#: ../../install_steps_interactive.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:621
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:619
+#: ../../install_steps_interactive.pm_.c:625
msgid "Please choose the packages you want to install."
msgstr "Vennligst velg pakkene du јnsker х installere."
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:638
msgid "Which is your timezone?"
msgstr "Hva er din tidsone?"
-#: ../../install_steps_interactive.pm_.c:633
+#: ../../install_steps_interactive.pm_.c:639
msgid "Is your hardware clock set to GMT?"
msgstr "Er maskinvareklokken din satt til GMT?"
-#: ../../install_steps_interactive.pm_.c:680
+#: ../../install_steps_interactive.pm_.c:686
msgid "No password"
msgstr "Intet passord"
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:691
msgid "Use shadow file"
msgstr "Bruk skyggefil"
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:691
msgid "shadow"
msgstr "skygge"
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:692
msgid "MD5"
msgstr "MD5"
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:692
msgid "Use MD5 passwords"
msgstr "Bruk MD5 passord"
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:694
msgid "Use NIS"
msgstr "Bruk NIS"
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:694
msgid "yellow pages"
msgstr "gule sider"
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:700
#, 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:701
+#: ../../install_steps_interactive.pm_.c:707
msgid "Authentification NIS"
msgstr "Autentifikasjon NIS"
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:708
msgid "NIS Domain"
msgstr "NIS-domene"
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:708
msgid "NIS Server"
msgstr "NIS-tjener"
-#: ../../install_steps_interactive.pm_.c:727
+#: ../../install_steps_interactive.pm_.c:733
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "Godta bruker"
-#: ../../install_steps_interactive.pm_.c:727
+#: ../../install_steps_interactive.pm_.c:733
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "Legg til bruker"
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:734
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "(allerede lagt til %s)"
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:734
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -3482,48 +3491,48 @@ msgstr ""
"Entre en bruker\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:736
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "Virkelig navn"
-#: ../../install_steps_interactive.pm_.c:731 ../../printerdrake.pm_.c:84
+#: ../../install_steps_interactive.pm_.c:737 ../../printerdrake.pm_.c:84
#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "Brukernavn"
-#: ../../install_steps_interactive.pm_.c:736
+#: ../../install_steps_interactive.pm_.c:742
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Skall"
-#: ../../install_steps_interactive.pm_.c:738
+#: ../../install_steps_interactive.pm_.c:744
#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr "Ikon"
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:754
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "Dette passordet er for enkelt"
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:755
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "Vennligst oppgi et brukernavn"
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:756
#: ../../standalone/adduserdrake_.c:59
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:751
+#: ../../install_steps_interactive.pm_.c:757
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "Denne brukeren er allerede lagt til"
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:782
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 "
@@ -3554,19 +3563,19 @@ msgstr ""
"en diskett\n"
"i den fјrste stasjonen og trykk \"Ok\"."
-#: ../../install_steps_interactive.pm_.c:792
+#: ../../install_steps_interactive.pm_.c:798
msgid "First floppy drive"
msgstr "Fјrste diskettstasjon"
-#: ../../install_steps_interactive.pm_.c:793
+#: ../../install_steps_interactive.pm_.c:799
msgid "Second floppy drive"
msgstr "Andre diskettstasjon"
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../install_steps_interactive.pm_.c:800
msgid "Skip"
msgstr "Dropp"
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:805
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 "
@@ -3591,32 +3600,32 @@ msgstr ""
"etter systemsvikt. иnsker du х opprette en oppstartsdiskett for systemet "
"ditt?"
-#: ../../install_steps_interactive.pm_.c:808
+#: ../../install_steps_interactive.pm_.c:814
msgid "Sorry, no floppy drive available"
msgstr "Beklager, ingen diskettstasjon tilgjengelig"
-#: ../../install_steps_interactive.pm_.c:811
+#: ../../install_steps_interactive.pm_.c:817
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:817
+#: ../../install_steps_interactive.pm_.c:823
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Sett inn en diskett i stasjon %s"
-#: ../../install_steps_interactive.pm_.c:820
+#: ../../install_steps_interactive.pm_.c:826
msgid "Creating bootdisk"
msgstr "Oppretter oppstartdiskett"
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:833
msgid "Preparing bootloader"
msgstr "Klargjјr oppstartslaster"
-#: ../../install_steps_interactive.pm_.c:835
+#: ../../install_steps_interactive.pm_.c:841
msgid "Do you want to use aboot?"
msgstr "иnsker du х bruke aboot?"
-#: ../../install_steps_interactive.pm_.c:838
+#: ../../install_steps_interactive.pm_.c:844
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -3624,100 +3633,100 @@ msgstr ""
"Feil ved installasjon av aboot, \n"
"prјve х installere selv om det јdelegger den fјrste partisjonen?"
-#: ../../install_steps_interactive.pm_.c:847
+#: ../../install_steps_interactive.pm_.c:853
msgid "Installation of bootloader failed. The following error occured:"
msgstr "Installasjon av oppstartslaster mislykket. Fјlgende feil oppsto:"
-#: ../../install_steps_interactive.pm_.c:862
+#: ../../install_steps_interactive.pm_.c:868
msgid "Proxies configuration"
msgstr "Konfigurasjon proxy"
-#: ../../install_steps_interactive.pm_.c:863
+#: ../../install_steps_interactive.pm_.c:869
msgid "HTTP proxy"
msgstr "HTTP-proxy"
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:870
msgid "FTP proxy"
msgstr "FTP-proxy"
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:876
msgid "Proxy should be http://..."
msgstr "Proxy burde vцre http://..."
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:877
msgid "Proxy should be ftp://..."
msgstr "Proxy burde vцre ftp://..."
-#: ../../install_steps_interactive.pm_.c:881 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Velkommen til Crackers"
-#: ../../install_steps_interactive.pm_.c:882 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "Dхrlig"
-#: ../../install_steps_interactive.pm_.c:883 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "Lav"
-#: ../../install_steps_interactive.pm_.c:884 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "Medium"
-#: ../../install_steps_interactive.pm_.c:885 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:24
msgid "High"
msgstr "Hјy"
-#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:892 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Paranoid"
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../install_steps_interactive.pm_.c:905
msgid "Miscellaneous questions"
msgstr "Forskjellige spјrsmхl"
-#: ../../install_steps_interactive.pm_.c:900
+#: ../../install_steps_interactive.pm_.c:906
msgid "(may cause data corruption)"
msgstr "(kan forхrsake korrupsjon av data)"
-#: ../../install_steps_interactive.pm_.c:900
+#: ../../install_steps_interactive.pm_.c:906
msgid "Use hard drive optimisations?"
msgstr "Bruk harddisk-optimisering?"
-#: ../../install_steps_interactive.pm_.c:901 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Velg sikkerhetsnivх"
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:908
#, 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:904
+#: ../../install_steps_interactive.pm_.c:910
msgid "Removable media automounting"
msgstr "Fjernbart media automontering"
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:912
msgid "Clean /tmp at each boot"
msgstr "Tјm /tmp ved hver oppstart"
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:915
msgid "Enable multi profiles"
msgstr "Slх pх multiprofiler"
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:917
msgid "Enable num lock at startup"
msgstr "Slх pх num lock ved oppstart"
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:920
msgid "Give the ram size in MB"
msgstr "Oppgi ram-stјrrelsen i MB"
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:922
msgid "Can't use supermount in high security level"
msgstr "Kan ikke bruke supermount i hјyt sikkerhetsnivх"
-#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:924
msgid ""
"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
"If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3731,7 +3740,7 @@ msgstr ""
"Mere generelt, ikke forvent х bruke maskinen din til annet enn en tjener.\n"
"Du har blitt advart."
-#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:929
msgid ""
"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
"give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -3739,7 +3748,7 @@ msgstr ""
"Vцr forsiktig, х ha numlock slхtt pх forхrsaker at mange av tastene\n"
"gir tall istedenfor vanlige bokstaver (f.eks: `p' gir `6')"
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:950
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
"By default, the 4.0 server is used unless your card is not supported.\n"
@@ -3751,17 +3760,17 @@ msgstr ""
"\n"
"иnsker du х beholde XFree 3.3?"
-#: ../../install_steps_interactive.pm_.c:975
+#: ../../install_steps_interactive.pm_.c:981
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
"иnsker du х generere en auto installeringsdiskett for linux replikasjon?"
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:983
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sett inn en tom diskett i stasjon %s"
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:997
msgid "Creating auto install floppy"
msgstr "Oppretter diskett for autoinstallasjon"
@@ -5575,6 +5584,9 @@ msgstr "Finner tillatelser"
msgid "Finding leaves takes some time"
msgstr "Finne tillatelser vil ta litt tid"
+#~ msgid "Install/Upgrade"
+#~ msgstr "Installer/Oppgrader"
+
#~ msgid "Configure my card"
#~ msgstr "Konfigurer kortet mitt"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 7d80a794e..4aa6bab72 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-08-29 23:38+0200\n"
+"POT-Creation-Date: 2000-08-30 19:27+0200\n"
"PO-Revision-Date: 1999-08-09 16:39+0200\n"
"Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
"Language-Team: Serbian (cyrillic)\n"
@@ -505,15 +505,15 @@ msgstr "Видео мод"
msgid "Delay before booting default image"
msgstr "Пауза пре стартања default image-а"
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:682
-#: ../../install_steps_interactive.pm_.c:733 ../../netconnect.pm_.c:482
+#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:739 ../../netconnect.pm_.c:482
#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:110
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "Лозинка"
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:683
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:689
+#: ../../install_steps_interactive.pm_.c:740
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "Лозинка (поновите)"
@@ -536,14 +536,14 @@ msgid ""
msgstr ""
"Опција``Ограничена командна линика - опције'' је неупотребљива без лозинке"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
+#: ../../install_steps_interactive.pm_.c:753
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "Пробајте поново"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:692
-#: ../../install_steps_interactive.pm_.c:747
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:698
+#: ../../install_steps_interactive.pm_.c:753
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "Неподударност лозинки"
@@ -562,7 +562,7 @@ msgid "Add"
msgstr "Додај"
#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:727 ../../printerdrake.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:733 ../../printerdrake.pm_.c:244
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Урађено"
@@ -620,7 +620,7 @@ msgid "Default"
msgstr "Подразумевано"
#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:680 ../../interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:686 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
@@ -912,7 +912,7 @@ msgstr "ПАЖЉИВО,ова операција jе опасна."
#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:212 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "Грешка"
@@ -1162,7 +1162,7 @@ msgstr "Форматирање"
msgid "Formatting loopback file %s"
msgstr "Форматирање loopback фаjлa %s"
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:298
+#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:304
#, c-format
msgid "Formatting partition %s"
msgstr "Форматирање партиције %s"
@@ -2332,7 +2332,7 @@ msgstr "Подешавање миша"
msgid "Choose your keyboard"
msgstr "Изабери тастатуру"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:368
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:374
msgid "Miscellaneous"
msgstr "Разне опције"
@@ -2372,8 +2372,8 @@ msgstr "Подеси сервисе"
msgid "Configure printer"
msgstr "Подеси штампач"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:680
-#: ../../install_steps_interactive.pm_.c:681
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:687
msgid "Set root password"
msgstr "Унеси root лозинку"
@@ -2747,12 +2747,12 @@ msgid "Info"
msgstr "Инфо"
#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:272
-#: ../../install_steps_interactive.pm_.c:126 ../../standalone/rpmdrake_.c:161
+#: ../../install_steps_interactive.pm_.c:132 ../../standalone/rpmdrake_.c:161
msgid "Install"
msgstr "Инсталирај"
#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:444
msgid "Installing"
msgstr "Инсталирам"
@@ -2769,7 +2769,7 @@ msgid "Total time "
msgstr "Укупно време"
#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:444
msgid "Preparing installation"
msgstr "Припремам инсталацију"
@@ -2788,7 +2788,7 @@ msgid "There was an error ordering packages:"
msgstr "Грешка у листи пакета:"
#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:938
+#: ../../install_steps_interactive.pm_.c:944
msgid "Use existing configuration for X11?"
msgstr "Да ли да користим постојећу конфигурацију за X11 ?"
@@ -2958,51 +2958,53 @@ msgstr "Xм,поjавила се грешка"
msgid "Please, choose a language to use."
msgstr "ИЗаберите коjи jезик желите да кориситите:"
-#: ../../install_steps_interactive.pm_.c:74
+#: ../../install_steps_interactive.pm_.c:80
#: ../../standalone/keyboarddrake_.c:22
msgid "Keyboard"
msgstr "Тастатурa"
-#: ../../install_steps_interactive.pm_.c:75
+#: ../../install_steps_interactive.pm_.c:81
msgid "Please, choose your keyboard layout."
msgstr "Који распоред тастатуре желите ?"
-#: ../../install_steps_interactive.pm_.c:84
+#: ../../install_steps_interactive.pm_.c:90
msgid "You can choose other languages that will be available after install"
msgstr "Можете изабрати други jезик коjи ће бити доступан после инсталациje "
-#: ../../install_steps_interactive.pm_.c:93
-#: ../../install_steps_interactive.pm_.c:137
+#: ../../install_steps_interactive.pm_.c:99
+#: ../../install_steps_interactive.pm_.c:143
msgid "Install Class"
msgstr "Инсталације класе"
-#: ../../install_steps_interactive.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:99
msgid "Which installation class do you want?"
msgstr "Коjу инсталациону класу бирате ?"
-#: ../../install_steps_interactive.pm_.c:95
-msgid "Install/Upgrade"
-msgstr "Инсталација/Ажурирање"
+#: ../../install_steps_interactive.pm_.c:101
+#, fuzzy
+msgid "Install/Rescue"
+msgstr "Инсталирај"
-#: ../../install_steps_interactive.pm_.c:95
-msgid "Is this an install or an upgrade?"
+#: ../../install_steps_interactive.pm_.c:101
+#, fuzzy
+msgid "Is this an install or a rescue?"
msgstr "Да ли је ово пуна инсталација или ажурирање ?"
-#: ../../install_steps_interactive.pm_.c:104
+#: ../../install_steps_interactive.pm_.c:110
msgid "Recommended"
msgstr "Препоручено"
-#: ../../install_steps_interactive.pm_.c:106
-#: ../../install_steps_interactive.pm_.c:121
+#: ../../install_steps_interactive.pm_.c:112
+#: ../../install_steps_interactive.pm_.c:127
msgid "Customized"
msgstr "Избор по жељи"
-#: ../../install_steps_interactive.pm_.c:107
-#: ../../install_steps_interactive.pm_.c:121
+#: ../../install_steps_interactive.pm_.c:113
+#: ../../install_steps_interactive.pm_.c:127
msgid "Expert"
msgstr "Експерт"
-#: ../../install_steps_interactive.pm_.c:116
+#: ../../install_steps_interactive.pm_.c:122
#, fuzzy
msgid ""
"Are you sure you are an expert? \n"
@@ -3014,55 +3016,55 @@ msgstr ""
"Да ли сте сигурно експерт !? \n"
"Xеj,без шале,jер добиjатe приступ моћним али опасним стварима."
-#: ../../install_steps_interactive.pm_.c:126
+#: ../../install_steps_interactive.pm_.c:132
msgid "Upgrade"
msgstr "Ажурирање"
-#: ../../install_steps_interactive.pm_.c:132
+#: ../../install_steps_interactive.pm_.c:138
msgid "Normal"
msgstr "Нормалнa"
-#: ../../install_steps_interactive.pm_.c:133
+#: ../../install_steps_interactive.pm_.c:139
msgid "Development"
msgstr "Развојна"
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:140
msgid "Server"
msgstr "Сервер"
-#: ../../install_steps_interactive.pm_.c:138
+#: ../../install_steps_interactive.pm_.c:144
msgid "Which usage is your system used for ?"
msgstr "За kоjу употребу ће те корисити систем ?"
-#: ../../install_steps_interactive.pm_.c:152
+#: ../../install_steps_interactive.pm_.c:158
msgid "Please, choose the type of your mouse."
msgstr "Изаберитe тип миша"
-#: ../../install_steps_interactive.pm_.c:159 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr "Порт за миша"
-#: ../../install_steps_interactive.pm_.c:160
+#: ../../install_steps_interactive.pm_.c:166
msgid "Please choose on which serial port your mouse is connected to."
msgstr "Изаберите на који серијски порт је ваш миш прикључен."
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:184
msgid "Configuring IDE"
msgstr "Kонфигурација IDE"
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:184
msgid "IDE"
msgstr " IDE"
-#: ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:195
msgid "no available partitions"
msgstr "нема доступних партиција"
-#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:202
msgid "Choose the mount points"
msgstr "Изаберите тачке монтирања"
-#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:219
#, fuzzy, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
@@ -3072,7 +3074,7 @@ msgstr ""
"Не могу прочитати табелу партиција, много је искварена за мене :(\n"
"Покушаћу даље заобилазећи лоше партиције"
-#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:228
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -3080,84 +3082,86 @@ msgstr ""
"DiskDrake не може да исправно прочита табелу партиција.\n"
"Даљи наставак иде на ваш ризик !"
-#: ../../install_steps_interactive.pm_.c:230
+#: ../../install_steps_interactive.pm_.c:236
msgid "Root Partition"
msgstr "Root партиција"
-#: ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_interactive.pm_.c:237
msgid "What is the root partition (/) of your system?"
msgstr "На којој партицији је root партиција (/) вашег система?"
-#: ../../install_steps_interactive.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:250
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:253
#, fuzzy, c-format
msgid "Partitioning failed: %s"
msgstr "Тип табелe партиција : %s\n"
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:261
msgid "You need to reboot for the partition table modifications to take place"
msgstr "Треба да ресетујете машину за примену измена у табели партиција"
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:287
msgid "Choose the partitions you want to format"
msgstr "Изабери партиције за форматирање"
-#: ../../install_steps_interactive.pm_.c:285
+#: ../../install_steps_interactive.pm_.c:291
msgid "Check bad blocks?"
msgstr "Провери лоше блокове ?"
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:299
msgid "Formatting partitions"
msgstr "Форматирање партицију"
-#: ../../install_steps_interactive.pm_.c:297
+#: ../../install_steps_interactive.pm_.c:303
#, c-format
msgid "Creating and formatting file %s"
msgstr "Креирaње и форматирaње фаjлa %s"
-#: ../../install_steps_interactive.pm_.c:300
+#: ../../install_steps_interactive.pm_.c:306
msgid "Not enough swap to fulfill installation, please add some"
msgstr "Нема довољно swap-а да заврши инсталацију, додајте још swap-а"
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:312
msgid "Looking for available packages"
msgstr "Тражим пакете"
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:318
msgid "Finding packages to upgrade"
msgstr "Тражим пакете за ажурирање..."
-#: ../../install_steps_interactive.pm_.c:329
-msgid "Your system has not enough space left for installation or upgrade"
+#: ../../install_steps_interactive.pm_.c:335
+#, fuzzy, c-format
+msgid ""
+"Your system has not enough space left for installation or upgrade (%d > %d)"
msgstr "Вaш систем нема више места за инсталациjу или aжурирaњe"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
#, fuzzy, c-format
msgid "Complete (%dMB)"
msgstr "Нормалнa"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
#, fuzzy, c-format
msgid "Minimum (%dMB)"
msgstr "(%dMB)"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:350
#, fuzzy, c-format
-msgid "Recommanded (%dMB)"
+msgid "Recommended (%dMB)"
msgstr "Препоручено"
-#: ../../install_steps_interactive.pm_.c:367
+#: ../../install_steps_interactive.pm_.c:373
msgid "Package Group Selection"
msgstr "Одабир група пакета"
-#: ../../install_steps_interactive.pm_.c:370
+#: ../../install_steps_interactive.pm_.c:376
msgid "Individual package selection"
msgstr "Поjединaчно бирaње пакетa"
-#: ../../install_steps_interactive.pm_.c:416
+#: ../../install_steps_interactive.pm_.c:422
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -3168,12 +3172,12 @@ msgstr ""
"Ако вам недостаjу само неки CD-ови , деселектуjтe иx, а онда кликните на "
"Ok."
-#: ../../install_steps_interactive.pm_.c:419
+#: ../../install_steps_interactive.pm_.c:425
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "Cd-Rom ознaчен као \"%s"
-#: ../../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:453
msgid ""
"Installing package %s\n"
"%d%%"
@@ -3181,46 +3185,46 @@ msgstr ""
"Инсталирам пакете %s\n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:456
+#: ../../install_steps_interactive.pm_.c:462
msgid "Post-install configuration"
msgstr "Постинсталациона конфигурацијa"
-#: ../../install_steps_interactive.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:472
msgid "Keep the current IP configuration"
msgstr "Сачувај текуће IP параметре"
-#: ../../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:473
msgid "Reconfigure network now"
msgstr "Реконфигуриши мрежу"
-#: ../../install_steps_interactive.pm_.c:468
+#: ../../install_steps_interactive.pm_.c:474
#, fuzzy
msgid "Do not set up networking"
msgstr "Подеси мрежу"
-#: ../../install_steps_interactive.pm_.c:471
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
+#: ../../install_steps_interactive.pm_.c:482
msgid "Network Configuration"
msgstr "Мрежно подешавање"
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:478
msgid "Local networking has already been configured. Do you want to:"
msgstr "Локални мрежа је већ подешена. Да ли желите да:"
-#: ../../install_steps_interactive.pm_.c:477
+#: ../../install_steps_interactive.pm_.c:483
msgid "Do you want to configure a local network for your system?"
msgstr "Да ли желите да подесите локалну мрежу за ваш систем?"
-#: ../../install_steps_interactive.pm_.c:483
+#: ../../install_steps_interactive.pm_.c:489
msgid "no network card found"
msgstr "Није пронађена мрежна картица"
-#: ../../install_steps_interactive.pm_.c:501
-#: ../../install_steps_interactive.pm_.c:555
+#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:561
msgid "Configuring network"
msgstr "Подешавање мреже"
-#: ../../install_steps_interactive.pm_.c:502
+#: ../../install_steps_interactive.pm_.c:508
#, fuzzy
msgid ""
"Please enter your host name if you know it.\n"
@@ -3233,18 +3237,18 @@ msgstr ""
"као на пр. ``mybox.mylab.myco.com''.\n"
"Ако немате додатних 'nameserver'-а, оставите та поља празна."
-#: ../../install_steps_interactive.pm_.c:506
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:512
+#: ../../install_steps_interactive.pm_.c:566
msgid "Host name:"
msgstr "Име хоста:"
-#: ../../install_steps_interactive.pm_.c:525
-#: ../../install_steps_interactive.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:532
#, c-format
msgid "Configuring network device %s"
msgstr "Подешавање мрежног уређаја %s"
-#: ../../install_steps_interactive.pm_.c:527
+#: ../../install_steps_interactive.pm_.c:533
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -3254,27 +3258,27 @@ msgstr ""
"Свака ставка треба де буде tavka треба да буде унета као\n"
"IP адреса (на пример, 123.45.67.89)."
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "Automatic IP"
msgstr "Аутоматски IP"
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "IP address:"
msgstr "IP адреса:"
-#: ../../install_steps_interactive.pm_.c:530
+#: ../../install_steps_interactive.pm_.c:536
msgid "Netmask:"
msgstr "Мрежна маска:"
-#: ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:537
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../install_steps_interactive.pm_.c:537 ../../printerdrake.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
msgid "IP address should be in format 1.2.3.4"
msgstr "IP адреса треба да буде у формату 1.2.3.4"
-#: ../../install_steps_interactive.pm_.c:556
+#: ../../install_steps_interactive.pm_.c:562
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -3286,19 +3290,19 @@ msgstr ""
"као на пр. ``mybox.mylab.myco.com''.\n"
"Ако немате додатних 'nameserver'-а, оставите та поља празна."
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "DNS server:"
msgstr "DNS сервер:"
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "Gateway device:"
msgstr "Gateway уређај:"
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:566
msgid "Gateway:"
msgstr "Gateway:"
-#: ../../install_steps_interactive.pm_.c:576
+#: ../../install_steps_interactive.pm_.c:582
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -3354,89 +3358,89 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:613
msgid "Choose a mirror from which to get the packages"
msgstr "Изаберите mirror са ког ћете скинути пакете"
-#: ../../install_steps_interactive.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:621
msgid "Contacting the mirror to get the list of available packages"
msgstr "Кантактирајте mirror за листу могућих пакета"
-#: ../../install_steps_interactive.pm_.c:619
+#: ../../install_steps_interactive.pm_.c:625
msgid "Please choose the packages you want to install."
msgstr "Изаберите пакете за инсталацију"
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:638
#, fuzzy
msgid "Which is your timezone?"
msgstr "За kоjу употребу ће те корисити систем ?"
-#: ../../install_steps_interactive.pm_.c:633
+#: ../../install_steps_interactive.pm_.c:639
msgid "Is your hardware clock set to GMT?"
msgstr "Да ли је ваш системски (BIOS) часовник подешен на GMT ?"
-#: ../../install_steps_interactive.pm_.c:680
+#: ../../install_steps_interactive.pm_.c:686
msgid "No password"
msgstr "Нема лозинке"
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:691
msgid "Use shadow file"
msgstr "Користи shadow фајл"
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:691
msgid "shadow"
msgstr "сенкa"
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:692
msgid "MD5"
msgstr "MD5"
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:692
msgid "Use MD5 passwords"
msgstr "Користи MD5 лозинку"
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:694
msgid "Use NIS"
msgstr "Користи NIS"
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:694
msgid "yellow pages"
msgstr "жуте странице"
-#: ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_interactive.pm_.c:700
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr "Ова лозинка jе сувишe jедноставнa (треба дa има бар %d знакова)"
-#: ../../install_steps_interactive.pm_.c:701
+#: ../../install_steps_interactive.pm_.c:707
msgid "Authentification NIS"
msgstr "Аутентификација NIS"
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:708
msgid "NIS Domain"
msgstr "NIS Домен"
-#: ../../install_steps_interactive.pm_.c:702
+#: ../../install_steps_interactive.pm_.c:708
msgid "NIS Server"
msgstr "NIS Сервер"
-#: ../../install_steps_interactive.pm_.c:727
+#: ../../install_steps_interactive.pm_.c:733
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "Прихвати корисника"
-#: ../../install_steps_interactive.pm_.c:727
+#: ../../install_steps_interactive.pm_.c:733
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "Додај корисника"
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:734
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "(%s већ постоји)"
-#: ../../install_steps_interactive.pm_.c:728
+#: ../../install_steps_interactive.pm_.c:734
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -3446,48 +3450,48 @@ msgstr ""
"Унеси корисника\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:730
+#: ../../install_steps_interactive.pm_.c:736
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "Право име"
-#: ../../install_steps_interactive.pm_.c:731 ../../printerdrake.pm_.c:84
+#: ../../install_steps_interactive.pm_.c:737 ../../printerdrake.pm_.c:84
#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "Корисничко име"
-#: ../../install_steps_interactive.pm_.c:736
+#: ../../install_steps_interactive.pm_.c:742
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Shell"
-#: ../../install_steps_interactive.pm_.c:738
+#: ../../install_steps_interactive.pm_.c:744
#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr "Иконa"
-#: ../../install_steps_interactive.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:754
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "Ова лозинка је превише проста"
-#: ../../install_steps_interactive.pm_.c:749
+#: ../../install_steps_interactive.pm_.c:755
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "Одредите корисничко име"
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:756
#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "Корисничко име може садржати само мала слова, бројеве, `-' и `_'"
-#: ../../install_steps_interactive.pm_.c:751
+#: ../../install_steps_interactive.pm_.c:757
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "Ово корисничко име већ постоји"
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:782
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 "
@@ -3513,19 +3517,19 @@ msgstr ""
"Уколико желите да креирате стартну дискету за ваш системубаците дискету у "
"погон и притисните \"Да\"."
-#: ../../install_steps_interactive.pm_.c:792
+#: ../../install_steps_interactive.pm_.c:798
msgid "First floppy drive"
msgstr "Први флопи урeђаj "
-#: ../../install_steps_interactive.pm_.c:793
+#: ../../install_steps_interactive.pm_.c:799
msgid "Second floppy drive"
msgstr "Други флопи урeђаj"
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../install_steps_interactive.pm_.c:800
msgid "Skip"
msgstr "Прескочи"
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:805
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 "
@@ -3546,34 +3550,34 @@ msgstr ""
"'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
"Да ли бисте да креирате стартну дискету за ваш систем?"
-#: ../../install_steps_interactive.pm_.c:808
+#: ../../install_steps_interactive.pm_.c:814
msgid "Sorry, no floppy drive available"
msgstr "Ти малера, нема дискетe"
-#: ../../install_steps_interactive.pm_.c:811
+#: ../../install_steps_interactive.pm_.c:817
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
"Изабрерите дискетни уређај који ћете користити за креирање старне дискете"
-#: ../../install_steps_interactive.pm_.c:817
+#: ../../install_steps_interactive.pm_.c:823
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Убаците празну дискету у уређај %s"
-#: ../../install_steps_interactive.pm_.c:820
+#: ../../install_steps_interactive.pm_.c:826
msgid "Creating bootdisk"
msgstr "Креирам стартни диск..."
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:833
msgid "Preparing bootloader"
msgstr "Припремам стартер..."
-#: ../../install_steps_interactive.pm_.c:835
+#: ../../install_steps_interactive.pm_.c:841
#, fuzzy
msgid "Do you want to use aboot?"
msgstr "Да ли желите да користите SILO ?"
-#: ../../install_steps_interactive.pm_.c:838
+#: ../../install_steps_interactive.pm_.c:844
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -3581,102 +3585,102 @@ msgstr ""
"Грeшка при инсталациjи aboot-a, \n"
"Да ли дa пробам да инсталирам чак ако то води уништeњу прве партициje?"
-#: ../../install_steps_interactive.pm_.c:847
+#: ../../install_steps_interactive.pm_.c:853
#, fuzzy
msgid "Installation of bootloader failed. The following error occured:"
msgstr "Инсталација LILO-а неуспела. Грешка је:"
-#: ../../install_steps_interactive.pm_.c:862
+#: ../../install_steps_interactive.pm_.c:868
#, fuzzy
msgid "Proxies configuration"
msgstr "Постинсталациона конфигурацијa"
-#: ../../install_steps_interactive.pm_.c:863
+#: ../../install_steps_interactive.pm_.c:869
msgid "HTTP proxy"
msgstr "HTTP proxy"
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:870
msgid "FTP proxy"
msgstr "FTP proxy"
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:876
msgid "Proxy should be http://..."
msgstr "Proxy треба да буде http://..."
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:877
msgid "Proxy should be ftp://..."
msgstr "Proxy треба да буде ftp://..."
-#: ../../install_steps_interactive.pm_.c:881 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Доброшли код кракерa"
-#: ../../install_steps_interactive.pm_.c:882 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "Бедна"
-#: ../../install_steps_interactive.pm_.c:883 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "Мала"
-#: ../../install_steps_interactive.pm_.c:884 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "Средња"
-#: ../../install_steps_interactive.pm_.c:885 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:24
msgid "High"
msgstr "Велика"
-#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:892 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Параноидна"
-#: ../../install_steps_interactive.pm_.c:899
+#: ../../install_steps_interactive.pm_.c:905
msgid "Miscellaneous questions"
msgstr "Разнa питања"
-#: ../../install_steps_interactive.pm_.c:900
+#: ../../install_steps_interactive.pm_.c:906
msgid "(may cause data corruption)"
msgstr "(може узроковати грешке)"
-#: ../../install_steps_interactive.pm_.c:900
+#: ../../install_steps_interactive.pm_.c:906
msgid "Use hard drive optimisations?"
msgstr "Активирај хард диск оптимизацију ?"
-#: ../../install_steps_interactive.pm_.c:901 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:907 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Изаберите сигурносни ниво"
-#: ../../install_steps_interactive.pm_.c:902
+#: ../../install_steps_interactive.pm_.c:908
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "Дефиниши величину RAM ако је потребно (детектовано је %d MB)"
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:910
msgid "Removable media automounting"
msgstr "Аутомонтирање преносивих медија"
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:912
msgid "Clean /tmp at each boot"
msgstr "Очисти /tmp при сваком стартaњу"
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:915
msgid "Enable multi profiles"
msgstr "Омогући мулти-профиле "
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:917
msgid "Enable num lock at startup"
msgstr "Активирај Num Lock тастер при стартању"
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:920
msgid "Give the ram size in MB"
msgstr "Прикажи величину RAM-а у Mb"
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:922
msgid "Can't use supermount in high security level"
msgstr "Ниjе могуће кориситити supermount код 'Велког' сигурносног нивоа"
-#: ../../install_steps_interactive.pm_.c:918
+#: ../../install_steps_interactive.pm_.c:924
msgid ""
"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
"If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3692,13 +3696,13 @@ msgstr ""
"каосервер.\n"
"Упозорени стe."
-#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:929
msgid ""
"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
"give digits instead of normal letters (eg: pressing `p' gives `6')"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:950
#, fuzzy
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
@@ -3713,17 +3717,17 @@ msgstr ""
"\n"
"Да ли желите да пробате XFree 4.0?"
-#: ../../install_steps_interactive.pm_.c:975
+#: ../../install_steps_interactive.pm_.c:981
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
"Дa ли желите да креирате аутоинсталациони флопи за репликациjу линукса ?"
-#: ../../install_steps_interactive.pm_.c:977
+#: ../../install_steps_interactive.pm_.c:983
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Убаците празну дискету у уређај %s"
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:997
msgid "Creating auto install floppy"
msgstr "Креирам ауто инсталациони флопи"
@@ -5543,6 +5547,9 @@ msgstr "Пронaђи остављенe"
msgid "Finding leaves takes some time"
msgstr "Пронaђи остављених трaжи мало временa"
+#~ msgid "Install/Upgrade"
+#~ msgstr "Инсталација/Ажурирање"
+
#, fuzzy
#~ msgid "Configure my card"
#~ msgstr "Конфигурисање X окружења"