summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-27 11:37:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-27 11:37:43 +0000
commit530d0e93a3d8e9b59495d2da676f142ab3136862 (patch)
treef7abad938fdfc92e21aafef8bec3f2bbdbea10d3
parent28b8238df46801a722a041996ed823b35953ce52 (diff)
downloaddrakx-530d0e93a3d8e9b59495d2da676f142ab3136862.tar
drakx-530d0e93a3d8e9b59495d2da676f142ab3136862.tar.gz
drakx-530d0e93a3d8e9b59495d2da676f142ab3136862.tar.bz2
drakx-530d0e93a3d8e9b59495d2da676f142ab3136862.tar.xz
drakx-530d0e93a3d8e9b59495d2da676f142ab3136862.zip
no_comment
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/help.pm4
-rw-r--r--perl-install/install2.pm14
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/share/po/DrakX.pot828
-rw-r--r--perl-install/share/po/no.po863
-rw-r--r--perl-install/share/po/sp.po857
8 files changed, 1324 insertions, 1253 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 7a44db580..eee377c26 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-27 Pixel <pixel@mandrakesoft.com>
+
+ * install_steps_interactive.pm (configureNetwork): when "Cancel"
+ pressed at network interface configuration do not skip all
+ configuration.
+
2000-04-26 Fran�ois Pons <fpons@mandrakesoft.com>
* install_steps.pm (pppConfig): modified a lot, removed template
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 7dc79e6d9..2c5e90aa2 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -29,7 +29,7 @@ arch() =~ /^sparc/ ? (
{ mntpoint => "swap", size => 30 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
),
{ mntpoint => "/boot", size => 16 << 11, type => 0x83, ratio => 1, maxsize => 30 << 11 },
- { mntpoint => "/usr", size => 200 << 11, type => 0x83, ratio => 6, maxsize =>1500 << 11 },
+ { mntpoint => "/usr", size => 200 << 11, type => 0x83, ratio => 6, maxsize =>3000 << 11 },
{ mntpoint => "/home", size => 50 << 11, type => 0x83, ratio => 3 },
{ mntpoint => "/var", size => 200 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
{ mntpoint => "/tmp", size => 50 << 11, type => 0x83, ratio => 3, maxsize => 500 << 11 },
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 6b96ecf5c..909d8495c 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -32,8 +32,10 @@ selectInstallClass =>
perform a highly customized installation. As for a \"Customized\"
installation class, you will be able to select the usage for your system.
But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE DOING!
+"),
-The different choices for your machine's usage (provided, hence, that you have
+selectInstallClass2 =>
+__("The different choices for your machine's usage (provided, hence, that you have
chosen either \"Custom\" or \"Expert\" as an installation class) are the
following:
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 457a743fd..68bb0b591 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -91,38 +91,38 @@ arch() =~ /^sparc/ ? (
normal => [
{ mntpoint => "/", size => 600 << 11, type => 0x83, ratio => 5, maxsize =>1000 << 11 },
{ mntpoint => "swap", size => 128 << 11, type => 0x82, ratio => 1, maxsize => 400 << 11 },
- { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>1500 << 11 },
+ { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>3000 << 11 },
{ mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 2 },
],
developer => [
{ mntpoint => "/", size => 300 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
{ mntpoint => "swap", size => 128 << 11, type => 0x82, ratio => 1, maxsize => 400 << 11 },
- { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>1500 << 11 },
+ { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>3000 << 11 },
{ mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
],
server => [
{ mntpoint => "/", size => 300 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 },
{ mntpoint => "swap", size => 128 << 11, type => 0x82, ratio => 2, maxsize => 800 << 11 },
- { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 3, maxsize =>1500 << 11 },
+ { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 3, maxsize =>3000 << 11 },
{ mntpoint => "/var", size => 100 << 11, type => 0x83, ratio => 4 },
{ mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
],
) : (
normal => [
- { mntpoint => "/", size => 300 << 11, type => 0x83, ratio => 5, maxsize => 2500 << 11 },
+ { mntpoint => "/", size => 300 << 11, type => 0x83, ratio => 5, maxsize => 3500 << 11 },
{ mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
- { mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 2 },
+ { mntpoint => "/home", size => 300 << 11, type => 0x83, ratio => 3 },
],
developer => [
{ mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 },
{ mntpoint => "/", size => 150 << 11, type => 0x83, ratio => 1, maxsize => 300 << 11 },
- { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>1500 << 11 },
+ { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 4, maxsize =>3000 << 11 },
{ mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
],
server => [
{ mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 2, maxsize => 400 << 11 },
{ mntpoint => "/", size => 150 << 11, type => 0x83, ratio => 1, maxsize => 250 << 11 },
- { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 3, maxsize =>1500 << 11 },
+ { mntpoint => "/usr", size => 300 << 11, type => 0x83, ratio => 3, maxsize =>3000 << 11 },
{ mntpoint => "/var", size => 100 << 11, type => 0x83, ratio => 4 },
{ mntpoint => "/home", size => 100 << 11, type => 0x83, ratio => 5 },
],
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e1c62454e..23fcd6e89 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -131,6 +131,7 @@ You will be allowed to make powerfull but dangerous things here."),
developer => _("Development"),
server => _("Server"),
);
+ $o->set_help('selectInstallClass2');
$o->{installClass} = ${{reverse %c}}{$o->ask_from_list(_("Install Class"),
_("Which usage is your system used for ?"),
[ values %c ], $c{$o->{installClass}})};
@@ -408,7 +409,7 @@ sub configureNetwork($) {
my $intf = network::findIntf($o->{intf} ||= [], $_);
add2hash($intf, $last);
add2hash($intf, { NETMASK => '255.255.255.0' });
- $o->configureNetworkIntf($intf) or return;
+ $o->configureNetworkIntf($intf) or last;
$o->{netc} ||= {};
delete $o->{netc}{dnsServer};
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 79f24246a..a072afd79 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-04-24 19:39+0200\n"
+"POT-Creation-Date: 2000-04-27 12:04+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"
@@ -64,11 +64,11 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
msgid "Horizontal refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
msgid "Vertical refresh rate"
msgstr ""
@@ -130,7 +130,7 @@ msgid ""
"You can switch if off if you want, you'll hear a beep when it's over"
msgstr ""
-#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:162
+#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:165
msgid "Resolution"
msgstr ""
@@ -169,109 +169,109 @@ msgid ""
"Try with another video card or monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:905
+#: ../../Xconfigurator.pm_.c:906
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:906
+#: ../../Xconfigurator.pm_.c:907
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:907
+#: ../../Xconfigurator.pm_.c:908
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:908
+#: ../../Xconfigurator.pm_.c:909
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:909
+#: ../../Xconfigurator.pm_.c:910
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:910
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:913
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:914
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:929
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:942
+#: ../../Xconfigurator.pm_.c:943
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:944
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:945
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:945
+#: ../../Xconfigurator.pm_.c:946
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:946
+#: ../../Xconfigurator.pm_.c:947
msgid "Automatical resolutions search"
msgstr ""
-#: ../../Xconfigurator.pm_.c:950
+#: ../../Xconfigurator.pm_.c:951
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:952
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:952 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:953 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:956 ../../standalone/drakboot_.c:29
+#: ../../Xconfigurator.pm_.c:957 ../../standalone/drakboot_.c:30
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:963
+#: ../../Xconfigurator.pm_.c:964
msgid "Forget the changes?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:981
+#: ../../Xconfigurator.pm_.c:982
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:998
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1000
+#: ../../Xconfigurator.pm_.c:1001
msgid "X at startup"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1002
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -438,7 +438,7 @@ msgstr ""
msgid "compact"
msgstr ""
-#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:776
+#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:787
msgid "Delay before booting default image"
msgstr ""
@@ -446,26 +446,26 @@ msgstr ""
msgid "Video mode"
msgstr ""
-#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:508
-#: ../../install_steps_interactive.pm_.c:620
-#: ../../install_steps_interactive.pm_.c:672
-#: ../../install_steps_interactive.pm_.c:778 ../../printerdrake.pm_.c:84
+#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:631
+#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:789 ../../printerdrake.pm_.c:84
#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr ""
-#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:621
-#: ../../install_steps_interactive.pm_.c:673
-#: ../../install_steps_interactive.pm_.c:779
+#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:790
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr ""
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:780
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:791
msgid "Restrict command line options"
msgstr ""
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:780
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:791
msgid "restrict"
msgstr ""
@@ -473,21 +473,21 @@ msgstr ""
msgid "LILO main options"
msgstr ""
-#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:787
+#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:798
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:788
+#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:641
+#: ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:799
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr ""
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:788
+#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:641
+#: ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:799
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr ""
@@ -498,14 +498,14 @@ msgid ""
"You can add some more or change the existing ones."
msgstr ""
-#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:799
-#: ../../printerdrake.pm_.c:239 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:810
+#: ../../printerdrake.pm_.c:242 ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr ""
#: ../../any.pm_.c:109 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:666
-#: ../../install_steps_interactive.pm_.c:799 ../../printerdrake.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:677
+#: ../../install_steps_interactive.pm_.c:810 ../../printerdrake.pm_.c:242
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr ""
@@ -522,24 +522,24 @@ msgstr ""
msgid "Which type of entry do you want to add?"
msgstr ""
-#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:824
+#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:835
msgid "Image"
msgstr ""
#: ../../any.pm_.c:138 ../../any.pm_.c:146
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:837
msgid "Root"
msgstr ""
-#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:827
+#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:838
msgid "Append"
msgstr ""
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:828
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:839
msgid "Initrd"
msgstr ""
-#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:829
+#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:840
msgid "Read-write"
msgstr ""
@@ -551,29 +551,29 @@ msgstr ""
msgid "Unsafe"
msgstr ""
-#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:836
+#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:847
msgid "Label"
msgstr ""
-#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:838
+#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:849
msgid "Default"
msgstr ""
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:618
-#: ../../install_steps_interactive.pm_.c:841 ../../interactive.pm_.c:74
+#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:654
+#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:852 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:99
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:198
-#: ../../my_gtk.pm_.c:457 ../../my_gtk.pm_.c:632 ../../printerdrake.pm_.c:266
+#: ../../my_gtk.pm_.c:457 ../../my_gtk.pm_.c:632 ../../printerdrake.pm_.c:269
msgid "Ok"
msgstr ""
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:841
+#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:852
msgid "Remove entry"
msgstr ""
-#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:844
+#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:855
msgid "Empty label not allowed"
msgstr ""
@@ -966,7 +966,7 @@ msgstr ""
msgid "Formatting loopback file %s"
msgstr ""
-#: ../../diskdrake.pm_.c:504 ../../install_steps_interactive.pm_.c:247
+#: ../../diskdrake.pm_.c:504 ../../install_steps_interactive.pm_.c:248
#, c-format
msgid "Formatting partition %s"
msgstr ""
@@ -1034,8 +1034,7 @@ msgstr ""
msgid "Choose the new size"
msgstr ""
-#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:589
msgid "MB"
msgstr ""
@@ -1216,7 +1215,10 @@ msgid ""
"system.\n"
" But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
"DOING!\n"
-"\n"
+msgstr ""
+
+#: ../../help.pm_.c:38
+msgid ""
"The different choices for your machine's usage (provided, hence, that you "
"have\n"
"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
@@ -1242,7 +1244,7 @@ msgid ""
" such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
msgstr ""
-#: ../../help.pm_.c:57
+#: ../../help.pm_.c:59
msgid ""
"DrakX will attempt at first to look for one or more PCI\n"
"SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n"
@@ -1268,7 +1270,7 @@ msgid ""
"are the options you will need to provide to the driver."
msgstr ""
-#: ../../help.pm_.c:81
+#: ../../help.pm_.c:83
msgid ""
"At this point, you may choose what partition(s) to use to install\n"
"your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1308,7 +1310,7 @@ msgid ""
"- Ctrl-m to set the mount point\n"
msgstr ""
-#: ../../help.pm_.c:118
+#: ../../help.pm_.c:120
msgid ""
"Any partitions that have been newly defined must be formatted for\n"
"use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1318,7 +1320,7 @@ msgid ""
"Typically retained are /home and /usr/local."
msgstr ""
-#: ../../help.pm_.c:126
+#: ../../help.pm_.c:128
msgid ""
"You may now select the group of packages you wish to\n"
"install or upgrade.\n"
@@ -1334,14 +1336,14 @@ msgid ""
"through more than 1000 packages..."
msgstr ""
-#: ../../help.pm_.c:137
+#: ../../help.pm_.c:139
msgid ""
"If you have all the CDs in the list above, 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 ""
-#: ../../help.pm_.c:142
+#: ../../help.pm_.c:144
msgid ""
"The packages selected are now being installed. This operation\n"
"should take a few minutes unless you have chosen to upgrade an\n"
@@ -1349,7 +1351,7 @@ msgid ""
"upgrade starts."
msgstr ""
-#: ../../help.pm_.c:148
+#: ../../help.pm_.c:150
msgid ""
"If DrakX failed to find your mouse, or if you want to\n"
"check what it has done, you will be presented the list of mice\n"
@@ -1366,13 +1368,13 @@ msgid ""
"which serial port it is connected to."
msgstr ""
-#: ../../help.pm_.c:163
+#: ../../help.pm_.c:165
msgid ""
"Please select the correct port. For example, the COM1 port under MS Windows\n"
"is named ttyS0 under Linux."
msgstr ""
-#: ../../help.pm_.c:167
+#: ../../help.pm_.c:169
msgid ""
"This section is dedicated to configuring a local area\n"
"network (LAN) or a modem.\n"
@@ -1404,7 +1406,7 @@ msgid ""
"your modem is connected to."
msgstr ""
-#: ../../help.pm_.c:197
+#: ../../help.pm_.c:199
msgid ""
"Enter:\n"
"\n"
@@ -1421,19 +1423,19 @@ msgid ""
"not sure, ask your network administrator or ISP.\n"
msgstr ""
-#: ../../help.pm_.c:212
+#: ../../help.pm_.c:214
msgid ""
"You may now enter dialup options. If you're not sure what to enter, the\n"
"correct information can be obtained from your ISP."
msgstr ""
-#: ../../help.pm_.c:216
+#: ../../help.pm_.c:218
msgid ""
"If you will use proxies, please configure them now. If you don't know if\n"
"you should use proxies, ask your network administrator or your ISP."
msgstr ""
-#: ../../help.pm_.c:220
+#: ../../help.pm_.c:222
msgid ""
"You can install cryptographic package if your internet connection has been\n"
"set up correctly. First choose a mirror where you wish to download packages "
@@ -1444,7 +1446,7 @@ msgid ""
"to your legislation."
msgstr ""
-#: ../../help.pm_.c:228
+#: ../../help.pm_.c:230
msgid ""
"You can now select your timezone according to where you live.\n"
"\n"
@@ -1453,7 +1455,7 @@ msgid ""
"in local time according to the time zone you have selected."
msgstr ""
-#: ../../help.pm_.c:235
+#: ../../help.pm_.c:237
msgid ""
"You may now choose which services you want to see started at boot time.\n"
"When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1464,7 +1466,7 @@ msgid ""
"want."
msgstr ""
-#: ../../help.pm_.c:244
+#: ../../help.pm_.c:246
msgid ""
"Linux can deal with many types of printer. Each of these\n"
"types require a different setup. Note however that the print\n"
@@ -1495,7 +1497,7 @@ msgid ""
"for a NetWare printer, except that you need no workgroup information."
msgstr ""
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:275
msgid ""
"You can now enter the root password for your Linux-Mandrake\n"
"system. The password must be entered twice to verify that both\n"
@@ -1513,19 +1515,19 @@ msgid ""
"effort."
msgstr ""
-#: ../../help.pm_.c:289
+#: ../../help.pm_.c:291
msgid ""
"To enable a more secure system, you should select \"Use shadow file\" and\n"
"\"Use MD5 passwords\"."
msgstr ""
-#: ../../help.pm_.c:293
+#: ../../help.pm_.c:295
msgid ""
"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
"network administrator."
msgstr ""
-#: ../../help.pm_.c:297
+#: ../../help.pm_.c:299
msgid ""
"You may now create one or more \"regular\" user account(s), as\n"
"opposed to the \"privileged\" user account, root. You can create\n"
@@ -1549,7 +1551,7 @@ msgid ""
"and maintenance purposes."
msgstr ""
-#: ../../help.pm_.c:316
+#: ../../help.pm_.c:318
msgid ""
"It is strongly recommended that you answer \"Yes\" here. If you install\n"
"Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1557,7 +1559,7 @@ msgid ""
"boot into Linux any more."
msgstr ""
-#: ../../help.pm_.c:322
+#: ../../help.pm_.c:324
msgid ""
"You need to indicate where you wish\n"
"to place the information required to boot to Linux.\n"
@@ -1567,13 +1569,13 @@ msgid ""
"drive (MBR)\"."
msgstr ""
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:332
msgid ""
"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
msgstr ""
-#: ../../help.pm_.c:334
+#: ../../help.pm_.c:336
msgid ""
"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
"either Linux or any other operating system present on your computer.\n"
@@ -1587,7 +1589,7 @@ msgid ""
"in this case, you will need a boot disk in order to boot them!"
msgstr ""
-#: ../../help.pm_.c:346
+#: ../../help.pm_.c:348
msgid ""
"LILO and grub main options are:\n"
" - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1608,7 +1610,7 @@ msgid ""
" * <number>: use the corresponding text mode."
msgstr ""
-#: ../../help.pm_.c:365
+#: ../../help.pm_.c:367
msgid ""
"Now it's time to configure the X Window System, which is the\n"
"core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1623,19 +1625,19 @@ msgid ""
"change them, as many times as necessary."
msgstr ""
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:380
msgid ""
"If something is wrong in X configuration, use these options to correctly\n"
"configure the X Window System."
msgstr ""
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:384
msgid ""
"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
"\"No\"."
msgstr ""
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:388
msgid ""
"You can now select some miscellaneous options for your system.\n"
"\n"
@@ -1673,7 +1675,7 @@ msgid ""
" select this option (Note: NumLock may or may not work under X)."
msgstr ""
-#: ../../help.pm_.c:415
+#: ../../help.pm_.c:417
msgid ""
"Your system is going to reboot.\n"
"\n"
@@ -1702,7 +1704,7 @@ msgstr ""
msgid "Choose your keyboard"
msgstr ""
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:312
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:313
msgid "Miscellaneous"
msgstr ""
@@ -1742,8 +1744,8 @@ msgstr ""
msgid "Configure printer"
msgstr ""
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:618
-#: ../../install_steps_interactive.pm_.c:619
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:630
msgid "Set root password"
msgstr ""
@@ -1831,7 +1833,7 @@ msgstr ""
msgid "Welcome to %s"
msgstr ""
-#: ../../install_steps.pm_.c:650
+#: ../../install_steps.pm_.c:715
msgid "No floppy drive available"
msgstr ""
@@ -1841,91 +1843,6 @@ msgstr ""
msgid "Entering step `%s'\n"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:247
-msgid "You must have a swap partition"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:249
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:443
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:444
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:357
-msgid "Choose the packages you want to install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:360
-msgid "Info"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:365
-#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:514
-#: ../../install_steps_interactive.pm_.c:360
-msgid "Installing"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:520
-msgid "Please wait, "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:522
-msgid "Time remaining "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:523
-msgid "Total time "
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:532
-#: ../../install_steps_interactive.pm_.c:360
-msgid "Preparing installation"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:547
-#, c-format
-msgid "Installing package %s"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:585
-#: ../../install_steps_gtk.pm_.c:589
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:585
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:964
-msgid "Use existing configuration for X11?"
-msgstr ""
-
#: ../../install_steps_gtk.pm_.c:154
msgid "Please, choose one of the following classes of installation:"
msgstr ""
@@ -1954,6 +1871,17 @@ msgstr ""
msgid "Automatic resizing failed"
msgstr ""
+#: ../../install_steps_gtk.pm_.c:247
+msgid "You must have a swap partition"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:249
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+
#: ../../install_steps_gtk.pm_.c:259
msgid "Which partition do you want to use to put Linux4Win?"
msgstr ""
@@ -2003,73 +1931,126 @@ msgstr ""
msgid "Percentage of packages to install"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:369
+#: ../../install_steps_gtk.pm_.c:358
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:361
+msgid "Info"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:366 ../../install_steps_interactive.pm_.c:124
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:370
msgid "Automatic dependencies"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:422 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:424
+#: ../../install_steps_gtk.pm_.c:425
msgid "Toggle between flat and group sorted"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:442
+#: ../../install_steps_gtk.pm_.c:443
msgid "Bad package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:445
+#: ../../install_steps_gtk.pm_.c:444
+#, c-format
+msgid "Name: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:445 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:446 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:447
#, c-format
msgid "Importance: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:456
+#: ../../install_steps_gtk.pm_.c:458
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:469
msgid "This is a mandatory package, it can't be unselected"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:469
+#: ../../install_steps_gtk.pm_.c:471
msgid "You can't unselect this package. It is already installed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:475
msgid "The following packages are going to be installed/removed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:484
msgid "You can't select/unselect this package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:517
+#: ../../install_steps_gtk.pm_.c:516 ../../install_steps_interactive.pm_.c:361
+msgid "Installing"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:519
msgid "Estimating"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:529 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:50
-#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../install_steps_gtk.pm_.c:522
+msgid "Please wait, "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:524
+msgid "Time remaining "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:525
+msgid "Total time "
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:531 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
+#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
#: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:457
msgid "Cancel"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:534 ../../install_steps_interactive.pm_.c:361
+msgid "Preparing installation"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:544
#, c-format
msgid "%d packages"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:544
msgid ", %U MB"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:573
+#: ../../install_steps_gtk.pm_.c:549
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:575
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2079,7 +2060,15 @@ msgid ""
"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:589
+#: ../../install_steps_gtk.pm_.c:587 ../../install_steps_gtk.pm_.c:591
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:587
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:591
msgid "There was an error installing packages:"
msgstr ""
@@ -2113,7 +2102,7 @@ msgid "What is the root partition (/) of your system?"
msgstr ""
#: ../../install_steps_interactive.pm_.c:99
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:135
msgid "Install Class"
msgstr ""
@@ -2134,6 +2123,7 @@ msgid "Recommended"
msgstr ""
#: ../../install_steps_interactive.pm_.c:109
+#: ../../install_steps_interactive.pm_.c:119
msgid "Customized"
msgstr ""
@@ -2145,19 +2135,17 @@ msgstr ""
#: ../../install_steps_interactive.pm_.c:117
msgid ""
"Are you sure you are an expert? \n"
-"Hey no kidding, you will be allowed to make powerfull but dangerous things "
-"here."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:119
-#: ../../install_steps_interactive.pm_.c:130
-msgid "Normal"
+"You will be allowed to make powerfull but dangerous things here."
msgstr ""
#: ../../install_steps_interactive.pm_.c:124
msgid "Upgrade"
msgstr ""
+#: ../../install_steps_interactive.pm_.c:130
+msgid "Normal"
+msgstr ""
+
#: ../../install_steps_interactive.pm_.c:131
msgid "Development"
msgstr ""
@@ -2166,186 +2154,186 @@ msgstr ""
msgid "Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:135
+#: ../../install_steps_interactive.pm_.c:136
msgid "Which usage is your system used for ?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:146
+#: ../../install_steps_interactive.pm_.c:147
msgid "Please, choose the type of your mouse."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:154 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:155 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:155
+#: ../../install_steps_interactive.pm_.c:156
msgid "Please choose on which serial port your mouse is connected to."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:166
+#: ../../install_steps_interactive.pm_.c:167
msgid "Configuring IDE"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:166
+#: ../../install_steps_interactive.pm_.c:167
msgid "IDE"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:176
+#: ../../install_steps_interactive.pm_.c:177
msgid "no available partitions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:179
#, c-format
msgid "(%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:185
+#: ../../install_steps_interactive.pm_.c:186
msgid "Please choose a partition to use as your root partition."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:192
+#: ../../install_steps_interactive.pm_.c:193
msgid "Choose the mount points"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:204
+#: ../../install_steps_interactive.pm_.c:205
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:230
+#: ../../install_steps_interactive.pm_.c:231
msgid "Choose the partitions you want to format"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:234
+#: ../../install_steps_interactive.pm_.c:235
msgid "Check bad blocks?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:242
+#: ../../install_steps_interactive.pm_.c:243
msgid "Formatting partitions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:246
+#: ../../install_steps_interactive.pm_.c:247
#, c-format
-msgid "Creating and formatting loopback file %s"
+msgid "Creating and formatting file %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:249
+#: ../../install_steps_interactive.pm_.c:250
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:256
msgid "Looking for available packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:262
msgid "Finding packages to upgrade"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:311
+#: ../../install_steps_interactive.pm_.c:312
msgid "Package Group Selection"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:315
msgid "Individual package selection"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:345
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:347
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr ""
-#: ../../install_steps_interactive.pm_.c:369
+#: ../../install_steps_interactive.pm_.c:370
msgid ""
"Installing package %s\n"
"%d%%"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:378
+#: ../../install_steps_interactive.pm_.c:379
msgid "Post-install configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:389
msgid "Keep the current IP configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:390
msgid "Reconfigure network now"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:391
msgid "Do not set up networking"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:393
-#: ../../install_steps_interactive.pm_.c:398
+#: ../../install_steps_interactive.pm_.c:394
+#: ../../install_steps_interactive.pm_.c:399
msgid "Network Configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:394
+#: ../../install_steps_interactive.pm_.c:395
msgid "Local networking has already been configured. Do you want to:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:399
+#: ../../install_steps_interactive.pm_.c:400
msgid "Do you want to configure a local network for your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:406
msgid "no network card found"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:429
msgid "Modem Configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:430
msgid ""
"Do you want to configure a dialup connection with modem for your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:441
#: ../../install_steps_interactive.pm_.c:442
+#: ../../install_steps_interactive.pm_.c:443
#, c-format
msgid "Configuring network device %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:444
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:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "Automatic IP"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "IP address:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "Netmask:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:448
msgid "(bootp/dhcp)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:453 ../../printerdrake.pm_.c:88
+#: ../../install_steps_interactive.pm_.c:454 ../../printerdrake.pm_.c:88
msgid "IP address should be in format 1.2.3.4"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:471
+#: ../../install_steps_interactive.pm_.c:472
msgid "Configuring network"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:473
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2353,79 +2341,79 @@ msgid ""
"You may also enter the IP address of the gateway if you have one"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "DNS server:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Gateway device:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Gateway:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Host name:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:490
msgid "Try to find a modem?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:499
+#: ../../install_steps_interactive.pm_.c:500
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:504
+#: ../../install_steps_interactive.pm_.c:506
msgid "Dialup options"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:505
+#: ../../install_steps_interactive.pm_.c:507
msgid "Connection name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:508
msgid "Phone number"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:509
msgid "Login ID"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Authentication"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "CHAP"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "PAP"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Script-based"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Terminal-based"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:512
msgid "Domain name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:512
+#: ../../install_steps_interactive.pm_.c:514
msgid "First DNS Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:513
+#: ../../install_steps_interactive.pm_.c:515
msgid "Second DNS Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:528
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -2464,88 +2452,88 @@ msgid ""
"USA"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:557
+#: ../../install_steps_interactive.pm_.c:559
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:564
+#: ../../install_steps_interactive.pm_.c:567
msgid "Contacting the mirror to get the list of available packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:568
+#: ../../install_steps_interactive.pm_.c:571
msgid "Please choose the packages you want to install."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:579
+#: ../../install_steps_interactive.pm_.c:585
msgid "Which is your timezone?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:586
msgid "Is your hardware clock set to GMT?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:618
+#: ../../install_steps_interactive.pm_.c:629
msgid "No password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:623
+#: ../../install_steps_interactive.pm_.c:634
msgid "Use shadow file"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:623
+#: ../../install_steps_interactive.pm_.c:634
msgid "shadow"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:635
msgid "MD5"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:635
msgid "Use MD5 passwords"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:626
+#: ../../install_steps_interactive.pm_.c:637
msgid "Use NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:626
+#: ../../install_steps_interactive.pm_.c:637
msgid "yellow pages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:643
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:639
+#: ../../install_steps_interactive.pm_.c:650
msgid "Authentification NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:640
+#: ../../install_steps_interactive.pm_.c:651
msgid "NIS Domain"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:640
+#: ../../install_steps_interactive.pm_.c:651
msgid "NIS Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:677
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:677
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:678
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:678
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -2553,60 +2541,60 @@ msgid ""
"%s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:680
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:670 ../../printerdrake.pm_.c:83
+#: ../../install_steps_interactive.pm_.c:681 ../../printerdrake.pm_.c:83
#: ../../printerdrake.pm_.c:108 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:686
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:677
-#: ../../standalone/adduserdrake_.c:47
+#: ../../install_steps_interactive.pm_.c:688
+#: ../../standalone/adduserdrake_.c:47 ../../t.pm_.c:41
msgid "Icon"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:687
+#: ../../install_steps_interactive.pm_.c:698
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:699
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:689
+#: ../../install_steps_interactive.pm_.c:700
#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:701
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:714
+#: ../../install_steps_interactive.pm_.c:725
msgid "First floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:715
+#: ../../install_steps_interactive.pm_.c:726
msgid "Second floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:716
+#: ../../install_steps_interactive.pm_.c:727
msgid "Skip"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:733
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 "
@@ -2620,178 +2608,190 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:742
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:745
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../install_steps_interactive.pm_.c:750
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../install_steps_interactive.pm_.c:751
msgid "Creating bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:752 ../../standalone/drakboot_.c:48
+#: ../../install_steps_interactive.pm_.c:763 ../../standalone/drakboot_.c:49
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:784
msgid "Do you want to use SILO?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:784
+#: ../../install_steps_interactive.pm_.c:795
msgid "SILO main options"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:808
msgid ""
"Here are the following entries in SILO.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:825
+#: ../../install_steps_interactive.pm_.c:836
msgid "Partition"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:845
+#: ../../install_steps_interactive.pm_.c:856
msgid "This label is already in use"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:858
+#: ../../install_steps_interactive.pm_.c:869
msgid "Installation of SILO failed. The following error occured:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:879
msgid "Preparing bootloader"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:887
msgid "Do you want to use aboot?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:890
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:907
msgid "Proxies configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:897
+#: ../../install_steps_interactive.pm_.c:908
msgid "HTTP proxy"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:898
+#: ../../install_steps_interactive.pm_.c:909
msgid "FTP proxy"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:915
msgid "Proxy should be http://..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:916
msgid "Proxy should be ftp://..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:915 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:926 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:916 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:927 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:917 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:928 ../../standalone/draksec_.c:22
msgid "Low"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:918 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:929 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:919 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:930 ../../standalone/draksec_.c:24
msgid "High"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:920 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:931 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:933
+#: ../../install_steps_interactive.pm_.c:944
msgid "Miscellaneous questions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:945
msgid "(may cause data corruption)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:945
msgid "Use hard drive optimisations?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:935 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:946 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:947
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:937
+#: ../../install_steps_interactive.pm_.c:948
msgid "Removable media automounting"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:950
msgid "Clean /tmp at each boot"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:942
+#: ../../install_steps_interactive.pm_.c:953
msgid "Enable multi profiles"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:955
msgid "Enable num lock at startup"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:958
msgid "Give the ram size in MB"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:960
msgid "Can't use supermount in high security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:976
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Use existing configuration for X11?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:980
+msgid ""
+"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
+"By default, the 3.3 server is used because it works on more graphic cards.\n"
+"\n"
+"Do you want to try XFree 4.0?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:993
+#: ../../install_steps_interactive.pm_.c:1144
msgid "Try to find PCI devices?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:1014
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1005
+#: ../../install_steps_interactive.pm_.c:1022
msgid "Creating auto install floppy"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:1045
msgid ""
"Some steps are not completed.\n"
"\n"
"Do you really want to quit now?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1035
+#: ../../install_steps_interactive.pm_.c:1052
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2804,26 +2804,26 @@ msgid ""
"install chapter of the Official Linux-Mandrake User's Guide."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1044
+#: ../../install_steps_interactive.pm_.c:1061
msgid "Shutting down"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1056
+#: ../../install_steps_interactive.pm_.c:1073
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1057
+#: ../../install_steps_interactive.pm_.c:1074
#, c-format
msgid "(module %s)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1084
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1092
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2835,20 +2835,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Autoprobe"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Specify options"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1101
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1107
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2856,61 +2856,65 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1110
msgid "Module options:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1103
+#: ../../install_steps_interactive.pm_.c:1120
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1116
+#: ../../install_steps_interactive.pm_.c:1133
msgid "Try to find PCMCIA cards?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1134
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1134
msgid "PCMCIA"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1139
+#: ../../install_steps_interactive.pm_.c:1156
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1140
+#: ../../install_steps_interactive.pm_.c:1157
msgid "Do you have another one?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1141
+#: ../../install_steps_interactive.pm_.c:1158
#, c-format
msgid "Do you have any %s interfaces?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1143 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
#: ../../my_gtk.pm_.c:456 ../../printerdrake.pm_.c:123
msgid "No"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1143 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
#: ../../my_gtk.pm_.c:456
msgid "Yes"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm_.c:1161
msgid "See hardware info"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../install_steps_interactive.pm_.c:1178
msgid "Bringing up the network"
msgstr ""
+#: ../../install_steps_interactive.pm_.c:1183
+msgid "Bringing down the network"
+msgstr ""
+
#: ../../install_steps_newt.pm_.c:21
#, c-format
msgid "Linux-Mandrake Installation %s"
@@ -3169,34 +3173,34 @@ msgid ""
"\n"
msgstr ""
-#: ../../lilo.pm_.c:430
+#: ../../lilo.pm_.c:428
msgid "Welcome to GRUB the operating system chooser!"
msgstr ""
-#: ../../lilo.pm_.c:431
+#: ../../lilo.pm_.c:429
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr ""
-#: ../../lilo.pm_.c:432
+#: ../../lilo.pm_.c:430
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr ""
-#: ../../lilo.pm_.c:433
+#: ../../lilo.pm_.c:431
msgid "commands before booting, or 'c' for a command-line."
msgstr ""
-#: ../../lilo.pm_.c:434
+#: ../../lilo.pm_.c:432
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr ""
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:513
+#: ../../lilo.pm_.c:511
msgid "Desktop"
msgstr ""
-#: ../../lilo.pm_.c:513
+#: ../../lilo.pm_.c:511
msgid "Start Menu"
msgstr ""
@@ -3356,28 +3360,28 @@ msgstr ""
msgid "Is this correct?"
msgstr ""
-#: ../../partition_table.pm_.c:532
+#: ../../partition_table.pm_.c:536
msgid ""
"You have a hole in your partition table but I can't use it.\n"
"The only solution is to move your primary partitions to have the hole next "
"to the extended partitions"
msgstr ""
-#: ../../partition_table.pm_.c:620
+#: ../../partition_table.pm_.c:624
#, c-format
msgid "Error reading file %s"
msgstr ""
-#: ../../partition_table.pm_.c:627
+#: ../../partition_table.pm_.c:631
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr ""
-#: ../../partition_table.pm_.c:629
+#: ../../partition_table.pm_.c:633
msgid "Bad backup file"
msgstr ""
-#: ../../partition_table.pm_.c:650
+#: ../../partition_table.pm_.c:654
#, c-format
msgid "Error writing to file %s"
msgstr ""
@@ -3569,67 +3573,67 @@ msgstr ""
msgid "What type of printer do you have?"
msgstr ""
-#: ../../printerdrake.pm_.c:158
+#: ../../printerdrake.pm_.c:161
msgid "Printer options"
msgstr ""
-#: ../../printerdrake.pm_.c:159
+#: ../../printerdrake.pm_.c:162
msgid "Paper Size"
msgstr ""
-#: ../../printerdrake.pm_.c:160
+#: ../../printerdrake.pm_.c:163
msgid "Eject page after job?"
msgstr ""
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:168
msgid "Uniprint driver options"
msgstr ""
-#: ../../printerdrake.pm_.c:166
+#: ../../printerdrake.pm_.c:169
msgid "Color depth options"
msgstr ""
-#: ../../printerdrake.pm_.c:168
+#: ../../printerdrake.pm_.c:171
msgid "Print text as PostScript?"
msgstr ""
-#: ../../printerdrake.pm_.c:169
+#: ../../printerdrake.pm_.c:172
msgid "Reverse page order"
msgstr ""
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:174
msgid "Fix stair-stepping text?"
msgstr ""
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:177
msgid "Number of pages per output pages"
msgstr ""
-#: ../../printerdrake.pm_.c:175
+#: ../../printerdrake.pm_.c:178
msgid "Right/Left margins in points (1/72 of inch)"
msgstr ""
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:179
msgid "Top/Bottom margins in points (1/72 of inch)"
msgstr ""
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:182
msgid "Extra GhostScript options"
msgstr ""
-#: ../../printerdrake.pm_.c:182
+#: ../../printerdrake.pm_.c:185
msgid "Extra Text options"
msgstr ""
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:196
msgid "Do you want to test printing?"
msgstr ""
-#: ../../printerdrake.pm_.c:205
+#: ../../printerdrake.pm_.c:208
msgid "Printing test page(s)..."
msgstr ""
-#: ../../printerdrake.pm_.c:212
+#: ../../printerdrake.pm_.c:215
#, c-format
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
@@ -3640,40 +3644,40 @@ msgid ""
"Does it work properly?"
msgstr ""
-#: ../../printerdrake.pm_.c:216
+#: ../../printerdrake.pm_.c:219
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
"Does it work properly?"
msgstr ""
-#: ../../printerdrake.pm_.c:232
+#: ../../printerdrake.pm_.c:235
msgid "Printer"
msgstr ""
-#: ../../printerdrake.pm_.c:233
+#: ../../printerdrake.pm_.c:236
msgid "Would you like to configure a printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:240
msgid ""
"Here are the following print queue.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../../printerdrake.pm_.c:260 ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:263 ../../printerdrake.pm_.c:269
msgid "Select Printer Connection"
msgstr ""
-#: ../../printerdrake.pm_.c:261
+#: ../../printerdrake.pm_.c:264
msgid "How is the printer connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:269
msgid "Remove queue"
msgstr ""
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:270
msgid ""
"Every print queue (which print jobs are directed to) needs a\n"
"name (often lp) and a spool directory associated with it. What\n"
@@ -3681,15 +3685,15 @@ msgid ""
"connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:273
msgid "Name of queue"
msgstr ""
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:274
msgid "Spool directory"
msgstr ""
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:275
msgid "Printer Connection"
msgstr ""
@@ -3902,7 +3906,7 @@ msgstr ""
msgid "Format floppy"
msgstr ""
-#: ../../standalone/drakboot_.c:29
+#: ../../standalone/drakboot_.c:30
msgid "Choice"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 14a28672e..f550fa839 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-04-22 16:38+0200\n"
+"POT-Creation-Date: 2000-04-27 12:04+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -73,11 +73,11 @@ msgstr ""
"skjermen din.\n"
"Hvis du er usikker, velg en konservativ innstilling."
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
msgid "Horizontal refresh rate"
msgstr "Horisontal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
msgid "Vertical refresh rate"
msgstr "Vertikal oppfrisknings-rate"
@@ -144,7 +144,7 @@ msgstr ""
"Skjermen din vil blinke...\n"
"Du kan sl� av hvis du vil, du vil h�re et bipp n�r det er ferdig"
-#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:162
+#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:165
msgid "Resolution"
msgstr "Oppl�sning"
@@ -188,109 +188,109 @@ msgstr ""
"Ingen gyldige modus funnet\n"
"Pr�v med et annet skjermkort eller monitor"
-#: ../../Xconfigurator.pm_.c:905
+#: ../../Xconfigurator.pm_.c:906
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../../Xconfigurator.pm_.c:906
+#: ../../Xconfigurator.pm_.c:907
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../../Xconfigurator.pm_.c:907
+#: ../../Xconfigurator.pm_.c:908
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../../Xconfigurator.pm_.c:908
+#: ../../Xconfigurator.pm_.c:909
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../../Xconfigurator.pm_.c:909
+#: ../../Xconfigurator.pm_.c:910
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../../Xconfigurator.pm_.c:910
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:913
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:914
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:929
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../../Xconfigurator.pm_.c:942
+#: ../../Xconfigurator.pm_.c:943
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:944
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:945
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:945
+#: ../../Xconfigurator.pm_.c:946
msgid "Change Resolution"
msgstr "Endre oppl�sning"
-#: ../../Xconfigurator.pm_.c:946
+#: ../../Xconfigurator.pm_.c:947
msgid "Automatical resolutions search"
msgstr "Automatisk oppl�sningss�k"
-#: ../../Xconfigurator.pm_.c:950
+#: ../../Xconfigurator.pm_.c:951
msgid "Show information"
msgstr "Vis informasjon"
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:952
msgid "Test again"
msgstr "Test igjen"
-#: ../../Xconfigurator.pm_.c:952 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:953 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:956 ../../standalone/drakboot_.c:29
+#: ../../Xconfigurator.pm_.c:957 ../../standalone/drakboot_.c:30
msgid "What do you want to do?"
msgstr "Hva �nsker du � gj�re?"
-#: ../../Xconfigurator.pm_.c:963
+#: ../../Xconfigurator.pm_.c:964
msgid "Forget the changes?"
msgstr "Glem endringene?"
-#: ../../Xconfigurator.pm_.c:981
+#: ../../Xconfigurator.pm_.c:982
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Vennligst logg inn i %s p� nytt for � aktivere endringene"
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:998
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk s� Ctrl-Alt-BackSpace"
-#: ../../Xconfigurator.pm_.c:1000
+#: ../../Xconfigurator.pm_.c:1001
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1002
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -459,7 +459,7 @@ msgstr "Kompakt"
msgid "compact"
msgstr "kompakt"
-#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:776
+#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:787
msgid "Delay before booting default image"
msgstr "Forsinkelse f�r oppstart av standard bilde"
@@ -467,26 +467,26 @@ msgstr "Forsinkelse f�r oppstart av standard bilde"
msgid "Video mode"
msgstr "Skjermmodus"
-#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:508
-#: ../../install_steps_interactive.pm_.c:620
-#: ../../install_steps_interactive.pm_.c:672
-#: ../../install_steps_interactive.pm_.c:778 ../../printerdrake.pm_.c:84
+#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:631
+#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:789 ../../printerdrake.pm_.c:84
#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "Passord"
-#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:621
-#: ../../install_steps_interactive.pm_.c:673
-#: ../../install_steps_interactive.pm_.c:779
+#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:790
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "Passord (igjen)"
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:780
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:791
msgid "Restrict command line options"
msgstr "Begrense kommandolinje-opsjoner"
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:780
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:791
msgid "restrict"
msgstr "begrense"
@@ -494,22 +494,22 @@ msgstr "begrense"
msgid "LILO main options"
msgstr "LILO hovedopsjoner"
-#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:787
+#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:798
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:788
+#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:641
+#: ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:799
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "Vennligst pr�v igjen"
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:788
+#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:641
+#: ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:799
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
@@ -522,14 +522,14 @@ msgstr ""
"Her er f�lgende oppf�ringer i LILO.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:799
-#: ../../printerdrake.pm_.c:239 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:810
+#: ../../printerdrake.pm_.c:242 ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "Legg til"
#: ../../any.pm_.c:109 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:666
-#: ../../install_steps_interactive.pm_.c:799 ../../printerdrake.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:677
+#: ../../install_steps_interactive.pm_.c:810 ../../printerdrake.pm_.c:242
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Ferdig"
@@ -546,24 +546,24 @@ msgstr "Andre OS (windows...)"
msgid "Which type of entry do you want to add?"
msgstr "Hvilken inngangstype vil du legge til"
-#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:824
+#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:835
msgid "Image"
msgstr "Bilde"
#: ../../any.pm_.c:138 ../../any.pm_.c:146
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:837
msgid "Root"
msgstr "Root"
-#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:827
+#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:838
msgid "Append"
msgstr "Tilf�ye"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:828
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:839
msgid "Initrd"
msgstr "Initrd"
-#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:829
+#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:840
msgid "Read-write"
msgstr "Les-skriv"
@@ -575,29 +575,29 @@ msgstr "Tabell"
msgid "Unsafe"
msgstr "Usikker"
-#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:836
+#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:847
msgid "Label"
msgstr "Etikett"
-#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:838
+#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:849
msgid "Default"
msgstr "Standard"
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:618
-#: ../../install_steps_interactive.pm_.c:841 ../../interactive.pm_.c:74
+#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:654
+#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:852 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:99
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:198
-#: ../../my_gtk.pm_.c:457 ../../my_gtk.pm_.c:632 ../../printerdrake.pm_.c:266
+#: ../../my_gtk.pm_.c:457 ../../my_gtk.pm_.c:632 ../../printerdrake.pm_.c:269
msgid "Ok"
msgstr "Ok"
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:841
+#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:852
msgid "Remove entry"
msgstr "Fjern inngang"
-#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:844
+#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:855
msgid "Empty label not allowed"
msgstr "Tom etikett er ikke tillatt"
@@ -1018,7 +1018,7 @@ msgstr "Formatering"
msgid "Formatting loopback file %s"
msgstr "Formaterer loopback-fil %s"
-#: ../../diskdrake.pm_.c:504 ../../install_steps_interactive.pm_.c:247
+#: ../../diskdrake.pm_.c:504 ../../install_steps_interactive.pm_.c:248
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
@@ -1088,8 +1088,7 @@ msgstr ""
msgid "Choose the new size"
msgstr "Velg den nye st�rrelsen"
-#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:589
msgid "MB"
msgstr "MB"
@@ -1284,7 +1283,29 @@ msgid ""
"system.\n"
" But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
"DOING!\n"
+msgstr ""
+"Velg:\n"
+"\n"
+" - Anbefalt: Hvis du ikke aldri har installert Linux f�r.\n"
+"\n"
"\n"
+" - Egendefinert: Hvis du er kjent med Linux vil du for systemet som skal \n"
+"installeres kunne velge mellom normal, utvikling eller tjener. Velg\n"
+"\"Normal\" for installasjon til generelt bruk. Du kan velge \"Utvikling\"\n"
+"hvis du skal bruke maskinen prim�rt til utvikling av programvare, eller "
+"velge\n"
+"\"Tjener\" hvis du �nsker � installere en tjener for generelt bruk (for "
+"post,\n"
+"utskrift...).\n"
+"\n"
+"\n"
+" - Ekspert: Hvis du allerede kjenner GNU/Linux godt og �nsker � gj�re en\n"
+"egendefinert installasjon s� er dette installasjonsvalget for deg. Du vil\n"
+"kunne velge bruk av systemet som skal installeres som med \"Egendefinert\"."
+
+#: ../../help.pm_.c:38
+#, fuzzy
+msgid ""
"The different choices for your machine's usage (provided, hence, that you "
"have\n"
"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
@@ -1346,7 +1367,7 @@ msgstr ""
" utskrift), en autentifikasjonstjener (NIS), en databasetjener osv. Som\n"
" s�, ikke forvent at noe spesielt (KDE, GNOME...) vil bli installert.\n"
-#: ../../help.pm_.c:57
+#: ../../help.pm_.c:59
msgid ""
"DrakX will attempt at first to look for one or more PCI\n"
"SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n"
@@ -1394,7 +1415,7 @@ msgstr ""
"som foresl�tt i installasjonsguiden. Dette er opsjonene du vil trenge �\n"
"gi til driveren."
-#: ../../help.pm_.c:81
+#: ../../help.pm_.c:83
msgid ""
"At this point, you may choose what partition(s) to use to install\n"
"your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1471,7 +1492,7 @@ msgstr ""
"\n"
"- Ctrl-m for � sette monteringspunktet\n"
-#: ../../help.pm_.c:118
+#: ../../help.pm_.c:120
msgid ""
"Any partitions that have been newly defined must be formatted for\n"
"use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1487,7 +1508,7 @@ msgstr ""
"eksisterende partisjoner, is�r hvis de inneholder filer eller data som du\n"
"�nsker � beholde. Typiske � beholde er: /home og /usr/local."
-#: ../../help.pm_.c:126
+#: ../../help.pm_.c:128
msgid ""
"You may now select the group of packages you wish to\n"
"install or upgrade.\n"
@@ -1514,7 +1535,7 @@ msgstr ""
"\"Individuelt pakkevalg\"; i s� tilfelle m� du lete gjennom mer enn 1000\n"
"pakker..."
-#: ../../help.pm_.c:137
+#: ../../help.pm_.c:139
msgid ""
"If you have all the CDs in the list above, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -1524,7 +1545,7 @@ msgstr ""
"Hvis du ikke har noen av disse CDene, klikk Avbryt.\n"
"Hvis bare noen av CDene mangler, fjern disse, klikk s� Ok."
-#: ../../help.pm_.c:142
+#: ../../help.pm_.c:144
msgid ""
"The packages selected are now being installed. This operation\n"
"should take a few minutes unless you have chosen to upgrade an\n"
@@ -1536,7 +1557,7 @@ msgstr ""
"eksisterende system. I s� tilfelle kan det ta lengre tid ogs� f�r\n"
"oppgraderingen starter."
-#: ../../help.pm_.c:148
+#: ../../help.pm_.c:150
msgid ""
"If DrakX failed to find your mouse, or if you want to\n"
"check what it has done, you will be presented the list of mice\n"
@@ -1565,7 +1586,7 @@ msgstr ""
"Hvis du har en seriell mus, m� du ogs� fortelle DrakX hvilken\n"
"serie-port den er koblet til."
-#: ../../help.pm_.c:163
+#: ../../help.pm_.c:165
msgid ""
"Please select the correct port. For example, the COM1 port under MS Windows\n"
"is named ttyS0 under Linux."
@@ -1573,7 +1594,7 @@ msgstr ""
"Vennligst velg den riktige porten. F.eks., COM1 porten i MS Windows blir\n"
"kalt ttyS0 i Linux."
-#: ../../help.pm_.c:167
+#: ../../help.pm_.c:169
msgid ""
"This section is dedicated to configuring a local area\n"
"network (LAN) or a modem.\n"
@@ -1631,7 +1652,7 @@ msgstr ""
"mislykkes m� du velge den riktige serieporten hvor modemet ditt er\n"
"tilkoblet."
-#: ../../help.pm_.c:197
+#: ../../help.pm_.c:199
msgid ""
"Enter:\n"
"\n"
@@ -1664,7 +1685,7 @@ msgstr ""
"du\n"
"ikke er sikker, sp�r nettverksadministratoren eller ISP'en din.\n"
-#: ../../help.pm_.c:212
+#: ../../help.pm_.c:214
msgid ""
"You may now enter dialup options. If you're not sure what to enter, the\n"
"correct information can be obtained from your ISP."
@@ -1673,7 +1694,7 @@ msgstr ""
"skal\n"
"entre, s� kan korrekt informasjon f�es fra din ISP."
-#: ../../help.pm_.c:216
+#: ../../help.pm_.c:218
msgid ""
"If you will use proxies, please configure them now. If you don't know if\n"
"you should use proxies, ask your network administrator or your ISP."
@@ -1681,7 +1702,7 @@ msgstr ""
"Hvis du skal bruke proxier, vennligst konfigurer disse n�. Hvis du ikke vet\n"
"om du skal bruke proxier, sp�r nettverksadministratoren din eller din ISP."
-#: ../../help.pm_.c:220
+#: ../../help.pm_.c:222
msgid ""
"You can install cryptographic package if your internet connection has been\n"
"set up correctly. First choose a mirror where you wish to download packages "
@@ -1698,7 +1719,7 @@ msgstr ""
"\n"
"Mer at du m� velge speil og kryptografisk pakke ihht. lovgivning i ditt land."
-#: ../../help.pm_.c:228
+#: ../../help.pm_.c:230
msgid ""
"You can now select your timezone according to where you live.\n"
"\n"
@@ -1712,7 +1733,7 @@ msgstr ""
"Linux h�ndterer tid i GMT eller \"Greenwich Mean Time\" og oversetter\n"
"den til lokal tid ihht. den tidssonen du har valgt."
-#: ../../help.pm_.c:235
+#: ../../help.pm_.c:237
msgid ""
"You may now choose which services you want to see started at boot time.\n"
"When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1730,7 +1751,7 @@ msgstr ""
"V�r spesielt forsiktig i dette trinnet hvis du skal bruke maskinen din som\n"
"tjener: du vil antageligvis ikke starte noen tjenester som du ikke trenger."
-#: ../../help.pm_.c:244
+#: ../../help.pm_.c:246
msgid ""
"Linux can deal with many types of printer. Each of these\n"
"types require a different setup. Note however that the print\n"
@@ -1788,7 +1809,7 @@ msgstr ""
"en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
"informasjon."
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:275
msgid ""
"You can now enter the root password for your Linux-Mandrake\n"
"system. The password must be entered twice to verify that both\n"
@@ -1819,7 +1840,7 @@ msgstr ""
"bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
"du m� kunne klare � huske det."
-#: ../../help.pm_.c:289
+#: ../../help.pm_.c:291
msgid ""
"To enable a more secure system, you should select \"Use shadow file\" and\n"
"\"Use MD5 passwords\"."
@@ -1827,7 +1848,7 @@ msgstr ""
"For et mer sikkert system, burde du velge \"Bruk skyggefil\" og\n"
"\"Bruk MD5 passord\"."
-#: ../../help.pm_.c:293
+#: ../../help.pm_.c:295
msgid ""
"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
"network administrator."
@@ -1835,7 +1856,7 @@ msgstr ""
"Hvis nettverket ditt bruker NIS, velg \"Bruk NIS\". Hvis du ikke vet dette,\n"
"sp�r nettverksadministratoren din."
-#: ../../help.pm_.c:297
+#: ../../help.pm_.c:299
msgid ""
"You may now create one or more \"regular\" user account(s), as\n"
"opposed to the \"privileged\" user account, root. You can create\n"
@@ -1878,7 +1899,7 @@ msgstr ""
"du vil ha opprettet her, og bare logge inn som root for administrasjon-\n"
"og vedlikeholdsform�l."
-#: ../../help.pm_.c:316
+#: ../../help.pm_.c:318
msgid ""
"It is strongly recommended that you answer \"Yes\" here. If you install\n"
"Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1891,7 +1912,7 @@ msgstr ""
"Hvis du ikke har opprettet en oppstartsdiskett som foresl�tt, vil du ikke\n"
"kunne starte Linux mer."
-#: ../../help.pm_.c:322
+#: ../../help.pm_.c:324
msgid ""
"You need to indicate where you wish\n"
"to place the information required to boot to Linux.\n"
@@ -1907,7 +1928,7 @@ msgstr ""
"Med mindre du vet akkurat hva du gj�r, velg \"F�rste sektor av\n"
"disken (MBR)\"."
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:332
msgid ""
"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
@@ -1915,7 +1936,7 @@ msgstr ""
"Hvis du ikke spesifikt vet en annen m�te, s� er det vanlige valget\n"
"\"/dev/hda\" (prim�r IDE-disk) eller \"/dev/sda\" (f�rste SCSI-disk)."
-#: ../../help.pm_.c:334
+#: ../../help.pm_.c:336
msgid ""
"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
"either Linux or any other operating system present on your computer.\n"
@@ -1939,7 +1960,7 @@ msgstr ""
"andre kan du fjerne linjene for disse. Men i s� tilfelle trenger du\n"
"en oppstartsdiskett for � starte disse!"
-#: ../../help.pm_.c:346
+#: ../../help.pm_.c:348
msgid ""
"LILO and grub main options are:\n"
" - Boot device: Sets the name of the device (e.g. a hard disk\n"
@@ -1977,7 +1998,7 @@ msgstr ""
" * normal: velg normal 80x25 tekstmodus.\n"
" * <nummer>: bruk tilsvarende tekstmodus."
-#: ../../help.pm_.c:365
+#: ../../help.pm_.c:367
msgid ""
"Now it's time to configure the X Window System, which is the\n"
"core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -2003,7 +2024,7 @@ msgstr ""
"passer deg. Hvis de ikke gj�r det, kan du komme tilbake og endre\n"
"disse s� mange ganger som det m�tte beh�ves."
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:380
msgid ""
"If something is wrong in X configuration, use these options to correctly\n"
"configure the X Window System."
@@ -2011,7 +2032,7 @@ msgstr ""
"Hvis noe er galt i X konfigurasjonen, bruk disse opsjonene til �\n"
"konfigurere X Window systemet riktig."
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:384
msgid ""
"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
"\"No\"."
@@ -2019,7 +2040,7 @@ msgstr ""
"Hvis du velger � bruke grafisk login, velg \"Ja\". Ellers, velg\n"
"\"Nei\"."
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:388
msgid ""
"You can now select some miscellaneous options for your system.\n"
"\n"
@@ -2093,7 +2114,7 @@ msgstr ""
"virke\n"
" under X)."
-#: ../../help.pm_.c:415
+#: ../../help.pm_.c:417
msgid ""
"Your system is going to reboot.\n"
"\n"
@@ -2127,7 +2148,7 @@ msgstr "Konfigurer mus"
msgid "Choose your keyboard"
msgstr "Velg tastatur"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:312
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:313
msgid "Miscellaneous"
msgstr "Forskjellig"
@@ -2167,8 +2188,8 @@ msgstr "Konfigurer tjenester"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:618
-#: ../../install_steps_interactive.pm_.c:619
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:630
msgid "Set root password"
msgstr "Sett root-passord"
@@ -2266,7 +2287,7 @@ msgstr "Dupliser monteringspunkt %s"
msgid "Welcome to %s"
msgstr "Velkommen til %s"
-#: ../../install_steps.pm_.c:650
+#: ../../install_steps.pm_.c:715
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
@@ -2276,94 +2297,6 @@ msgstr "Ingen diskettstasjon tilgjengelig"
msgid "Entering step `%s'\n"
msgstr "Entrer trinn `%s'\n"
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:247
-msgid "You must have a swap partition"
-msgstr "Du m� ha en vekslingspartisjon"
-
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:249
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"Du har ingen vekslingspartisjon\n"
-"\n"
-"Fortsette likevel?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "Velg st�rrelsen du �nsker � installere"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "Total st�rrelse: "
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:443
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versjon: %s\n"
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:444
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "St�rrelse: %d KB\n"
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:357
-msgid "Choose the packages you want to install"
-msgstr "Velg pakkene du �nsker � installere"
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:360
-msgid "Info"
-msgstr "Info"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:365
-#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Installer"
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:514
-#: ../../install_steps_interactive.pm_.c:360
-msgid "Installing"
-msgstr "Installerer"
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:520
-msgid "Please wait, "
-msgstr "Vennligst vent, "
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:522
-msgid "Time remaining "
-msgstr "Tid som gjenst�r "
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:523
-msgid "Total time "
-msgstr "Total tid "
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:532
-#: ../../install_steps_interactive.pm_.c:360
-msgid "Preparing installation"
-msgstr "Forbereder installasjon"
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:547
-#, c-format
-msgid "Installing package %s"
-msgstr "Installerer pakke %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:585
-#: ../../install_steps_gtk.pm_.c:589
-msgid "Go on anyway?"
-msgstr "Fortsette uansett?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:585
-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:964
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
#: ../../install_steps_gtk.pm_.c:154
msgid "Please, choose one of the following classes of installation:"
msgstr "Vennligst velg en av f�lgende installasjonsklasser:"
@@ -2401,6 +2334,20 @@ msgstr ""
msgid "Automatic resizing failed"
msgstr "Automatisk endring av st�rrelse mislykket"
+#: ../../install_steps_gtk.pm_.c:247
+msgid "You must have a swap partition"
+msgstr "Du m� ha en vekslingspartisjon"
+
+#: ../../install_steps_gtk.pm_.c:249
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"Du har ingen vekslingspartisjon\n"
+"\n"
+"Fortsette likevel?"
+
#: ../../install_steps_gtk.pm_.c:259
msgid "Which partition do you want to use to put Linux4Win?"
msgstr "Hvilken partisjon vil du bruke til � plassere Linux4Win?"
@@ -2461,73 +2408,126 @@ msgstr "Du vil kunne velge disse mere spesifisert i neste trinn."
msgid "Percentage of packages to install"
msgstr "Prosentdel av pakker � installere"
-#: ../../install_steps_gtk.pm_.c:369
+#: ../../install_steps_gtk.pm_.c:358
+msgid "Choose the packages you want to install"
+msgstr "Velg pakkene du �nsker � installere"
+
+#: ../../install_steps_gtk.pm_.c:361
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_gtk.pm_.c:366 ../../install_steps_interactive.pm_.c:124
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Installer"
+
+#: ../../install_steps_gtk.pm_.c:370
msgid "Automatic dependencies"
msgstr "Avhengigheter automatisk"
-#: ../../install_steps_gtk.pm_.c:422 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr "Utvid tre"
-#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr "Trekk sammen tre"
-#: ../../install_steps_gtk.pm_.c:424
+#: ../../install_steps_gtk.pm_.c:425
msgid "Toggle between flat and group sorted"
msgstr "Skift mellom flat og gruppesortert"
-#: ../../install_steps_gtk.pm_.c:442
+#: ../../install_steps_gtk.pm_.c:443
msgid "Bad package"
msgstr "D�rlig pakke"
-#: ../../install_steps_gtk.pm_.c:445
+#: ../../install_steps_gtk.pm_.c:444
+#, c-format
+msgid "Name: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:445 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versjon: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:446 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "St�rrelse: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:447
#, c-format
msgid "Importance: %s\n"
msgstr "Viktighet: %s\n"
-#: ../../install_steps_gtk.pm_.c:456
+#: ../../install_steps_gtk.pm_.c:458
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Total st�rrelse: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:469
msgid "This is a mandatory package, it can't be unselected"
msgstr "Dette er en bestemt pakke, den kan ikke fjernes"
-#: ../../install_steps_gtk.pm_.c:469
+#: ../../install_steps_gtk.pm_.c:471
msgid "You can't unselect this package. It is already installed"
msgstr "Du kan ikke fjerne denne pakken, den er allerede installert"
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:475
msgid "The following packages are going to be installed/removed"
msgstr "F�lgende pakker vil bli installert/fjernet"
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:484
msgid "You can't select/unselect this package"
msgstr "Du kan ikke velge/fjerne denne pakken"
-#: ../../install_steps_gtk.pm_.c:517
+#: ../../install_steps_gtk.pm_.c:516 ../../install_steps_interactive.pm_.c:361
+msgid "Installing"
+msgstr "Installerer"
+
+#: ../../install_steps_gtk.pm_.c:519
msgid "Estimating"
msgstr "Beregner"
-#: ../../install_steps_gtk.pm_.c:529 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:50
-#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../install_steps_gtk.pm_.c:522
+msgid "Please wait, "
+msgstr "Vennligst vent, "
+
+#: ../../install_steps_gtk.pm_.c:524
+msgid "Time remaining "
+msgstr "Tid som gjenst�r "
+
+#: ../../install_steps_gtk.pm_.c:525
+msgid "Total time "
+msgstr "Total tid "
+
+#: ../../install_steps_gtk.pm_.c:531 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
+#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
#: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:457
msgid "Cancel"
msgstr "Avbryt"
-#: ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:534 ../../install_steps_interactive.pm_.c:361
+msgid "Preparing installation"
+msgstr "Forbereder installasjon"
+
+#: ../../install_steps_gtk.pm_.c:544
#, c-format
msgid "%d packages"
msgstr "%d pakker"
-#: ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:544
msgid ", %U MB"
msgstr ", %U MB"
-#: ../../install_steps_gtk.pm_.c:573
+#: ../../install_steps_gtk.pm_.c:549
+#, c-format
+msgid "Installing package %s"
+msgstr "Installerer pakke %s"
+
+#: ../../install_steps_gtk.pm_.c:575
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2542,7 +2542,15 @@ msgstr ""
"ferdig.\n"
"Hvis du ikke har den trykk Avbryt for � unng� installasjon fra denne CD'en."
-#: ../../install_steps_gtk.pm_.c:589
+#: ../../install_steps_gtk.pm_.c:587 ../../install_steps_gtk.pm_.c:591
+msgid "Go on anyway?"
+msgstr "Fortsette uansett?"
+
+#: ../../install_steps_gtk.pm_.c:587
+msgid "There was an error ordering packages:"
+msgstr "Det var en feil ved endring av pakkenes rekkef�lge:"
+
+#: ../../install_steps_gtk.pm_.c:591
msgid "There was an error installing packages:"
msgstr "Det var en feil ved installering av pakkene:"
@@ -2576,7 +2584,7 @@ msgid "What is the root partition (/) of your system?"
msgstr "Hva er root-partisjonen (/) p� systemet ditt?"
#: ../../install_steps_interactive.pm_.c:99
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:135
msgid "Install Class"
msgstr "Installeringsklasse"
@@ -2597,6 +2605,7 @@ msgid "Recommended"
msgstr "Anbefalt"
#: ../../install_steps_interactive.pm_.c:109
+#: ../../install_steps_interactive.pm_.c:119
msgid "Customized"
msgstr "Egendefinert"
@@ -2608,21 +2617,19 @@ msgstr "Ekspert"
#: ../../install_steps_interactive.pm_.c:117
msgid ""
"Are you sure you are an expert? \n"
-"Hey no kidding, you will be allowed to make powerfull but dangerous things "
-"here."
+"You will be allowed to make powerfull but dangerous things here."
msgstr ""
"Er du sikker p� at du er en ekspert? \n"
-"Hei ingen sp�king, du f�r tilgang til kraftige men farlige ting her."
-
-#: ../../install_steps_interactive.pm_.c:119
-#: ../../install_steps_interactive.pm_.c:130
-msgid "Normal"
-msgstr "Normal"
+"Du f�r tilgang til kraftige men farlige ting her."
#: ../../install_steps_interactive.pm_.c:124
msgid "Upgrade"
msgstr "Oppgrader"
+#: ../../install_steps_interactive.pm_.c:130
+msgid "Normal"
+msgstr "Normal"
+
#: ../../install_steps_interactive.pm_.c:131
msgid "Development"
msgstr "Utvikling"
@@ -2631,91 +2638,92 @@ msgstr "Utvikling"
msgid "Server"
msgstr "Tjener"
-#: ../../install_steps_interactive.pm_.c:135
+#: ../../install_steps_interactive.pm_.c:136
msgid "Which usage is your system used for ?"
msgstr "Hva slags bruk er systemet ditt brukt til?"
-#: ../../install_steps_interactive.pm_.c:146
+#: ../../install_steps_interactive.pm_.c:147
msgid "Please, choose the type of your mouse."
msgstr "Vennligst velg din musetype."
-#: ../../install_steps_interactive.pm_.c:154 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:155 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr "Museport"
-#: ../../install_steps_interactive.pm_.c:155
+#: ../../install_steps_interactive.pm_.c:156
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:166
+#: ../../install_steps_interactive.pm_.c:167
msgid "Configuring IDE"
msgstr "Konfigurerer IDE"
-#: ../../install_steps_interactive.pm_.c:166
+#: ../../install_steps_interactive.pm_.c:167
msgid "IDE"
msgstr "IDE"
-#: ../../install_steps_interactive.pm_.c:176
+#: ../../install_steps_interactive.pm_.c:177
msgid "no available partitions"
msgstr "ingen tilgjengelige partisjoner"
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:179
+#, c-format
msgid "(%dMB)"
msgstr "(%dMB)"
-#: ../../install_steps_interactive.pm_.c:185
+#: ../../install_steps_interactive.pm_.c:186
msgid "Please choose a partition to use as your root partition."
msgstr "Vennligst velg en partisjon � bruke som din root-partisjon."
-#: ../../install_steps_interactive.pm_.c:192
+#: ../../install_steps_interactive.pm_.c:193
msgid "Choose the mount points"
msgstr "Velg monteringspunktene"
-#: ../../install_steps_interactive.pm_.c:204
+#: ../../install_steps_interactive.pm_.c:205
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:230
+#: ../../install_steps_interactive.pm_.c:231
msgid "Choose the partitions you want to format"
msgstr "Velg de partisjonene du �nsker � formatere"
-#: ../../install_steps_interactive.pm_.c:234
+#: ../../install_steps_interactive.pm_.c:235
msgid "Check bad blocks?"
msgstr "Sjekke d�rlige blokker?"
-#: ../../install_steps_interactive.pm_.c:242
+#: ../../install_steps_interactive.pm_.c:243
msgid "Formatting partitions"
msgstr "Formaterer partisjoner"
-#: ../../install_steps_interactive.pm_.c:246
-#, c-format
-msgid "Creating and formatting loopback file %s"
+#: ../../install_steps_interactive.pm_.c:247
+#, fuzzy, c-format
+msgid "Creating and formatting file %s"
msgstr "Oppretter og formaterer loopback-fil %s"
-#: ../../install_steps_interactive.pm_.c:249
+#: ../../install_steps_interactive.pm_.c:250
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:255
+#: ../../install_steps_interactive.pm_.c:256
msgid "Looking for available packages"
msgstr "Ser etter tilgjengelige pakker"
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:262
msgid "Finding packages to upgrade"
msgstr "Finner pakker � oppgradere"
-#: ../../install_steps_interactive.pm_.c:311
+#: ../../install_steps_interactive.pm_.c:312
msgid "Package Group Selection"
msgstr "Valg pakkegruppe"
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:315
msgid "Individual package selection"
msgstr "Individuelt pakkevalg"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:345
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -2725,12 +2733,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:347
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "CD-ROM merket \"%s\""
-#: ../../install_steps_interactive.pm_.c:369
+#: ../../install_steps_interactive.pm_.c:370
msgid ""
"Installing package %s\n"
"%d%%"
@@ -2738,55 +2746,55 @@ msgstr ""
"Installerer pakke %s\n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:378
+#: ../../install_steps_interactive.pm_.c:379
msgid "Post-install configuration"
msgstr "Konfigurasjon postinstallering"
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:389
msgid "Keep the current IP configuration"
msgstr "Behold n�v�rende IP-konfigurasjon"
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:390
msgid "Reconfigure network now"
msgstr "Rekonfigurer nettverket n�"
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:391
msgid "Do not set up networking"
msgstr "Ikke sett opp nettverk"
-#: ../../install_steps_interactive.pm_.c:393
-#: ../../install_steps_interactive.pm_.c:398
+#: ../../install_steps_interactive.pm_.c:394
+#: ../../install_steps_interactive.pm_.c:399
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../../install_steps_interactive.pm_.c:394
+#: ../../install_steps_interactive.pm_.c:395
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:399
+#: ../../install_steps_interactive.pm_.c:400
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:405
+#: ../../install_steps_interactive.pm_.c:406
msgid "no network card found"
msgstr "ingen nettverkskort funnet"
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:429
msgid "Modem Configuration"
msgstr "Modem-konfigurasjon"
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:430
msgid ""
"Do you want to configure a dialup connection with modem for your system?"
msgstr "Vil du konfigurere oppringt med modem for systemet ditt?"
-#: ../../install_steps_interactive.pm_.c:441
#: ../../install_steps_interactive.pm_.c:442
+#: ../../install_steps_interactive.pm_.c:443
#, c-format
msgid "Configuring network device %s"
msgstr "Konfigurerer nettverksenhet %s"
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:444
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -2796,31 +2804,31 @@ msgstr ""
"Hvert element b�r entres som en IP-adresse i punkt-desimal\n"
"notasjon (f.eks, 1.2.3.4)."
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "Automatic IP"
msgstr "Automatisk IP"
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "IP address:"
msgstr "IP-adresse:"
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "Netmask:"
msgstr "Nettmaske:"
-#: ../../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:448
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../install_steps_interactive.pm_.c:453 ../../printerdrake.pm_.c:88
+#: ../../install_steps_interactive.pm_.c:454 ../../printerdrake.pm_.c:88
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:471
+#: ../../install_steps_interactive.pm_.c:472
msgid "Configuring network"
msgstr "Konfigurerer nettverk"
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:473
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2832,79 +2840,79 @@ 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:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "DNS server:"
msgstr "DNS-tjener:"
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Gateway device:"
msgstr "Gateway-enhet:"
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Gateway:"
msgstr "Gateway:"
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Host name:"
msgstr "Vertsnavn:"
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:490
msgid "Try to find a modem?"
msgstr "Pr�ve � finne et modem?"
-#: ../../install_steps_interactive.pm_.c:499
+#: ../../install_steps_interactive.pm_.c:500
msgid "Please choose which serial port your modem is connected to."
msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
-#: ../../install_steps_interactive.pm_.c:504
+#: ../../install_steps_interactive.pm_.c:506
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../../install_steps_interactive.pm_.c:505
+#: ../../install_steps_interactive.pm_.c:507
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:508
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:509
msgid "Login ID"
msgstr "Login ID"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "CHAP"
msgstr "CHAP"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "PAP"
msgstr "PAP"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:512
msgid "Domain name"
msgstr "Domenenavn"
-#: ../../install_steps_interactive.pm_.c:512
+#: ../../install_steps_interactive.pm_.c:514
msgid "First DNS Server"
msgstr "F�rste DNS-tjener"
-#: ../../install_steps_interactive.pm_.c:513
+#: ../../install_steps_interactive.pm_.c:515
msgid "Second DNS Server"
msgstr "Andre DNS-tjener"
-#: ../../install_steps_interactive.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:528
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -2978,88 +2986,88 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:557
+#: ../../install_steps_interactive.pm_.c:559
msgid "Choose a mirror from which to get the packages"
msgstr "Velg et speil som pakkene kan hentes fra"
-#: ../../install_steps_interactive.pm_.c:564
+#: ../../install_steps_interactive.pm_.c:567
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:568
+#: ../../install_steps_interactive.pm_.c:571
msgid "Please choose the packages you want to install."
msgstr "Vennligst velg pakkene du �nsker � installere."
-#: ../../install_steps_interactive.pm_.c:579
+#: ../../install_steps_interactive.pm_.c:585
msgid "Which is your timezone?"
msgstr "Hvilken er din tidsone?"
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:586
msgid "Is your hardware clock set to GMT?"
msgstr "Er maskinvareklokken din satt til GMT?"
-#: ../../install_steps_interactive.pm_.c:618
+#: ../../install_steps_interactive.pm_.c:629
msgid "No password"
msgstr "Intet passord"
-#: ../../install_steps_interactive.pm_.c:623
+#: ../../install_steps_interactive.pm_.c:634
msgid "Use shadow file"
msgstr "Bruk skyggefil"
-#: ../../install_steps_interactive.pm_.c:623
+#: ../../install_steps_interactive.pm_.c:634
msgid "shadow"
msgstr "skygge"
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:635
msgid "MD5"
msgstr "MD5"
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:635
msgid "Use MD5 passwords"
msgstr "Bruk MD5 passord"
-#: ../../install_steps_interactive.pm_.c:626
+#: ../../install_steps_interactive.pm_.c:637
msgid "Use NIS"
msgstr "Bruk NIS"
-#: ../../install_steps_interactive.pm_.c:626
+#: ../../install_steps_interactive.pm_.c:637
msgid "yellow pages"
msgstr "gule sider"
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:643
#, 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:639
+#: ../../install_steps_interactive.pm_.c:650
msgid "Authentification NIS"
msgstr "Autentifikasjon NIS"
-#: ../../install_steps_interactive.pm_.c:640
+#: ../../install_steps_interactive.pm_.c:651
msgid "NIS Domain"
msgstr "NIS-domene"
-#: ../../install_steps_interactive.pm_.c:640
+#: ../../install_steps_interactive.pm_.c:651
msgid "NIS Server"
msgstr "NIS-tjener"
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:677
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "Godta bruker"
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:677
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "Legg til bruker"
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:678
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "(allerede lagt til %s)"
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:678
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -3069,60 +3077,60 @@ msgstr ""
"Entre en bruker\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:680
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "Virkelig navn"
-#: ../../install_steps_interactive.pm_.c:670 ../../printerdrake.pm_.c:83
+#: ../../install_steps_interactive.pm_.c:681 ../../printerdrake.pm_.c:83
#: ../../printerdrake.pm_.c:108 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "Brukernavn"
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:686
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Skall"
-#: ../../install_steps_interactive.pm_.c:677
-#: ../../standalone/adduserdrake_.c:47
+#: ../../install_steps_interactive.pm_.c:688
+#: ../../standalone/adduserdrake_.c:47 ../../t.pm_.c:41
msgid "Icon"
msgstr "Ikon"
-#: ../../install_steps_interactive.pm_.c:687
+#: ../../install_steps_interactive.pm_.c:698
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "Dette passordet er for enkelt"
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:699
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "Vennligst oppgi et brukernavn"
-#: ../../install_steps_interactive.pm_.c:689
+#: ../../install_steps_interactive.pm_.c:700
#: ../../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:690
+#: ../../install_steps_interactive.pm_.c:701
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "Denne brukeren er allerede lagt til"
-#: ../../install_steps_interactive.pm_.c:714
+#: ../../install_steps_interactive.pm_.c:725
msgid "First floppy drive"
msgstr "F�rste diskettstasjon"
-#: ../../install_steps_interactive.pm_.c:715
+#: ../../install_steps_interactive.pm_.c:726
msgid "Second floppy drive"
msgstr "Andre diskettstasjon"
-#: ../../install_steps_interactive.pm_.c:716
+#: ../../install_steps_interactive.pm_.c:727
msgid "Skip"
msgstr "Dropp"
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:733
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 "
@@ -3147,36 +3155,36 @@ msgstr ""
"etter systemsvikt. �nsker du � opprette en oppstartsdiskett for systemet "
"ditt?"
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:742
msgid "Sorry, no floppy drive available"
msgstr "Beklager, ingen diskettstasjon tilgjengelig"
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:745
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:739
+#: ../../install_steps_interactive.pm_.c:750
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Sett inn en diskett i stasjon %s"
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../install_steps_interactive.pm_.c:751
msgid "Creating bootdisk"
msgstr "Oppretter oppstartdiskett"
-#: ../../install_steps_interactive.pm_.c:752 ../../standalone/drakboot_.c:48
+#: ../../install_steps_interactive.pm_.c:763 ../../standalone/drakboot_.c:49
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. F�lgende feil oppsto:"
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:784
msgid "Do you want to use SILO?"
msgstr "�nsker du � bruke SILO?"
-#: ../../install_steps_interactive.pm_.c:784
+#: ../../install_steps_interactive.pm_.c:795
msgid "SILO main options"
msgstr "SILO hovedopsjoner"
-#: ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:808
msgid ""
"Here are the following entries in SILO.\n"
"You can add some more or change the existing ones."
@@ -3184,27 +3192,27 @@ msgstr ""
"Her er f�lgende oppf�ringer i SILO.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../../install_steps_interactive.pm_.c:825
+#: ../../install_steps_interactive.pm_.c:836
msgid "Partition"
msgstr "Partisjon"
-#: ../../install_steps_interactive.pm_.c:845
+#: ../../install_steps_interactive.pm_.c:856
msgid "This label is already in use"
msgstr "Denne etiketten er allerede i bruk"
-#: ../../install_steps_interactive.pm_.c:858
+#: ../../install_steps_interactive.pm_.c:869
msgid "Installation of SILO failed. The following error occured:"
msgstr "Installasjon av SILO mislykket. F�lgende feil oppsto:"
-#: ../../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:879
msgid "Preparing bootloader"
msgstr "Klargj�r oppstartslaster"
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:887
msgid "Do you want to use aboot?"
msgstr "�nsker du � bruke aboot?"
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:890
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -3212,110 +3220,122 @@ msgstr ""
"Feil ved installasjon av aboot, \n"
"pr�ve � installere selv om det �delegger den f�rste partisjonen?"
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:907
msgid "Proxies configuration"
msgstr "Proxy-konfigurasjon"
-#: ../../install_steps_interactive.pm_.c:897
+#: ../../install_steps_interactive.pm_.c:908
msgid "HTTP proxy"
msgstr "HTTP-proxy"
-#: ../../install_steps_interactive.pm_.c:898
+#: ../../install_steps_interactive.pm_.c:909
msgid "FTP proxy"
msgstr "FTP-proxy"
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:915
msgid "Proxy should be http://..."
msgstr "Proxy burde v�re http://..."
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:916
msgid "Proxy should be ftp://..."
msgstr "Proxy burde v�re ftp://..."
-#: ../../install_steps_interactive.pm_.c:915 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:926 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Velkommen til Crackers"
-#: ../../install_steps_interactive.pm_.c:916 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:927 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "D�rlig"
-#: ../../install_steps_interactive.pm_.c:917 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:928 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "Lav"
-#: ../../install_steps_interactive.pm_.c:918 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:929 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "Medium"
-#: ../../install_steps_interactive.pm_.c:919 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:930 ../../standalone/draksec_.c:24
msgid "High"
msgstr "H�y"
-#: ../../install_steps_interactive.pm_.c:920 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:931 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Paranoid"
-#: ../../install_steps_interactive.pm_.c:933
+#: ../../install_steps_interactive.pm_.c:944
msgid "Miscellaneous questions"
msgstr "Forskjellige sp�rsm�l"
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:945
msgid "(may cause data corruption)"
msgstr "(kan for�rsake korrupsjon av data)"
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:945
msgid "Use hard drive optimisations?"
msgstr "Bruk harddisk-optimisering?"
-#: ../../install_steps_interactive.pm_.c:935 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:946 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Velg sikkerhetsniv�"
-#: ../../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:947
#, 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:937
+#: ../../install_steps_interactive.pm_.c:948
msgid "Removable media automounting"
msgstr "Fjernbart media automontering"
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:950
msgid "Clean /tmp at each boot"
msgstr "T�m /tmp ved hver oppstart"
-#: ../../install_steps_interactive.pm_.c:942
+#: ../../install_steps_interactive.pm_.c:953
msgid "Enable multi profiles"
msgstr "Sl� p� multiprofiler"
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:955
msgid "Enable num lock at startup"
msgstr "Sl� p� num lock ved oppstart"
-#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:958
msgid "Give the ram size in MB"
msgstr "Oppgi ram-st�rrelsen i MB"
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:960
msgid "Can't use supermount in high security level"
msgstr "Kan ikke bruke supermount i h�yt sikkerhetsniv�"
-#: ../../install_steps_interactive.pm_.c:976
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
+#: ../../install_steps_interactive.pm_.c:980
+msgid ""
+"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
+"By default, the 3.3 server is used because it works on more graphic cards.\n"
+"\n"
+"Do you want to try XFree 4.0?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:993
+#: ../../install_steps_interactive.pm_.c:1144
msgid "Try to find PCI devices?"
msgstr "Pr�ve � finne PCI-enheter?"
-#: ../../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:1014
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sett inn en tom diskett i stasjon %s"
-#: ../../install_steps_interactive.pm_.c:1005
+#: ../../install_steps_interactive.pm_.c:1022
msgid "Creating auto install floppy"
msgstr "Oppretter diskett for autoinstallasjon"
-#: ../../install_steps_interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:1045
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -3325,7 +3345,7 @@ msgstr ""
"\n"
"�nsker du virkelig � avslutte n�?"
-#: ../../install_steps_interactive.pm_.c:1035
+#: ../../install_steps_interactive.pm_.c:1052
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -3347,26 +3367,26 @@ msgstr ""
"Informasjon om konfigurering av systemet ditt finnes i post\n"
"install-kapittelet i Official Linux Mandrake User's Guide."
-#: ../../install_steps_interactive.pm_.c:1044
+#: ../../install_steps_interactive.pm_.c:1061
msgid "Shutting down"
msgstr "Stenger av"
-#: ../../install_steps_interactive.pm_.c:1056
+#: ../../install_steps_interactive.pm_.c:1073
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for %s kort %s"
-#: ../../install_steps_interactive.pm_.c:1057
+#: ../../install_steps_interactive.pm_.c:1074
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1084
#, c-format
msgid "Which %s driver should I try?"
msgstr "Hvilken %s driver skal jeg pr�ve?"
-#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1092
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -3385,20 +3405,20 @@ msgstr ""
"burde\n"
"ikke for�rsake noen skader."
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Autoprobe"
msgstr "Automatisk sondering"
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Specify options"
msgstr "Spesifiser opsjoner"
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1101
#, c-format
msgid "You may now provide its options to module %s."
msgstr "Du kan n� gi dens opsjoner til modul %s."
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1107
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -3409,11 +3429,11 @@ msgstr ""
"Opsjonene er i format ``name=value name2=value2 ...''.\n"
"F.eks., ``io=0x300 irq=7''"
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1110
msgid "Module options:"
msgstr "Modulopsjoner:"
-#: ../../install_steps_interactive.pm_.c:1103
+#: ../../install_steps_interactive.pm_.c:1120
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -3422,50 +3442,55 @@ msgstr ""
"Lasting av modul %s feilet.\n"
"�nsker du � pr�ve igjen med andre parametere?"
-#: ../../install_steps_interactive.pm_.c:1116
+#: ../../install_steps_interactive.pm_.c:1133
msgid "Try to find PCMCIA cards?"
msgstr "Pr�ve � finne PCMCIA kort?"
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1134
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA kort..."
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1134
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../../install_steps_interactive.pm_.c:1139
+#: ../../install_steps_interactive.pm_.c:1156
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../../install_steps_interactive.pm_.c:1140
+#: ../../install_steps_interactive.pm_.c:1157
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../../install_steps_interactive.pm_.c:1141
+#: ../../install_steps_interactive.pm_.c:1158
#, c-format
msgid "Do you have any %s interfaces?"
msgstr "Har du noen %s grensesnitt?"
-#: ../../install_steps_interactive.pm_.c:1143 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
#: ../../my_gtk.pm_.c:456 ../../printerdrake.pm_.c:123
msgid "No"
msgstr "Nei"
-#: ../../install_steps_interactive.pm_.c:1143 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
#: ../../my_gtk.pm_.c:456
msgid "Yes"
msgstr "Ja"
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm_.c:1161
msgid "See hardware info"
msgstr "Se maskinvareinfo"
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../install_steps_interactive.pm_.c:1178
msgid "Bringing up the network"
msgstr "Henter opp nettverket"
+#: ../../install_steps_interactive.pm_.c:1183
+#, fuzzy
+msgid "Bringing down the network"
+msgstr "Henter opp nettverket"
+
#: ../../install_steps_newt.pm_.c:21
#, c-format
msgid "Linux-Mandrake Installation %s"
@@ -3750,34 +3775,34 @@ msgstr ""
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../lilo.pm_.c:430
+#: ../../lilo.pm_.c:428
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Velkommen til GRUB, operativsystem-velgeren!"
-#: ../../lilo.pm_.c:431
+#: ../../lilo.pm_.c:429
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Bruk %c og %c tastene for � velge hvilken inngang som er markert."
-#: ../../lilo.pm_.c:432
+#: ../../lilo.pm_.c:430
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Trykk enter for � starte opp valgt OS, 'e' for � redigere"
-#: ../../lilo.pm_.c:433
+#: ../../lilo.pm_.c:431
msgid "commands before booting, or 'c' for a command-line."
msgstr "kommandoer f�r oppstart, eller 'c' for en kommandolinje."
-#: ../../lilo.pm_.c:434
+#: ../../lilo.pm_.c:432
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "Den markerte inngangen vil bli startet automatisk om %d sekunder."
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:513
+#: ../../lilo.pm_.c:511
msgid "Desktop"
msgstr "Skrivebord"
-#: ../../lilo.pm_.c:513
+#: ../../lilo.pm_.c:511
msgid "Start Menu"
msgstr "Startmeny"
@@ -3937,7 +3962,7 @@ msgstr "Mouse Systems (seriell)"
msgid "Is this correct?"
msgstr "Er dette riktig?"
-#: ../../partition_table.pm_.c:532
+#: ../../partition_table.pm_.c:536
msgid ""
"You have a hole in your partition table but I can't use it.\n"
"The only solution is to move your primary partitions to have the hole next "
@@ -3947,21 +3972,21 @@ msgstr ""
"Den eneste l�sningen er � flytte prim�rpartisjonene dine for � ha hullet ved "
"siden av de utvidede partisjonene"
-#: ../../partition_table.pm_.c:620
+#: ../../partition_table.pm_.c:624
#, c-format
msgid "Error reading file %s"
msgstr "Feil ved lesing av fil %s"
-#: ../../partition_table.pm_.c:627
+#: ../../partition_table.pm_.c:631
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "Gjenoppretting fra fil %s mislykket: %s"
-#: ../../partition_table.pm_.c:629
+#: ../../partition_table.pm_.c:633
msgid "Bad backup file"
msgstr "D�rlig sikkerhetskopi-fil"
-#: ../../partition_table.pm_.c:650
+#: ../../partition_table.pm_.c:654
#, c-format
msgid "Error writing to file %s"
msgstr "Feil ved skriving til fil %s"
@@ -4167,67 +4192,67 @@ msgstr "Konfigurer skriver"
msgid "What type of printer do you have?"
msgstr "Hva slags type skriver har du?"
-#: ../../printerdrake.pm_.c:158
+#: ../../printerdrake.pm_.c:161
msgid "Printer options"
msgstr "Opsjoner for skriver"
-#: ../../printerdrake.pm_.c:159
+#: ../../printerdrake.pm_.c:162
msgid "Paper Size"
msgstr "Papirst�rrelse"
-#: ../../printerdrake.pm_.c:160
+#: ../../printerdrake.pm_.c:163
msgid "Eject page after job?"
msgstr "Kj�r ut side etter jobb?"
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:168
msgid "Uniprint driver options"
msgstr "Opsjoner uniprint-driver"
-#: ../../printerdrake.pm_.c:166
+#: ../../printerdrake.pm_.c:169
msgid "Color depth options"
msgstr "Opsjoner fargedybde"
-#: ../../printerdrake.pm_.c:168
+#: ../../printerdrake.pm_.c:171
msgid "Print text as PostScript?"
msgstr "Skrive ut tekst som PostScript?"
-#: ../../printerdrake.pm_.c:169
+#: ../../printerdrake.pm_.c:172
msgid "Reverse page order"
msgstr "Reversere siderekkef�lge"
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:174
msgid "Fix stair-stepping text?"
msgstr "Fikse trappestegs-tekst?"
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:177
msgid "Number of pages per output pages"
msgstr "Nummer av sider pr. sider ut"
-#: ../../printerdrake.pm_.c:175
+#: ../../printerdrake.pm_.c:178
msgid "Right/Left margins in points (1/72 of inch)"
msgstr "H�yre/venstre marginer i punkter (1/72 av inch)"
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:179
msgid "Top/Bottom margins in points (1/72 of inch)"
msgstr "Topp/bunn marginer i punkter (1/72 av inch)"
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:182
msgid "Extra GhostScript options"
msgstr "Ekstra GhostScript opsjoner"
-#: ../../printerdrake.pm_.c:182
+#: ../../printerdrake.pm_.c:185
msgid "Extra Text options"
msgstr "Ekstra tekstopsjoner"
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:196
msgid "Do you want to test printing?"
msgstr "Vil du teste utskrift?"
-#: ../../printerdrake.pm_.c:205
+#: ../../printerdrake.pm_.c:208
msgid "Printing test page(s)..."
msgstr "Skriver ut testside(r)..."
-#: ../../printerdrake.pm_.c:212
+#: ../../printerdrake.pm_.c:215
#, c-format
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
@@ -4244,7 +4269,7 @@ msgstr ""
"\n"
"Virker det ordentlig?"
-#: ../../printerdrake.pm_.c:216
+#: ../../printerdrake.pm_.c:219
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
@@ -4254,15 +4279,15 @@ msgstr ""
"Det kan ta litt tid f�r skriveren starter.\n"
"Virker det ordentlig?"
-#: ../../printerdrake.pm_.c:232
+#: ../../printerdrake.pm_.c:235
msgid "Printer"
msgstr "Skriver"
-#: ../../printerdrake.pm_.c:233
+#: ../../printerdrake.pm_.c:236
msgid "Would you like to configure a printer?"
msgstr "�nsker du � konfigurere en skriver?"
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:240
msgid ""
"Here are the following print queue.\n"
"You can add some more or change the existing ones."
@@ -4270,19 +4295,19 @@ msgstr ""
"Her er f�lgende skriverk�.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../../printerdrake.pm_.c:260 ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:263 ../../printerdrake.pm_.c:269
msgid "Select Printer Connection"
msgstr "Velg skrivertilkobling"
-#: ../../printerdrake.pm_.c:261
+#: ../../printerdrake.pm_.c:264
msgid "How is the printer connected?"
msgstr "Hvordan er skriveren tilkoblet?"
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:269
msgid "Remove queue"
msgstr "Fjern k�"
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:270
msgid ""
"Every print queue (which print jobs are directed to) needs a\n"
"name (often lp) and a spool directory associated with it. What\n"
@@ -4293,15 +4318,15 @@ msgstr ""
"(ofte lp) og en spolingskatalog direkte assosiert med denne. Hvilket\n"
"navn og katalog skal brukes for denne k�en og hvordan er skriveren tilkoblet?"
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:273
msgid "Name of queue"
msgstr "K�ens navn"
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:274
msgid "Spool directory"
msgstr "Spolingskatalog"
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:275
msgid "Printer Connection"
msgstr "Skrivertilkobling"
@@ -4586,7 +4611,7 @@ msgstr "Opprett en oppstartdiskett"
msgid "Format floppy"
msgstr "Formater diskett"
-#: ../../standalone/drakboot_.c:29
+#: ../../standalone/drakboot_.c:30
msgid "Choice"
msgstr "Valg"
@@ -4880,6 +4905,12 @@ msgstr "Finner tillatelser"
msgid "Finding leaves takes some time"
msgstr "Finne tillatelser vil ta litt tid"
+#~ msgid "Choose the size you want to install"
+#~ msgstr "Velg st�rrelsen du �nsker � installere"
+
+#~ msgid "Total size: "
+#~ msgstr "Total st�rrelse: "
+
#~ msgid ""
#~ "(a user ``mandrake'' with password ``mandrake'' has been automatically added)"
#~ msgstr ""
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index e69c8174b..65cb57bfa 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-04-22 16:38+0200\n"
+"POT-Creation-Date: 2000-04-27 12:04+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"
@@ -71,11 +71,11 @@ msgstr ""
"����� �� ����� �� �� �������� ��� �������� ���� ��� ���� ����� ���� ����\n"
"��� �� ��� ��� �������. ��� ����� �������, ��������� ���� ���������."
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
msgid "Horizontal refresh rate"
msgstr "������������ ���������ja"
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
msgid "Vertical refresh rate"
msgstr "���������� ���������ja"
@@ -143,7 +143,7 @@ msgstr ""
"��� ����� �� ��������...\n"
"������ ������� ������� ��� ������, ���� �� ���� ������� ������� ��������"
-#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:162
+#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:165
msgid "Resolution"
msgstr "��������ja"
@@ -187,109 +187,109 @@ msgstr ""
"���� �������� ������������ ���\n"
"��������� �� ������ ��������� �������� ��� ���������"
-#: ../../Xconfigurator.pm_.c:905
+#: ../../Xconfigurator.pm_.c:906
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "��� ���������: %s\n"
-#: ../../Xconfigurator.pm_.c:906
+#: ../../Xconfigurator.pm_.c:907
#, c-format
msgid "Mouse type: %s\n"
msgstr "��� ����: %s\n"
-#: ../../Xconfigurator.pm_.c:907
+#: ../../Xconfigurator.pm_.c:908
#, c-format
msgid "Mouse device: %s\n"
msgstr "��� �� ��������� �� ������: %s\n"
-#: ../../Xconfigurator.pm_.c:908
+#: ../../Xconfigurator.pm_.c:909
#, c-format
msgid "Monitor: %s\n"
msgstr "�������: %s\n"
-#: ../../Xconfigurator.pm_.c:909
+#: ../../Xconfigurator.pm_.c:910
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "������� - �����������a ���������ja: %s\n"
-#: ../../Xconfigurator.pm_.c:910
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "������� - ���������� ����������: %s\n"
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "Graphic card: %s\n"
msgstr "�������� �������: %s\n"
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:913
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "������ja �� ��������� �������: %s kB\n"
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:914
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 ������: %s\n"
-#: ../../Xconfigurator.pm_.c:928
+#: ../../Xconfigurator.pm_.c:929
msgid "Preparing X-Window configuration"
msgstr "������� ������������� �� X-Window ������"
-#: ../../Xconfigurator.pm_.c:942
+#: ../../Xconfigurator.pm_.c:943
msgid "Change Monitor"
msgstr "������� ��������"
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:944
msgid "Change Graphic card"
msgstr "������� �������� �������"
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:945
msgid "Change Server options"
msgstr "������� ������ ����ja"
-#: ../../Xconfigurator.pm_.c:945
+#: ../../Xconfigurator.pm_.c:946
msgid "Change Resolution"
msgstr "������� ����������"
-#: ../../Xconfigurator.pm_.c:946
+#: ../../Xconfigurator.pm_.c:947
msgid "Automatical resolutions search"
msgstr "���������� ������� ����������"
-#: ../../Xconfigurator.pm_.c:950
+#: ../../Xconfigurator.pm_.c:951
msgid "Show information"
msgstr "������� �����������"
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:952
msgid "Test again"
msgstr "�������� ������"
-#: ../../Xconfigurator.pm_.c:952 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:953 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "����"
-#: ../../Xconfigurator.pm_.c:956 ../../standalone/drakboot_.c:29
+#: ../../Xconfigurator.pm_.c:957 ../../standalone/drakboot_.c:30
msgid "What do you want to do?"
msgstr "��� ������ �� �������?"
-#: ../../Xconfigurator.pm_.c:963
+#: ../../Xconfigurator.pm_.c:964
msgid "Forget the changes?"
msgstr "�� ������� �������?"
-#: ../../Xconfigurator.pm_.c:981
+#: ../../Xconfigurator.pm_.c:982
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "�����, ������ ������� %s ���� ���������� �������"
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:998
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "����� ��� ��������� �� � ����������� (Ctrl-Alt-BackSpace) �������"
-#: ../../Xconfigurator.pm_.c:1000
+#: ../../Xconfigurator.pm_.c:1001
msgid "X at startup"
msgstr "X �������� �� ������"
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1002
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -461,7 +461,7 @@ msgstr "�������"
msgid "compact"
msgstr "�������"
-#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:776
+#: ../../any.pm_.c:82 ../../install_steps_interactive.pm_.c:787
msgid "Delay before booting default image"
msgstr "����� ��� �������� default image-�"
@@ -469,26 +469,26 @@ msgstr "����� ��� �������� default image-�"
msgid "Video mode"
msgstr "����� ���"
-#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:508
-#: ../../install_steps_interactive.pm_.c:620
-#: ../../install_steps_interactive.pm_.c:672
-#: ../../install_steps_interactive.pm_.c:778 ../../printerdrake.pm_.c:84
+#: ../../any.pm_.c:85 ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:631
+#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:789 ../../printerdrake.pm_.c:84
#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "�������"
-#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:621
-#: ../../install_steps_interactive.pm_.c:673
-#: ../../install_steps_interactive.pm_.c:779
+#: ../../any.pm_.c:86 ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:790
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "������� (��������)"
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:780
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:791
msgid "Restrict command line options"
msgstr "���������� �������� ������ - ������"
-#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:780
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:791
msgid "restrict"
msgstr "����������"
@@ -496,22 +496,22 @@ msgstr "����������"
msgid "LILO main options"
msgstr "LILO ������ ������"
-#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:787
+#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:798
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"����ja``���������� �������� ������ - ������'' �� ������������� ��� �������"
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:788
+#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:641
+#: ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:799
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "�������� ������"
-#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:686
-#: ../../install_steps_interactive.pm_.c:788
+#: ../../any.pm_.c:97 ../../install_steps_interactive.pm_.c:641
+#: ../../install_steps_interactive.pm_.c:697
+#: ../../install_steps_interactive.pm_.c:799
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "������������� �������"
@@ -524,14 +524,14 @@ msgstr ""
"��� �� ��������� ������ � LILO-�.\n"
"������ ������ ���� ��� �������� �����."
-#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:799
-#: ../../printerdrake.pm_.c:239 ../../standalone/rpmdrake_.c:302
+#: ../../any.pm_.c:109 ../../install_steps_interactive.pm_.c:810
+#: ../../printerdrake.pm_.c:242 ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "�����"
#: ../../any.pm_.c:109 ../../diskdrake.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:666
-#: ../../install_steps_interactive.pm_.c:799 ../../printerdrake.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:677
+#: ../../install_steps_interactive.pm_.c:810 ../../printerdrake.pm_.c:242
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "�������"
@@ -548,24 +548,24 @@ msgstr "����� ��-��� (Windows,BSD,BeOS,...)"
msgid "Which type of entry do you want to add?"
msgstr "���� ����� ����a ����j��e ?"
-#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:824
+#: ../../any.pm_.c:137 ../../install_steps_interactive.pm_.c:835
msgid "Image"
msgstr "Image"
#: ../../any.pm_.c:138 ../../any.pm_.c:146
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:837
msgid "Root"
msgstr "Root"
-#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:827
+#: ../../any.pm_.c:139 ../../install_steps_interactive.pm_.c:838
msgid "Append"
msgstr "�����a�"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:828
+#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:839
msgid "Initrd"
msgstr "Initrd"
-#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:829
+#: ../../any.pm_.c:141 ../../install_steps_interactive.pm_.c:840
msgid "Read-write"
msgstr "������-������ RW"
@@ -577,29 +577,29 @@ msgstr "������"
msgid "Unsafe"
msgstr "���������"
-#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:836
+#: ../../any.pm_.c:153 ../../install_steps_interactive.pm_.c:847
msgid "Label"
msgstr "������"
-#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:838
+#: ../../any.pm_.c:155 ../../install_steps_interactive.pm_.c:849
msgid "Default"
msgstr "�������������"
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:652
-#: ../../install_steps_interactive.pm_.c:618
-#: ../../install_steps_interactive.pm_.c:841 ../../interactive.pm_.c:74
+#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:654
+#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:852 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:99
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:198
-#: ../../my_gtk.pm_.c:457 ../../my_gtk.pm_.c:632 ../../printerdrake.pm_.c:266
+#: ../../my_gtk.pm_.c:457 ../../my_gtk.pm_.c:632 ../../printerdrake.pm_.c:269
msgid "Ok"
msgstr "� ����"
-#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:841
+#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:852
msgid "Remove entry"
msgstr "������� ����"
-#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:844
+#: ../../any.pm_.c:161 ../../install_steps_interactive.pm_.c:855
msgid "Empty label not allowed"
msgstr "������ ������ ���� ���������"
@@ -1014,7 +1014,7 @@ msgstr "�����������"
msgid "Formatting loopback file %s"
msgstr "����������� loopback ��j�a %s"
-#: ../../diskdrake.pm_.c:504 ../../install_steps_interactive.pm_.c:247
+#: ../../diskdrake.pm_.c:504 ../../install_steps_interactive.pm_.c:248
#, c-format
msgid "Formatting partition %s"
msgstr "����������� ��������� %s"
@@ -1082,8 +1082,7 @@ msgstr "����� ������� �������e �������j� ��� ������ �� ���� ���������"
msgid "Choose the new size"
msgstr "��������� ���� ��������"
-#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../diskdrake.pm_.c:589
msgid "MB"
msgstr "MB"
@@ -1278,7 +1277,26 @@ msgid ""
"system.\n"
" But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
"DOING!\n"
+msgstr ""
+"���������:\n"
+"\n"
+" - �����������: ������� ����� �� ���� ����������� Linux.\n"
+"\n"
+"\n"
+" - �� ������������ (Customized): ������� ��� �������� �� �������� ���� ����\n"
+"�� ��������� ������,����������� ��� ������ ��� �����������.\n"
+"��������� \"������\" ����������� ��� ����������� ��������� ��������\n"
+"������ �������� \"�����������\" ����������� ������� ���� �� �����������\n"
+"�������� ��������, ��� \"������\" ������� ������ �� ��������� ����������\n"
+"������ ������ (�� ����, ��������...)\n"
"\n"
+"\n"
+" - �������: ������� ��� ����� �������� GNU/Linux � ������ ��������\n"
+"�������� ����������� ���� �� ��� ����� ��� �� ���. ���� ���� ��������\n"
+"��������� ������� ��� \"�����������\"."
+
+#: ../../help.pm_.c:38
+msgid ""
"The different choices for your machine's usage (provided, hence, that you "
"have\n"
"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
@@ -1304,7 +1322,7 @@ msgid ""
" such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
msgstr ""
-#: ../../help.pm_.c:57
+#: ../../help.pm_.c:59
msgid ""
"DrakX will attempt at first to look for one or more PCI\n"
"SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n"
@@ -1350,7 +1368,7 @@ msgstr ""
"�� Windows-� ��� �� ����� �� ��������, �� ������ �� ��� ��������\n"
"���������� ��������."
-#: ../../help.pm_.c:81
+#: ../../help.pm_.c:83
msgid ""
"At this point, you may choose what partition(s) to use to install\n"
"your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1425,7 +1443,7 @@ msgstr ""
"\n"
"- Ctrl-m �� ���e���a�� �a��� ������a�a \n"
-#: ../../help.pm_.c:118
+#: ../../help.pm_.c:120
msgid ""
"Any partitions that have been newly defined must be formatted for\n"
"use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1441,7 +1459,7 @@ msgstr ""
"������� ������ �� �������� ������� �� ����. ��� �� ������ ������\n"
"� /home � /usr/local ���������������."
-#: ../../help.pm_.c:126
+#: ../../help.pm_.c:128
msgid ""
"You may now select the group of packages you wish to\n"
"install or upgrade.\n"
@@ -1457,14 +1475,14 @@ msgid ""
"through more than 1000 packages..."
msgstr ""
-#: ../../help.pm_.c:137
+#: ../../help.pm_.c:139
msgid ""
"If you have all the CDs in the list above, 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 ""
-#: ../../help.pm_.c:142
+#: ../../help.pm_.c:144
msgid ""
"The packages selected are now being installed. This operation\n"
"should take a few minutes unless you have chosen to upgrade an\n"
@@ -1475,7 +1493,7 @@ msgstr ""
"�������� ������ ������� ����� �������� ��������� �����������\n"
"�� ��������� ������. � ��� ������� �������� �� ����� ���� �������."
-#: ../../help.pm_.c:148
+#: ../../help.pm_.c:150
msgid ""
"If DrakX failed to find your mouse, or if you want to\n"
"check what it has done, you will be presented the list of mice\n"
@@ -1503,7 +1521,7 @@ msgstr ""
"� ������� �� ����� �������� ���, �������� �������� � DrakX-� �� ����\n"
"�������� ���� �� ���������."
-#: ../../help.pm_.c:163
+#: ../../help.pm_.c:165
msgid ""
"Please select the correct port. For example, the COM1 port under MS Windows\n"
"is named ttyS0 under Linux."
@@ -1511,7 +1529,7 @@ msgstr ""
"�����, ��������� ������������ ����. �� ������, COM1 ���� � MS Windows-�\n"
"� ������� ��� ������ ttyS0"
-#: ../../help.pm_.c:167
+#: ../../help.pm_.c:169
msgid ""
"This section is dedicated to configuring a local area\n"
"network (LAN) or a modem.\n"
@@ -1565,7 +1583,7 @@ msgstr ""
"�������������. DrakX �� ������� �����, ������� �� �� �������, ������\n"
"�������� �������� ���� �� ���� �� ������� �����."
-#: ../../help.pm_.c:197
+#: ../../help.pm_.c:199
msgid ""
"Enter:\n"
"\n"
@@ -1597,7 +1615,7 @@ msgstr ""
"\"IP ������\". ������� ����� �������, ������������� ������ �������������� "
"��� ISP. \n"
-#: ../../help.pm_.c:212
+#: ../../help.pm_.c:214
msgid ""
"You may now enter dialup options. If you're not sure what to enter, the\n"
"correct information can be obtained from your ISP."
@@ -1605,7 +1623,7 @@ msgstr ""
"���� ������� dialup ������. ������� ����� ������� ��� �� �������,\n"
"�������� ����������� ���� ������� ��� ����� ISP."
-#: ../../help.pm_.c:216
+#: ../../help.pm_.c:218
msgid ""
"If you will use proxies, please configure them now. If you don't know if\n"
"you should use proxies, ask your network administrator or your ISP."
@@ -1613,7 +1631,7 @@ msgstr ""
"������� ��������� ��������, ������������� �� ����. ������� �� �����\n"
"�� �� ���� �� ���������, ����������� ������ �������������� ��� ISP."
-#: ../../help.pm_.c:220
+#: ../../help.pm_.c:222
msgid ""
"You can install cryptographic package if your internet connection has been\n"
"set up correctly. First choose a mirror where you wish to download packages "
@@ -1628,7 +1646,7 @@ msgstr ""
"� ����� ���� �������� ������ ���� ���� �����������.\n"
"������ �������� mirror � ������ ����� ������ ������ � ��������."
-#: ../../help.pm_.c:228
+#: ../../help.pm_.c:230
msgid ""
"You can now select your timezone according to where you live.\n"
"\n"
@@ -1642,7 +1660,7 @@ msgstr ""
"Linux ���� ����� � GMT ��� \"Greeenwich Mean Time\" � ������� �� �\n"
"������� ����� ��������� � ����� �������� ��������� ����."
-#: ../../help.pm_.c:235
+#: ../../help.pm_.c:237
msgid ""
"You may now choose which services you want to see started at boot time.\n"
"When your mouse comes over an item, a small balloon help will popup which\n"
@@ -1653,7 +1671,7 @@ msgid ""
"want."
msgstr ""
-#: ../../help.pm_.c:244
+#: ../../help.pm_.c:246
msgid ""
"Linux can deal with many types of printer. Each of these\n"
"types require a different setup. Note however that the print\n"
@@ -1710,7 +1728,7 @@ msgstr ""
"�� ��� �������� �� �� ���������� ��������, � ������� ��� ��������. ����\n"
"�������� �� �������� � �� NetWare ��������, ������ ����� ����� �����."
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:275
msgid ""
"You can now enter the root password for your Linux-Mandrake\n"
"system. The password must be entered twice to verify that both\n"
@@ -1741,7 +1759,7 @@ msgstr ""
"*������* �� �� ��������� �� �����. �� ������� ������� ������� �����\n"
"� �������������, ��� �� ������ �������� ��� ����� ������."
-#: ../../help.pm_.c:289
+#: ../../help.pm_.c:291
msgid ""
"To enable a more secure system, you should select \"Use shadow file\" and\n"
"\"Use MD5 passwords\"."
@@ -1749,7 +1767,7 @@ msgstr ""
"�� �� ��������� ���� ��������� �������, ��������� \"������� shadow ����\" �\n"
"\"Use MD5 passwords\"."
-#: ../../help.pm_.c:293
+#: ../../help.pm_.c:295
msgid ""
"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
"network administrator."
@@ -1757,7 +1775,7 @@ msgstr ""
"������� ��� ������� ������� NIS, ��������� \"������� NIS\". ������� �����\n"
"������� ������������� ����� ��������������."
-#: ../../help.pm_.c:297
+#: ../../help.pm_.c:299
msgid ""
"You may now create one or more \"regular\" user account(s), as\n"
"opposed to the \"privileged\" user account, root. You can create\n"
@@ -1796,7 +1814,7 @@ msgstr ""
"���� �������� ����, � root ����� ��������� ���� ��� �������������� ���\n"
"��������� �������."
-#: ../../help.pm_.c:316
+#: ../../help.pm_.c:318
msgid ""
"It is strongly recommended that you answer \"Yes\" here. If you install\n"
"Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1807,7 +1825,7 @@ msgstr ""
"�� �������� ������� �� �� ��� ������� ���� boot ������.\n"
"������� ����� ��������� ������� �������, ������ ���� ���� ������ Linux."
-#: ../../help.pm_.c:322
+#: ../../help.pm_.c:324
msgid ""
"You need to indicate where you wish\n"
"to place the information required to boot to Linux.\n"
@@ -1823,7 +1841,7 @@ msgstr ""
"������� ������� ����� ��� ������,\n"
"��������� \"���� ������ ����� (MBR)\"."
-#: ../../help.pm_.c:330
+#: ../../help.pm_.c:332
#, fuzzy
msgid ""
"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
@@ -1832,7 +1850,7 @@ msgstr ""
"������� ���� ��������� ��������, ��������� ����� �� \"/dev/hda\"\n"
"(������ ���� �� ��������� ������)."
-#: ../../help.pm_.c:334
+#: ../../help.pm_.c:336
msgid ""
"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
"either Linux or any other operating system present on your computer.\n"
@@ -1846,7 +1864,7 @@ msgid ""
"in this case, you will need a boot disk in order to boot them!"
msgstr ""
-#: ../../help.pm_.c:346
+#: ../../help.pm_.c:348
#, fuzzy
msgid ""
"LILO and grub main options are:\n"
@@ -1894,7 +1912,7 @@ msgstr ""
" * ������: ������� �������� 80x25 ����� ���.\n"
" * <������>: ������� �������������� ����� ���."
-#: ../../help.pm_.c:365
+#: ../../help.pm_.c:367
msgid ""
"Now it's time to configure the X Window System, which is the\n"
"core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1921,7 +1939,7 @@ msgstr ""
"��� �������� ���� ����. ��� �� �� �������, ������� �� ����� �����\n"
"� ��������� ���������� ������ ��� ���� �� ��������."
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:380
msgid ""
"If something is wrong in X configuration, use these options to correctly\n"
"configure the X Window System."
@@ -1929,7 +1947,7 @@ msgstr ""
"������� �� ����� �������� � X �������������, ���������� ��� ������\n"
"�� �� �������� ��������� X Window ������."
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:384
msgid ""
"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
"\"No\"."
@@ -1937,7 +1955,7 @@ msgstr ""
"������� ���� ������ �������� � ��������� ����, ��������� \"��\".\n"
"� ��������� ��������� \"��\"."
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:388
#, fuzzy
msgid ""
"You can now select some miscellaneous options for your system.\n"
@@ -2002,7 +2020,7 @@ msgstr ""
"��������� ��� boot-���, ��������� ��� ������ (��������: Num Lock ��������\n"
"���� ������ ��� X-���, �� ������ !)."
-#: ../../help.pm_.c:415
+#: ../../help.pm_.c:417
msgid ""
"Your system is going to reboot.\n"
"\n"
@@ -2037,7 +2055,7 @@ msgstr "���������� ����"
msgid "Choose your keyboard"
msgstr "������� ���������"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:312
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:313
msgid "Miscellaneous"
msgstr "����� ������"
@@ -2077,8 +2095,8 @@ msgstr "������ �������"
msgid "Configure printer"
msgstr "������ �������"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:618
-#: ../../install_steps_interactive.pm_.c:619
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:630
msgid "Set root password"
msgstr "����� root �������"
@@ -2175,7 +2193,7 @@ msgstr "����� ����� ��������� %s"
msgid "Welcome to %s"
msgstr "�������� ��� %s"
-#: ../../install_steps.pm_.c:650
+#: ../../install_steps.pm_.c:715
msgid "No floppy drive available"
msgstr "������������� floppy ������"
@@ -2185,94 +2203,6 @@ msgstr "������������� floppy ������"
msgid "Entering step `%s'\n"
msgstr "�������� ����� `%s'\n"
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:247
-msgid "You must have a swap partition"
-msgstr "������ ����� swap ���������"
-
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:249
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"��, ���� swap ���������\n"
-"\n"
-"�������� ��������� ���� ?"
-
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "��������� �������� ���������� �� �����������"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "������ ��������: "
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:443
-#: ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "�����ja: %s\n"
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:444
-#: ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "��������: %d KB\n"
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:357
-msgid "Choose the packages you want to install"
-msgstr "������� ������ �� �����������"
-
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:360
-msgid "Info"
-msgstr "����"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:365
-#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "����������"
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:514
-#: ../../install_steps_interactive.pm_.c:360
-msgid "Installing"
-msgstr "����������"
-
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:520
-msgid "Please wait, "
-msgstr "����� ���������"
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:522
-msgid "Time remaining "
-msgstr "��������� �����"
-
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:523
-msgid "Total time "
-msgstr "������ �����"
-
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:532
-#: ../../install_steps_interactive.pm_.c:360
-msgid "Preparing installation"
-msgstr "��������� �����������"
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:547
-#, c-format
-msgid "Installing package %s"
-msgstr "���������� ����� %s"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:585
-#: ../../install_steps_gtk.pm_.c:589
-msgid "Go on anyway?"
-msgstr "�������� ��������� ���� ?"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:585
-msgid "There was an error ordering packages:"
-msgstr "������ � ����� ������:"
-
-#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:964
-msgid "Use existing configuration for X11?"
-msgstr "�� �������� ��������� ������������� �� X11 ?"
-
#: ../../install_steps_gtk.pm_.c:154
#, fuzzy
msgid "Please, choose one of the following classes of installation:"
@@ -2312,6 +2242,20 @@ msgstr ""
msgid "Automatic resizing failed"
msgstr "���������� ������ �������� ��������"
+#: ../../install_steps_gtk.pm_.c:247
+msgid "You must have a swap partition"
+msgstr "������ ����� swap ���������"
+
+#: ../../install_steps_gtk.pm_.c:249
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"��, ���� swap ���������\n"
+"\n"
+"�������� ��������� ���� ?"
+
#: ../../install_steps_gtk.pm_.c:259
#, fuzzy
msgid "Which partition do you want to use to put Linux4Win?"
@@ -2367,73 +2311,126 @@ msgstr "���� ���� �� ���������� ������ � ������� ������"
msgid "Percentage of packages to install"
msgstr "������ �� �����������"
-#: ../../install_steps_gtk.pm_.c:369
+#: ../../install_steps_gtk.pm_.c:358
+msgid "Choose the packages you want to install"
+msgstr "������� ������ �� �����������"
+
+#: ../../install_steps_gtk.pm_.c:361
+msgid "Info"
+msgstr "����"
+
+#: ../../install_steps_gtk.pm_.c:366 ../../install_steps_interactive.pm_.c:124
+#: ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "����������"
+
+#: ../../install_steps_gtk.pm_.c:370
msgid "Automatic dependencies"
msgstr "���������a ���������"
-#: ../../install_steps_gtk.pm_.c:422 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr "��������� ������"
-#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr "������ ������"
-#: ../../install_steps_gtk.pm_.c:424
+#: ../../install_steps_gtk.pm_.c:425
msgid "Toggle between flat and group sorted"
msgstr "����j��: ����� ��� ������ ���������"
-#: ../../install_steps_gtk.pm_.c:442
+#: ../../install_steps_gtk.pm_.c:443
msgid "Bad package"
msgstr "��� �����"
-#: ../../install_steps_gtk.pm_.c:445
+#: ../../install_steps_gtk.pm_.c:444
+#, c-format
+msgid "Name: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:445 ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "�����ja: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:446 ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "��������: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:447
#, c-format
msgid "Importance: %s\n"
msgstr "�a���: %s\n"
-#: ../../install_steps_gtk.pm_.c:456
+#: ../../install_steps_gtk.pm_.c:458
#, c-format
msgid "Total size: %d / %d MB"
msgstr "������ ��������: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:469
msgid "This is a mandatory package, it can't be unselected"
msgstr "��� j� �������� �����,� �� ���e ���� �� ����������"
-#: ../../install_steps_gtk.pm_.c:469
+#: ../../install_steps_gtk.pm_.c:471
msgid "You can't unselect this package. It is already installed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_gtk.pm_.c:475
msgid "The following packages are going to be installed/removed"
msgstr "����e�� ������ �� ���� �����������/���������"
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:484
msgid "You can't select/unselect this package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:517
+#: ../../install_steps_gtk.pm_.c:516 ../../install_steps_interactive.pm_.c:361
+msgid "Installing"
+msgstr "����������"
+
+#: ../../install_steps_gtk.pm_.c:519
msgid "Estimating"
msgstr "����������"
-#: ../../install_steps_gtk.pm_.c:529 ../../interactive.pm_.c:84
-#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:50
-#: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
+#: ../../install_steps_gtk.pm_.c:522
+msgid "Please wait, "
+msgstr "����� ���������"
+
+#: ../../install_steps_gtk.pm_.c:524
+msgid "Time remaining "
+msgstr "��������� �����"
+
+#: ../../install_steps_gtk.pm_.c:525
+msgid "Total time "
+msgstr "������ �����"
+
+#: ../../install_steps_gtk.pm_.c:531 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
+#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
#: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:457
msgid "Cancel"
msgstr "��������"
-#: ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:534 ../../install_steps_interactive.pm_.c:361
+msgid "Preparing installation"
+msgstr "��������� �����������"
+
+#: ../../install_steps_gtk.pm_.c:544
#, c-format
msgid "%d packages"
msgstr "%d ������"
-#: ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:544
msgid ", %U MB"
msgstr ", %U MB"
-#: ../../install_steps_gtk.pm_.c:573
+#: ../../install_steps_gtk.pm_.c:549
+#, c-format
+msgid "Installing package %s"
+msgstr "���������� ����� %s"
+
+#: ../../install_steps_gtk.pm_.c:575
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2447,7 +2444,15 @@ msgstr ""
"������e �a� Cd ���a��� �� \"%s\" � ����� � ���������� Ok ���a ��� �������.\n"
"������� �� ������ ���������� Cancel."
-#: ../../install_steps_gtk.pm_.c:589
+#: ../../install_steps_gtk.pm_.c:587 ../../install_steps_gtk.pm_.c:591
+msgid "Go on anyway?"
+msgstr "�������� ��������� ���� ?"
+
+#: ../../install_steps_gtk.pm_.c:587
+msgid "There was an error ordering packages:"
+msgstr "������ � ����� ������:"
+
+#: ../../install_steps_gtk.pm_.c:591
#, fuzzy
msgid "There was an error installing packages:"
msgstr "������ � ����� ������:"
@@ -2483,7 +2488,7 @@ msgid "What is the root partition (/) of your system?"
msgstr "�� ����� ��������� �� root �������ja (/) ����� �������?"
#: ../../install_steps_interactive.pm_.c:99
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:135
msgid "Install Class"
msgstr "����������� �����"
@@ -2504,6 +2509,7 @@ msgid "Recommended"
msgstr "�����������"
#: ../../install_steps_interactive.pm_.c:109
+#: ../../install_steps_interactive.pm_.c:119
msgid "Customized"
msgstr "����� �� ����"
@@ -2515,21 +2521,19 @@ msgstr "�������"
#: ../../install_steps_interactive.pm_.c:117
msgid ""
"Are you sure you are an expert? \n"
-"Hey no kidding, you will be allowed to make powerfull but dangerous things "
-"here."
+"You will be allowed to make powerfull but dangerous things here."
msgstr ""
"�� �� ��� ������� ������� !? \n"
"X�j,��� ����,j�� ����j��e ������� ������ ��� ������� ��������."
-#: ../../install_steps_interactive.pm_.c:119
-#: ../../install_steps_interactive.pm_.c:130
-msgid "Normal"
-msgstr "������"
-
#: ../../install_steps_interactive.pm_.c:124
msgid "Upgrade"
msgstr "���������"
+#: ../../install_steps_interactive.pm_.c:130
+msgid "Normal"
+msgstr "������"
+
#: ../../install_steps_interactive.pm_.c:131
msgid "Development"
msgstr "��������"
@@ -2538,105 +2542,105 @@ msgstr "��������"
msgid "Server"
msgstr "������"
-#: ../../install_steps_interactive.pm_.c:135
+#: ../../install_steps_interactive.pm_.c:136
#, fuzzy
msgid "Which usage is your system used for ?"
msgstr "��ja �� ���� ��������� ���� ?"
-#: ../../install_steps_interactive.pm_.c:146
+#: ../../install_steps_interactive.pm_.c:147
#, fuzzy
msgid "Please, choose the type of your mouse."
msgstr "���� ��� ���� �����?"
-#: ../../install_steps_interactive.pm_.c:154 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:155 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr "���� �� ����"
-#: ../../install_steps_interactive.pm_.c:155
+#: ../../install_steps_interactive.pm_.c:156
#, fuzzy
msgid "Please choose on which serial port your mouse is connected to."
msgstr "�� ���� �������� ���� �� ��� ��� ���������?"
-#: ../../install_steps_interactive.pm_.c:166
+#: ../../install_steps_interactive.pm_.c:167
msgid "Configuring IDE"
msgstr "K������������ IDE"
-#: ../../install_steps_interactive.pm_.c:166
+#: ../../install_steps_interactive.pm_.c:167
msgid "IDE"
msgstr " IDE"
-#: ../../install_steps_interactive.pm_.c:176
+#: ../../install_steps_interactive.pm_.c:177
msgid "no available partitions"
msgstr "���� ��������� �������ja"
-#: ../../install_steps_interactive.pm_.c:178
+#: ../../install_steps_interactive.pm_.c:179
#, c-format
msgid "(%dMB)"
msgstr "(%dMB)"
-#: ../../install_steps_interactive.pm_.c:185
+#: ../../install_steps_interactive.pm_.c:186
#, fuzzy
msgid "Please choose a partition to use as your root partition."
msgstr "���� ��������� ������ �� �������� ��� root ���������"
-#: ../../install_steps_interactive.pm_.c:192
+#: ../../install_steps_interactive.pm_.c:193
msgid "Choose the mount points"
msgstr "��������� ����� ���������"
-#: ../../install_steps_interactive.pm_.c:204
+#: ../../install_steps_interactive.pm_.c:205
msgid "You need to reboot for the partition table modifications to take place"
msgstr "����� �� ���������� ������ �� ������� ������ � ������ �������ja"
-#: ../../install_steps_interactive.pm_.c:230
+#: ../../install_steps_interactive.pm_.c:231
msgid "Choose the partitions you want to format"
msgstr "������� ��������� �� �����������"
-#: ../../install_steps_interactive.pm_.c:234
+#: ../../install_steps_interactive.pm_.c:235
msgid "Check bad blocks?"
msgstr "������� ���� ������� ?"
-#: ../../install_steps_interactive.pm_.c:242
+#: ../../install_steps_interactive.pm_.c:243
msgid "Formatting partitions"
msgstr "����������� ���������"
-#: ../../install_steps_interactive.pm_.c:246
-#, c-format
-msgid "Creating and formatting loopback file %s"
+#: ../../install_steps_interactive.pm_.c:247
+#, fuzzy, c-format
+msgid "Creating and formatting file %s"
msgstr "�����a�� � ��������a�� loopback ��j�a %s"
-#: ../../install_steps_interactive.pm_.c:249
+#: ../../install_steps_interactive.pm_.c:250
msgid "Not enough swap to fulfill installation, please add some"
msgstr "���� ������� swap-� �� ������ �����������, ������� ��� swap-�"
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:256
msgid "Looking for available packages"
msgstr "������ ������"
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:262
msgid "Finding packages to upgrade"
msgstr "������ ������ �� ���������..."
-#: ../../install_steps_interactive.pm_.c:311
+#: ../../install_steps_interactive.pm_.c:312
msgid "Package Group Selection"
msgstr "������ ����� ������"
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:315
msgid "Individual package selection"
msgstr "��j����a��� ���a�� �����a"
-#: ../../install_steps_interactive.pm_.c:344
+#: ../../install_steps_interactive.pm_.c:345
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:347
+#: ../../install_steps_interactive.pm_.c:348
#, fuzzy, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "Cd-Rom ��. %s"
-#: ../../install_steps_interactive.pm_.c:369
+#: ../../install_steps_interactive.pm_.c:370
msgid ""
"Installing package %s\n"
"%d%%"
@@ -2644,57 +2648,57 @@ msgstr ""
"���������� ������ %s\n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:378
+#: ../../install_steps_interactive.pm_.c:379
msgid "Post-install configuration"
msgstr "���������������� �������������"
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:389
msgid "Keep the current IP configuration"
msgstr "������� ������ IP ���������"
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:390
msgid "Reconfigure network now"
msgstr "������������� �����"
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:391
msgid "Do not set up networking"
msgstr "����� ���������� �����"
-#: ../../install_steps_interactive.pm_.c:393
-#: ../../install_steps_interactive.pm_.c:398
+#: ../../install_steps_interactive.pm_.c:394
+#: ../../install_steps_interactive.pm_.c:399
msgid "Network Configuration"
msgstr "������ ����������"
-#: ../../install_steps_interactive.pm_.c:394
+#: ../../install_steps_interactive.pm_.c:395
msgid "Local networking has already been configured. Do you want to:"
msgstr "������� ����� �� ��� ��������. �� �� ������ ��:"
-#: ../../install_steps_interactive.pm_.c:399
+#: ../../install_steps_interactive.pm_.c:400
#, fuzzy
msgid "Do you want to configure a local network for your system?"
msgstr "�� �� ������ �� �������� LAN ����� �� ��� ������?"
-#: ../../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:406
msgid "no network card found"
msgstr "���� ��������� ������ �������"
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:429
msgid "Modem Configuration"
msgstr "K������������ �����a"
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:430
#, fuzzy
msgid ""
"Do you want to configure a dialup connection with modem for your system?"
msgstr "�� �� ������ �� �������� Dialup �� ����� �� ��� ������?"
-#: ../../install_steps_interactive.pm_.c:441
#: ../../install_steps_interactive.pm_.c:442
+#: ../../install_steps_interactive.pm_.c:443
#, c-format
msgid "Configuring network device %s"
msgstr "���������� ������� �����ja %s"
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:444
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -2704,31 +2708,31 @@ msgstr ""
"����� ������ ����� �� ���� tavka ����� �� ���� ����� ���\n"
"IP ������ (�� ������, 123.45.67.89)."
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "Automatic IP"
msgstr "���������� IP"
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "IP address:"
msgstr "IP ������:"
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:447
msgid "Netmask:"
msgstr "������ �����:"
-#: ../../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:448
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../install_steps_interactive.pm_.c:453 ../../printerdrake.pm_.c:88
+#: ../../install_steps_interactive.pm_.c:454 ../../printerdrake.pm_.c:88
msgid "IP address should be in format 1.2.3.4"
msgstr "IP ������ ����� �� ���� � ������� 1.2.3.4"
-#: ../../install_steps_interactive.pm_.c:471
+#: ../../install_steps_interactive.pm_.c:472
msgid "Configuring network"
msgstr "���������� �����"
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:473
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2740,80 +2744,80 @@ msgstr ""
"��� �� ��. ``mybox.mylab.myco.com''.\n"
"��� ������ �������� 'nameserver'-�, �������� �� ���� ������."
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "DNS server:"
msgstr "DNS ������:"
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Gateway device:"
msgstr "Gateway ������:"
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Gateway:"
msgstr "Gateway:"
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:477
msgid "Host name:"
msgstr "��� �����:"
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:490
msgid "Try to find a modem?"
msgstr "�� �������� ����� ?"
-#: ../../install_steps_interactive.pm_.c:499
+#: ../../install_steps_interactive.pm_.c:500
#, fuzzy
msgid "Please choose which serial port your modem is connected to."
msgstr "�� ���� �� �������� ���� ����� ������� ?"
-#: ../../install_steps_interactive.pm_.c:504
+#: ../../install_steps_interactive.pm_.c:506
msgid "Dialup options"
msgstr "Dialup ������"
-#: ../../install_steps_interactive.pm_.c:505
+#: ../../install_steps_interactive.pm_.c:507
msgid "Connection name"
msgstr "��� ���������"
-#: ../../install_steps_interactive.pm_.c:506
+#: ../../install_steps_interactive.pm_.c:508
msgid "Phone number"
msgstr "���� ��������"
-#: ../../install_steps_interactive.pm_.c:507
+#: ../../install_steps_interactive.pm_.c:509
msgid "Login ID"
msgstr "ID �� ��������"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Authentication"
msgstr "�������������ja"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "CHAP"
msgstr "CHAP"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "PAP"
msgstr "PAP"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Script-based"
msgstr "�������� �� �������"
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:511
msgid "Terminal-based"
msgstr "�������� �� ���������"
-#: ../../install_steps_interactive.pm_.c:510
+#: ../../install_steps_interactive.pm_.c:512
msgid "Domain name"
msgstr "��� ������"
-#: ../../install_steps_interactive.pm_.c:512
+#: ../../install_steps_interactive.pm_.c:514
msgid "First DNS Server"
msgstr "���� DNS ������"
-#: ../../install_steps_interactive.pm_.c:513
+#: ../../install_steps_interactive.pm_.c:515
msgid "Second DNS Server"
msgstr "����� DNS ������"
-#: ../../install_steps_interactive.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:528
#, fuzzy
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
@@ -2870,89 +2874,89 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:557
+#: ../../install_steps_interactive.pm_.c:559
msgid "Choose a mirror from which to get the packages"
msgstr "��������� mirror �� ��� ���� ������� ������"
-#: ../../install_steps_interactive.pm_.c:564
+#: ../../install_steps_interactive.pm_.c:567
msgid "Contacting the mirror to get the list of available packages"
msgstr "������������� mirror �� ����� ������� ������"
-#: ../../install_steps_interactive.pm_.c:568
+#: ../../install_steps_interactive.pm_.c:571
#, fuzzy
msgid "Please choose the packages you want to install."
msgstr "������� ������ �� �����������"
-#: ../../install_steps_interactive.pm_.c:579
+#: ../../install_steps_interactive.pm_.c:585
msgid "Which is your timezone?"
msgstr "��ja �� ���� ��������� ���� ?"
-#: ../../install_steps_interactive.pm_.c:580
+#: ../../install_steps_interactive.pm_.c:586
msgid "Is your hardware clock set to GMT?"
msgstr "�� �� �� ��� ��������� (BIOS) �������� ������� �� GMT ?"
-#: ../../install_steps_interactive.pm_.c:618
+#: ../../install_steps_interactive.pm_.c:629
msgid "No password"
msgstr "���� �������"
-#: ../../install_steps_interactive.pm_.c:623
+#: ../../install_steps_interactive.pm_.c:634
msgid "Use shadow file"
msgstr "������� shadow ����"
-#: ../../install_steps_interactive.pm_.c:623
+#: ../../install_steps_interactive.pm_.c:634
msgid "shadow"
msgstr "shadow"
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:635
msgid "MD5"
msgstr "MD5"
-#: ../../install_steps_interactive.pm_.c:624
+#: ../../install_steps_interactive.pm_.c:635
msgid "Use MD5 passwords"
msgstr "������� MD5 �������"
-#: ../../install_steps_interactive.pm_.c:626
+#: ../../install_steps_interactive.pm_.c:637
msgid "Use NIS"
msgstr "������� NIS"
-#: ../../install_steps_interactive.pm_.c:626
+#: ../../install_steps_interactive.pm_.c:637
msgid "yellow pages"
msgstr "���� ��������"
-#: ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_interactive.pm_.c:643
#, 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:639
+#: ../../install_steps_interactive.pm_.c:650
msgid "Authentification NIS"
msgstr "�������������� NIS"
-#: ../../install_steps_interactive.pm_.c:640
+#: ../../install_steps_interactive.pm_.c:651
msgid "NIS Domain"
msgstr "NIS ������"
-#: ../../install_steps_interactive.pm_.c:640
+#: ../../install_steps_interactive.pm_.c:651
msgid "NIS Server"
msgstr "NIS ������"
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:677
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "�������� ���������"
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:677
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "����� ���������"
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:678
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "(��� ������� %s)"
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:678
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -2962,60 +2966,60 @@ msgstr ""
"����� ���������\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:680
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "����� ���"
-#: ../../install_steps_interactive.pm_.c:670 ../../printerdrake.pm_.c:83
+#: ../../install_steps_interactive.pm_.c:681 ../../printerdrake.pm_.c:83
#: ../../printerdrake.pm_.c:108 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "���������� ���"
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:686
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Shell"
-#: ../../install_steps_interactive.pm_.c:677
-#: ../../standalone/adduserdrake_.c:47
+#: ../../install_steps_interactive.pm_.c:688
+#: ../../standalone/adduserdrake_.c:47 ../../t.pm_.c:41
msgid "Icon"
msgstr "����a"
-#: ../../install_steps_interactive.pm_.c:687
+#: ../../install_steps_interactive.pm_.c:698
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "��� ������� �� ������� ������"
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:699
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "�������� ���������� ���"
-#: ../../install_steps_interactive.pm_.c:689
+#: ../../install_steps_interactive.pm_.c:700
#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "���������� ��� ���� �������� ���� ���� �����, �������, `-' � `_'"
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:701
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "��� ���������� ��� ��� �������"
-#: ../../install_steps_interactive.pm_.c:714
+#: ../../install_steps_interactive.pm_.c:725
msgid "First floppy drive"
msgstr "���� ����� ��e��j "
-#: ../../install_steps_interactive.pm_.c:715
+#: ../../install_steps_interactive.pm_.c:726
msgid "Second floppy drive"
msgstr "����� ����� ��e��j"
-#: ../../install_steps_interactive.pm_.c:716
+#: ../../install_steps_interactive.pm_.c:727
msgid "Skip"
msgstr "��������"
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:733
#, fuzzy
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -3036,37 +3040,37 @@ msgstr ""
"'������ �� ���������', ��� �������� �������� � ������� ���� ��������.\n"
"�� �� ����� �� �������� ������� ������� �� ��� ������?"
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:742
msgid "Sorry, no floppy drive available"
msgstr "�� ������, ���� floppy-�"
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:745
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
"���������� floppy ������ ���� ���� ��������� �� �������� ������ �������"
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../install_steps_interactive.pm_.c:750
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "������� ������ ������� � ������ %s"
-#: ../../install_steps_interactive.pm_.c:740
+#: ../../install_steps_interactive.pm_.c:751
msgid "Creating bootdisk"
msgstr "������� ������� ����..."
-#: ../../install_steps_interactive.pm_.c:752 ../../standalone/drakboot_.c:48
+#: ../../install_steps_interactive.pm_.c:763 ../../standalone/drakboot_.c:49
msgid "Installation of LILO failed. The following error occured:"
msgstr "���������ja LILO-� ��������. ������ ��:"
-#: ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:784
msgid "Do you want to use SILO?"
msgstr "�� �� ������ �� ��������� SILO ?"
-#: ../../install_steps_interactive.pm_.c:784
+#: ../../install_steps_interactive.pm_.c:795
msgid "SILO main options"
msgstr "SILO ������ ������"
-#: ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:808
msgid ""
"Here are the following entries in SILO.\n"
"You can add some more or change the existing ones."
@@ -3074,136 +3078,148 @@ msgstr ""
"��� �� ��������� ������ � SILO-�.\n"
"������ ������ ���� ��� �������� �����."
-#: ../../install_steps_interactive.pm_.c:825
+#: ../../install_steps_interactive.pm_.c:836
msgid "Partition"
msgstr "�������ja"
-#: ../../install_steps_interactive.pm_.c:845
+#: ../../install_steps_interactive.pm_.c:856
msgid "This label is already in use"
msgstr "��� ������ �� ��� � ��������"
-#: ../../install_steps_interactive.pm_.c:858
+#: ../../install_steps_interactive.pm_.c:869
msgid "Installation of SILO failed. The following error occured:"
msgstr "���������ja SILO-� ��������. ������ ��:"
-#: ../../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:879
msgid "Preparing bootloader"
msgstr "��������� �������..."
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:887
msgid "Do you want to use aboot?"
msgstr "�� �� ������ �� ��������� aboot ?"
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:890
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:907
msgid "Proxies configuration"
msgstr "�����������ja proxy-ja"
-#: ../../install_steps_interactive.pm_.c:897
+#: ../../install_steps_interactive.pm_.c:908
msgid "HTTP proxy"
msgstr "HTTP proxy"
-#: ../../install_steps_interactive.pm_.c:898
+#: ../../install_steps_interactive.pm_.c:909
msgid "FTP proxy"
msgstr "FTP proxy"
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:915
msgid "Proxy should be http://..."
msgstr "Proxy ����� �� ���� http://..."
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:916
msgid "Proxy should be ftp://..."
msgstr "Proxy ����� �� ���� ftp://..."
-#: ../../install_steps_interactive.pm_.c:915 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:926 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "�������� ��� Crackers-�"
-#: ../../install_steps_interactive.pm_.c:916 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:927 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "�����"
-#: ../../install_steps_interactive.pm_.c:917 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:928 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:918 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:929 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "������"
-#: ../../install_steps_interactive.pm_.c:919 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:930 ../../standalone/draksec_.c:24
msgid "High"
msgstr "������"
-#: ../../install_steps_interactive.pm_.c:920 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:931 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "����������"
-#: ../../install_steps_interactive.pm_.c:933
+#: ../../install_steps_interactive.pm_.c:944
msgid "Miscellaneous questions"
msgstr "����a ������"
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:945
msgid "(may cause data corruption)"
msgstr "(���� ���������� ������)"
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:945
msgid "Use hard drive optimisations?"
msgstr "��������� ���� ���� ������������ ?"
-#: ../../install_steps_interactive.pm_.c:935 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:946 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "��������� ���������� ����"
-#: ../../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:947
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "�������� �������� RAM ��� �� �������� (����������� �� %d MB)"
-#: ../../install_steps_interactive.pm_.c:937
+#: ../../install_steps_interactive.pm_.c:948
msgid "Removable media automounting"
msgstr "������������� ���������� ����ja"
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:950
msgid "Clean /tmp at each boot"
msgstr "������ /tmp ��� ������ boot-� "
-#: ../../install_steps_interactive.pm_.c:942
+#: ../../install_steps_interactive.pm_.c:953
msgid "Enable multi profiles"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../install_steps_interactive.pm_.c:955
msgid "Enable num lock at startup"
msgstr "��������� Num Lock ������ ��� ��������"
-#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:958
msgid "Give the ram size in MB"
msgstr "������� �������� RAM-� � Mb"
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:960
msgid "Can't use supermount in high security level"
msgstr "��j� ������ ���������� supermount ��� '������' ����������� �����"
-#: ../../install_steps_interactive.pm_.c:976
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Use existing configuration for X11?"
+msgstr "�� �������� ��������� ������������� �� X11 ?"
+
+#: ../../install_steps_interactive.pm_.c:980
+msgid ""
+"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
+"By default, the 3.3 server is used because it works on more graphic cards.\n"
+"\n"
+"Do you want to try XFree 4.0?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:993
+#: ../../install_steps_interactive.pm_.c:1144
msgid "Try to find PCI devices?"
msgstr "�� �� �� ������ PCI ������� ?"
-#: ../../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:1014
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "������� ������ ������� � ������ %s"
-#: ../../install_steps_interactive.pm_.c:1005
+#: ../../install_steps_interactive.pm_.c:1022
msgid "Creating auto install floppy"
msgstr "������� ���� ������������ �����"
-#: ../../install_steps_interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:1045
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -3213,7 +3229,7 @@ msgstr ""
"\n"
"�� �� ������� ������ �� �������� ?"
-#: ../../install_steps_interactive.pm_.c:1035
+#: ../../install_steps_interactive.pm_.c:1052
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -3235,26 +3251,26 @@ msgstr ""
"����������� � ������������� ����� ������� ������ ���� � ����-�������������\n"
"�������� ��������� Linux Mandrake '������ �� ���������'."
-#: ../../install_steps_interactive.pm_.c:1044
+#: ../../install_steps_interactive.pm_.c:1061
msgid "Shutting down"
msgstr "����� ������"
-#: ../../install_steps_interactive.pm_.c:1056
+#: ../../install_steps_interactive.pm_.c:1073
#, c-format
msgid "Installing driver for %s card %s"
msgstr "���������� ������� �� %s ������� %s"
-#: ../../install_steps_interactive.pm_.c:1057
+#: ../../install_steps_interactive.pm_.c:1074
#, c-format
msgid "(module %s)"
msgstr "(����� %s)"
-#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1084
#, c-format
msgid "Which %s driver should I try?"
msgstr "���� %s ������� �� ������?"
-#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1092
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -3270,20 +3286,20 @@ msgstr ""
"���� �� ������� ������� ������� �� ����, ��� �� �� ������� ��� ������?\n"
"������ �� �� �� ����� ��������� ��� �������, ��� ���� ������ ������� �����."
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Autoprobe"
msgstr "���������� �����"
-#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Specify options"
msgstr "�������� ������"
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1101
#, c-format
msgid "You may now provide its options to module %s."
msgstr "������ ������� ������ ������ �� ����� %s."
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1107
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -3294,11 +3310,11 @@ msgstr ""
"������ �� � ������� ``���=�������� ���2=��������2 ...''.\n"
"�� ������, ``io=0x300 irq=7''"
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1110
msgid "Module options:"
msgstr "������ ������:"
-#: ../../install_steps_interactive.pm_.c:1103
+#: ../../install_steps_interactive.pm_.c:1120
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -3307,50 +3323,55 @@ msgstr ""
"�������� ������ %s ��������.\n"
"�� �� ������ �������� ������ �� ������ ����������� ?"
-#: ../../install_steps_interactive.pm_.c:1116
+#: ../../install_steps_interactive.pm_.c:1133
msgid "Try to find PCMCIA cards?"
msgstr "�� �� �� ������ PCMCIA ������� ?"
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1134
msgid "Configuring PCMCIA cards..."
msgstr "������������ PCMCIA �������..."
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1134
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../../install_steps_interactive.pm_.c:1139
+#: ../../install_steps_interactive.pm_.c:1156
#, c-format
msgid "Found %s %s interfaces"
msgstr "��������� %s %s ���������a"
-#: ../../install_steps_interactive.pm_.c:1140
+#: ../../install_steps_interactive.pm_.c:1157
msgid "Do you have another one?"
msgstr "�� �� ����� ��� �����?"
-#: ../../install_steps_interactive.pm_.c:1141
+#: ../../install_steps_interactive.pm_.c:1158
#, c-format
msgid "Do you have any %s interfaces?"
msgstr "����� �� ��� %s ����������?"
-#: ../../install_steps_interactive.pm_.c:1143 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
#: ../../my_gtk.pm_.c:456 ../../printerdrake.pm_.c:123
msgid "No"
msgstr "��"
-#: ../../install_steps_interactive.pm_.c:1143 ../../interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:1160 ../../interactive.pm_.c:79
#: ../../my_gtk.pm_.c:456
msgid "Yes"
msgstr "��"
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm_.c:1161
msgid "See hardware info"
msgstr "�������� ����������� � ��������"
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../install_steps_interactive.pm_.c:1178
msgid "Bringing up the network"
msgstr "������� �����"
+#: ../../install_steps_interactive.pm_.c:1183
+#, fuzzy
+msgid "Bringing down the network"
+msgstr "������� �����"
+
#: ../../install_steps_newt.pm_.c:21
#, c-format
msgid "Linux-Mandrake Installation %s"
@@ -3631,34 +3652,34 @@ msgstr ""
#
# The lines must fit on screen, aka length < 80
#
-#: ../../lilo.pm_.c:430
+#: ../../lilo.pm_.c:428
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Dobrodosli u GRUB izbornik operativnog sistema !"
-#: ../../lilo.pm_.c:431
+#: ../../lilo.pm_.c:429
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "������� %c � %c ����� �� �� ���a���� �����"
-#: ../../lilo.pm_.c:432
+#: ../../lilo.pm_.c:430
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "���������� enter �� �����a�� ��������� OS,'e' �� ������� "
-#: ../../lilo.pm_.c:433
+#: ../../lilo.pm_.c:431
msgid "commands before booting, or 'c' for a command-line."
msgstr "������� ��� �����a�� �������,��� 'c' �� �������� ����j� "
-#: ../../lilo.pm_.c:434
+#: ../../lilo.pm_.c:432
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "���a���� ����� �� ������ ���������� ��%d ������� "
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../lilo.pm_.c:513
+#: ../../lilo.pm_.c:511
msgid "Desktop"
msgstr ""
-#: ../../lilo.pm_.c:513
+#: ../../lilo.pm_.c:511
msgid "Start Menu"
msgstr ""
@@ -3818,7 +3839,7 @@ msgstr "Mouse Systems (��������)"
msgid "Is this correct?"
msgstr "�� �� �� ��� �������� ?"
-#: ../../partition_table.pm_.c:532
+#: ../../partition_table.pm_.c:536
msgid ""
"You have a hole in your partition table but I can't use it.\n"
"The only solution is to move your primary partitions to have the hole next "
@@ -3828,21 +3849,21 @@ msgstr ""
"������ ������ �� �� �������� �������� ��������� ���� �� �������� ����\n"
"�� extended �������ja"
-#: ../../partition_table.pm_.c:620
+#: ../../partition_table.pm_.c:624
#, c-format
msgid "Error reading file %s"
msgstr "������ ��� �������� ����� %s"
-#: ../../partition_table.pm_.c:627
+#: ../../partition_table.pm_.c:631
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "�������� �� ����� %s ���� ������: %s"
-#: ../../partition_table.pm_.c:629
+#: ../../partition_table.pm_.c:633
msgid "Bad backup file"
msgstr "���� backup-���� ����"
-#: ../../partition_table.pm_.c:650
+#: ../../partition_table.pm_.c:654
#, c-format
msgid "Error writing to file %s"
msgstr "������ ��� ����� � ���� %s"
@@ -4048,68 +4069,68 @@ msgstr "���������� ��������"
msgid "What type of printer do you have?"
msgstr "���� ����� �������� �����?"
-#: ../../printerdrake.pm_.c:158
+#: ../../printerdrake.pm_.c:161
msgid "Printer options"
msgstr "������ ��������"
-#: ../../printerdrake.pm_.c:159
+#: ../../printerdrake.pm_.c:162
msgid "Paper Size"
msgstr "�������� ������"
-#: ../../printerdrake.pm_.c:160
+#: ../../printerdrake.pm_.c:163
msgid "Eject page after job?"
msgstr "������ ����� ����� ������ ?"
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:168
msgid "Uniprint driver options"
msgstr "Uniprint ������� -������"
-#: ../../printerdrake.pm_.c:166
+#: ../../printerdrake.pm_.c:169
msgid "Color depth options"
msgstr "����j� - ���� ��ja"
-#: ../../printerdrake.pm_.c:168
+#: ../../printerdrake.pm_.c:171
msgid "Print text as PostScript?"
msgstr ""
-#: ../../printerdrake.pm_.c:169
+#: ../../printerdrake.pm_.c:172
msgid "Reverse page order"
msgstr ""
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:174
msgid "Fix stair-stepping text?"
msgstr "��������� '����a� ���������' � ������?"
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:177
msgid "Number of pages per output pages"
msgstr ""
-#: ../../printerdrake.pm_.c:175
+#: ../../printerdrake.pm_.c:178
msgid "Right/Left margins in points (1/72 of inch)"
msgstr ""
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:179
msgid "Top/Bottom margins in points (1/72 of inch)"
msgstr ""
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:182
msgid "Extra GhostScript options"
msgstr ""
-#: ../../printerdrake.pm_.c:182
+#: ../../printerdrake.pm_.c:185
#, fuzzy
msgid "Extra Text options"
msgstr "����j� - ���� ��ja"
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:196
msgid "Do you want to test printing?"
msgstr "�� �� ������ �� ��������� �������?"
-#: ../../printerdrake.pm_.c:205
+#: ../../printerdrake.pm_.c:208
msgid "Printing test page(s)..."
msgstr "������� ���� �����(���)�..."
-#: ../../printerdrake.pm_.c:212
+#: ../../printerdrake.pm_.c:215
#, c-format
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
@@ -4126,7 +4147,7 @@ msgstr ""
"\n"
"�� �� ���� OK ?"
-#: ../../printerdrake.pm_.c:216
+#: ../../printerdrake.pm_.c:219
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
@@ -4136,15 +4157,15 @@ msgstr ""
"�� ���� ������� �� ����� �������� ������ ��������.\n"
"�� �� ���� OK ?"
-#: ../../printerdrake.pm_.c:232
+#: ../../printerdrake.pm_.c:235
msgid "Printer"
msgstr "�������"
-#: ../../printerdrake.pm_.c:233
+#: ../../printerdrake.pm_.c:236
msgid "Would you like to configure a printer?"
msgstr "�� �� ����� �� �������� �������?"
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:240
#, fuzzy
msgid ""
"Here are the following print queue.\n"
@@ -4153,20 +4174,20 @@ msgstr ""
"��� �� ��������� ������ � LILO-�.\n"
"������ ������ ���� ��� �������� �����."
-#: ../../printerdrake.pm_.c:260 ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:263 ../../printerdrake.pm_.c:269
msgid "Select Printer Connection"
msgstr "����� ����������� ��������"
-#: ../../printerdrake.pm_.c:261
+#: ../../printerdrake.pm_.c:264
msgid "How is the printer connected?"
msgstr "���� �� ������� �������?"
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:269
#, fuzzy
msgid "Remove queue"
msgstr "������� '���':"
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:270
#, fuzzy
msgid ""
"Every print queue (which print jobs are directed to) needs a\n"
@@ -4179,17 +4200,17 @@ msgstr ""
"������������\n"
"�� �������� �� ���� ��� �� ������?"
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:273
#, fuzzy
msgid "Name of queue"
msgstr "��� '����' �� ������:"
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:274
#, fuzzy
msgid "Spool directory"
msgstr "'Spool ������������:"
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:275
#, fuzzy
msgid "Printer Connection"
msgstr "����� ����������� ��������"
@@ -4473,7 +4494,7 @@ msgstr "������� ������� ����"
msgid "Format floppy"
msgstr "���������� ���"
-#: ../../standalone/drakboot_.c:29
+#: ../../standalone/drakboot_.c:30
#, fuzzy
msgid "Choice"
msgstr "����"
@@ -4772,6 +4793,12 @@ msgstr "����a�� ��������e"
msgid "Finding leaves takes some time"
msgstr "����a�� ���������� ��a�� ���� ������a"
+#~ msgid "Choose the size you want to install"
+#~ msgstr "��������� �������� ���������� �� �����������"
+
+#~ msgid "Total size: "
+#~ msgstr "������ ��������: "
+
#~ msgid ""
#~ "(a user ``mandrake'' with password ``mandrake'' has been automatically added)"
#~ msgstr ""