summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2000-09-02 11:02:02 +0000
committerPablo Saratxaga <pablo@mandriva.com>2000-09-02 11:02:02 +0000
commited567cedc049cb91e10084d084b9f6752256fb75 (patch)
treee2cce70ab7a91d760e2f5ae09e8d84d5bec116ce
parent99f9df7275444bda7ba09724f8165431393e8dbf (diff)
downloaddrakx-ed567cedc049cb91e10084d084b9f6752256fb75.tar
drakx-ed567cedc049cb91e10084d084b9f6752256fb75.tar.gz
drakx-ed567cedc049cb91e10084d084b9f6752256fb75.tar.bz2
drakx-ed567cedc049cb91e10084d084b9f6752256fb75.tar.xz
drakx-ed567cedc049cb91e10084d084b9f6752256fb75.zip
updated Danish and Japanese files
-rw-r--r--perl-install/share/po/DrakX.pot1443
-rw-r--r--perl-install/share/po/no.po1613
-rw-r--r--perl-install/share/po/sp.po1555
3 files changed, 2367 insertions, 2244 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 4030501da..95de12252 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-31 20:21+0200\n"
+"POT-Creation-Date: 2000-09-02 12:09+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:289
msgid "Generic"
msgstr ""
@@ -34,33 +34,33 @@ msgstr ""
msgid "X server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:203
+#: ../../Xconfigurator.pm_.c:204
msgid "Do you want support for hardware 3D acceleration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:211
+#: ../../Xconfigurator.pm_.c:212
msgid ""
"Your card can have 3D acceleration but only with XFree 3.3.\n"
"Do You want to use XFree 3.3 instead of XFree 4.0?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:235
+#: ../../Xconfigurator.pm_.c:236
msgid "Select the memory size of your graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:277
+#: ../../Xconfigurator.pm_.c:278
msgid "Choose options for server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:289
msgid "Choose a monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:289
msgid "Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:292
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -74,66 +74,66 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:299
msgid "Horizontal refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:299
msgid "Vertical refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:337
+#: ../../Xconfigurator.pm_.c:338
msgid "Monitor not configured"
msgstr ""
-#: ../../Xconfigurator.pm_.c:340
+#: ../../Xconfigurator.pm_.c:341
msgid "Graphic card not configured yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:344
msgid "Resolutions not chosen yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:356
+#: ../../Xconfigurator.pm_.c:357
msgid "Do you want to test the configuration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:360
+#: ../../Xconfigurator.pm_.c:361
msgid "Warning: testing is dangerous on this graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:363
+#: ../../Xconfigurator.pm_.c:364
msgid "Test of the configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:403
msgid ""
"\n"
"try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:403
msgid "An error has occurred:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:425
+#: ../../Xconfigurator.pm_.c:426
#, c-format
msgid "Leaving in %d seconds"
msgstr ""
-#: ../../Xconfigurator.pm_.c:429
+#: ../../Xconfigurator.pm_.c:430
msgid "Is this the correct setting?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:437
+#: ../../Xconfigurator.pm_.c:438
msgid "An error has occurred, try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:446 ../../Xconfigurator.pm_.c:630
msgid "Automatic resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:446
+#: ../../Xconfigurator.pm_.c:447
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -260,7 +260,7 @@ msgstr ""
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr ""
@@ -287,334 +287,408 @@ msgid ""
"Would you like X to start when you reboot?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1116
+#: ../../Xconfigurator.pm_.c:1117
msgid "Autologin"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1117
+#: ../../Xconfigurator.pm_.c:1118
msgid ""
"I can set up your computer to automatically log on one user.\n"
"If you don't want to use this feature, click on the cancel button."
msgstr ""
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1120
msgid "Choose the default user:"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:4
-msgid "256 colors (8 bits)"
+#: ../../Xconfigurator.pm_.c:1121
+msgid "Choose the window_manager to run:"
msgstr ""
#: ../../Xconfigurator_consts.pm_.c:5
-msgid "32 thousand colors (15 bits)"
+msgid "256 colors (8 bits)"
msgstr ""
#: ../../Xconfigurator_consts.pm_.c:6
-msgid "65 thousand colors (16 bits)"
+msgid "32 thousand colors (15 bits)"
msgstr ""
#: ../../Xconfigurator_consts.pm_.c:7
-msgid "16 million colors (24 bits)"
+msgid "65 thousand colors (16 bits)"
msgstr ""
#: ../../Xconfigurator_consts.pm_.c:8
+msgid "16 million colors (24 bits)"
+msgstr ""
+
+#: ../../Xconfigurator_consts.pm_.c:9
msgid "4 billion colors (32 bits)"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "256 kB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "512 kB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "1 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "2 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "4 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "8 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:110
msgid "16 MB or more"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:115 ../../Xconfigurator_consts.pm_.c:116
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "Super VGA, 800x600 at 56 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:127
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr ""
-#: ../../any.pm_.c:20
-msgid "curly"
-msgstr ""
-
-#: ../../any.pm_.c:20
-msgid "default"
-msgstr ""
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:20
-msgid "tie"
-msgstr ""
-
-#: ../../any.pm_.c:21
-msgid "brunette"
-msgstr ""
-
-#: ../../any.pm_.c:21
-msgid "girl"
-msgstr ""
-
-#: ../../any.pm_.c:21
-msgid "woman-blond"
-msgstr ""
-
-#: ../../any.pm_.c:22
-msgid "automagic"
-msgstr ""
-
-#: ../../any.pm_.c:85 ../../any.pm_.c:115
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
msgid "First sector of boot partition"
msgstr ""
-#: ../../any.pm_.c:85 ../../any.pm_.c:115 ../../any.pm_.c:144
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
msgid "First sector of drive (MBR)"
msgstr ""
-#: ../../any.pm_.c:89
+#: ../../any.pm_.c:95
msgid "SILO Installation"
msgstr ""
-#: ../../any.pm_.c:90 ../../any.pm_.c:96
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
msgid "Where do you want to install the bootloader?"
msgstr ""
-#: ../../any.pm_.c:95
+#: ../../any.pm_.c:101
msgid "LILO/grub Installation"
msgstr ""
-#: ../../any.pm_.c:105
+#: ../../any.pm_.c:111
msgid "None"
msgstr ""
-#: ../../any.pm_.c:105
+#: ../../any.pm_.c:111
msgid "Which bootloader(s) do you want to use?"
msgstr ""
-#: ../../any.pm_.c:119
+#: ../../any.pm_.c:125
msgid "Bootloader installation"
msgstr ""
-#: ../../any.pm_.c:121
+#: ../../any.pm_.c:127
msgid "Boot device"
msgstr ""
-#: ../../any.pm_.c:122
+#: ../../any.pm_.c:128
msgid "LBA (doesn't work on old BIOSes)"
msgstr ""
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:129
msgid "Compact"
msgstr ""
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:129
msgid "compact"
msgstr ""
-#: ../../any.pm_.c:124
+#: ../../any.pm_.c:130
msgid "Video mode"
msgstr ""
-#: ../../any.pm_.c:126
+#: ../../any.pm_.c:132
msgid "Delay before booting default image"
msgstr ""
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:687
-#: ../../install_steps_interactive.pm_.c:738 ../../netconnect.pm_.c:481
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:657 ../../netconnect.pm_.c:522
#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:137
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr ""
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:688
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:658
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr ""
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:136
msgid "Restrict command line options"
msgstr ""
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:136
msgid "restrict"
msgstr ""
-#: ../../any.pm_.c:136
+#: ../../any.pm_.c:142
msgid "Bootloader main options"
msgstr ""
-#: ../../any.pm_.c:139
+#: ../../any.pm_.c:145
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:616
+#: ../../install_steps_interactive.pm_.c:671
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr ""
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:616
+#: ../../install_steps_interactive.pm_.c:671
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr ""
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:157
msgid ""
"Here are the different entries.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:337
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:336
#: ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr ""
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:732 ../../printerdrake.pm_.c:337
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
+#: ../../install_steps_interactive.pm_.c:651 ../../printerdrake.pm_.c:336
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr ""
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:174
msgid "Which type of entry do you want to add?"
msgstr ""
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Linux"
msgstr ""
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Other OS (SunOS...)"
msgstr ""
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Other OS (windows...)"
msgstr ""
-#: ../../any.pm_.c:190
+#: ../../any.pm_.c:196
msgid "Image"
msgstr ""
-#: ../../any.pm_.c:191 ../../any.pm_.c:199
+#: ../../any.pm_.c:197 ../../any.pm_.c:205
msgid "Root"
msgstr ""
-#: ../../any.pm_.c:192
+#: ../../any.pm_.c:198
msgid "Append"
msgstr ""
-#: ../../any.pm_.c:193
+#: ../../any.pm_.c:199
msgid "Initrd"
msgstr ""
-#: ../../any.pm_.c:194
+#: ../../any.pm_.c:200
msgid "Read-write"
msgstr ""
-#: ../../any.pm_.c:201
+#: ../../any.pm_.c:207
msgid "Table"
msgstr ""
-#: ../../any.pm_.c:202
+#: ../../any.pm_.c:208
msgid "Unsafe"
msgstr ""
-#: ../../any.pm_.c:208
+#: ../../any.pm_.c:214
msgid "Label"
msgstr ""
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:216
msgid "Default"
msgstr ""
-#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:685 ../../interactive.pm_.c:74
+#: ../../any.pm_.c:219 ../../install_steps_gtk.pm_.c:608
+#: ../../install_steps_interactive.pm_.c:604 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:370
-#: ../../printerdrake.pm_.c:382
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:209
+#: ../../my_gtk.pm_.c:444 ../../my_gtk.pm_.c:619 ../../printerdrake.pm_.c:369
+#: ../../printerdrake.pm_.c:381
msgid "Ok"
msgstr ""
-#: ../../any.pm_.c:213
+#: ../../any.pm_.c:219
msgid "Remove entry"
msgstr ""
-#: ../../any.pm_.c:216
+#: ../../any.pm_.c:222
msgid "Empty label not allowed"
msgstr ""
-#: ../../any.pm_.c:217
+#: ../../any.pm_.c:223
msgid "This label is already used"
msgstr ""
+#: ../../any.pm_.c:420
+msgid "Configuring PCMCIA cards..."
+msgstr ""
+
+#: ../../any.pm_.c:420
+msgid "PCMCIA"
+msgstr ""
+
+#: ../../any.pm_.c:441
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr ""
+
+#: ../../any.pm_.c:442
+msgid "Do you have another one?"
+msgstr ""
+
+#: ../../any.pm_.c:443
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr ""
+
+#: ../../any.pm_.c:445 ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:443
+#: ../../netconnect.pm_.c:80 ../../netconnect.pm_.c:444
+#: ../../printerdrake.pm_.c:217
+msgid "No"
+msgstr ""
+
+#: ../../any.pm_.c:445 ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:443
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:442
+msgid "Yes"
+msgstr ""
+
+#: ../../any.pm_.c:446
+msgid "See hardware info"
+msgstr ""
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:463
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr ""
+
+#: ../../any.pm_.c:464
+#, c-format
+msgid "(module %s)"
+msgstr ""
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:474
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr ""
+
+#: ../../any.pm_.c:482
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: ../../any.pm_.c:487
+msgid "Autoprobe"
+msgstr ""
+
+#: ../../any.pm_.c:487
+msgid "Specify options"
+msgstr ""
+
+#: ../../any.pm_.c:491
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr ""
+
+#: ../../any.pm_.c:497
+#, c-format
+msgid ""
+"You may now provide its options to module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For instance, ``io=0x300 irq=7''"
+msgstr ""
+
+#: ../../any.pm_.c:500
+msgid "Module options:"
+msgstr ""
+
+#: ../../any.pm_.c:510
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+
#: ../../bootloader.pm_.c:230
#, c-format
msgid ""
@@ -627,38 +701,38 @@ msgid ""
"\n"
msgstr ""
-#: ../../bootloader.pm_.c:589
+#: ../../bootloader.pm_.c:599
msgid "Welcome to GRUB the operating system chooser!"
msgstr ""
-#: ../../bootloader.pm_.c:590
+#: ../../bootloader.pm_.c:600
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr ""
-#: ../../bootloader.pm_.c:591
+#: ../../bootloader.pm_.c:601
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr ""
-#: ../../bootloader.pm_.c:592
+#: ../../bootloader.pm_.c:602
msgid "commands before booting, or 'c' for a command-line."
msgstr ""
-#: ../../bootloader.pm_.c:593
+#: ../../bootloader.pm_.c:603
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr ""
-#: ../../bootloader.pm_.c:597
+#: ../../bootloader.pm_.c:607
msgid "not enough room in /boot"
msgstr ""
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:676
+#: ../../bootloader.pm_.c:686
msgid "Desktop"
msgstr ""
-#: ../../bootloader.pm_.c:676
+#: ../../bootloader.pm_.c:686
msgid "Start Menu"
msgstr ""
@@ -836,7 +910,7 @@ msgstr ""
#: ../../diskdrake.pm_.c:201 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:222 ../../standalone/diskdrake_.c:60
#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr ""
@@ -1070,7 +1144,7 @@ msgstr ""
msgid "Formatting loopback file %s"
msgstr ""
-#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:294
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:302
#, c-format
msgid "Formatting partition %s"
msgstr ""
@@ -1116,12 +1190,12 @@ msgstr ""
msgid "You'll need to reboot before the modification can take place"
msgstr ""
-#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:90
+#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:94
msgid "Computing FAT filesystem bounds"
msgstr ""
#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:94
msgid "Resizing"
msgstr ""
@@ -1227,25 +1301,25 @@ msgstr ""
msgid "new"
msgstr ""
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:94 ../../fs.pm_.c:100 ../../fs.pm_.c:106
#, c-format
msgid "%s formatting of %s failed"
msgstr ""
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:132
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr ""
-#: ../../fs.pm_.c:186
+#: ../../fs.pm_.c:189
msgid "nfs mount failed"
msgstr ""
-#: ../../fs.pm_.c:213
+#: ../../fs.pm_.c:216
msgid "mount failed: "
msgstr ""
-#: ../../fs.pm_.c:224
+#: ../../fs.pm_.c:227
#, c-format
msgid "error unmounting %s: %s"
msgstr ""
@@ -1297,7 +1371,7 @@ msgid ""
"Choose \"Install\" if there are no previous versions of GNU/Linux\n"
"installed, or if you wish to use multiple distributions or versions.\n"
"\n"
-"Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+"Choose \"Rescue\" if you wish to rescue a previous version of Mandrake "
"Linux:\n"
"%s or %s.\n"
"\n"
@@ -1844,7 +1918,7 @@ msgstr ""
msgid "Choose your keyboard"
msgstr ""
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:364
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:372
msgid "Miscellaneous"
msgstr ""
@@ -1884,8 +1958,8 @@ msgstr ""
msgid "Configure printer"
msgstr ""
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:685
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:604
+#: ../../install_steps_interactive.pm_.c:605
msgid "Set root password"
msgstr ""
@@ -1913,7 +1987,7 @@ msgstr ""
msgid "Exit install"
msgstr ""
-#: ../../install_any.pm_.c:570
+#: ../../install_any.pm_.c:573
msgid "Error reading file $f"
msgstr ""
@@ -1935,62 +2009,62 @@ msgid ""
"Continue anyway?"
msgstr ""
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:57
msgid "Use free space"
msgstr ""
-#: ../../install_interactive.pm_.c:58
+#: ../../install_interactive.pm_.c:59
msgid "Not enough free space to allocate new partitions"
msgstr ""
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:68
msgid "Use existing partition"
msgstr ""
-#: ../../install_interactive.pm_.c:66
+#: ../../install_interactive.pm_.c:70
msgid "There is no existing partition to use"
msgstr ""
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:77
msgid "Use the FAT partition for loopback"
msgstr ""
-#: ../../install_interactive.pm_.c:76
+#: ../../install_interactive.pm_.c:80
msgid "Which partition do you want to use to put Linux4Win?"
msgstr ""
-#: ../../install_interactive.pm_.c:77
+#: ../../install_interactive.pm_.c:81
msgid "Choose the sizes"
msgstr ""
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:82
msgid "Root partition size in MB: "
msgstr ""
-#: ../../install_interactive.pm_.c:79
+#: ../../install_interactive.pm_.c:83
msgid "Swap partition size in MB: "
msgstr ""
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:91
msgid "Use the free space on the FAT partition"
msgstr ""
-#: ../../install_interactive.pm_.c:89
+#: ../../install_interactive.pm_.c:93
msgid "Which partition do you want to resize?"
msgstr ""
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:96
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
"the following error occured: %s"
msgstr ""
-#: ../../install_interactive.pm_.c:95
+#: ../../install_interactive.pm_.c:99
msgid "Your windows partition is too fragmented, please run ``defrag'' first"
msgstr ""
-#: ../../install_interactive.pm_.c:96
+#: ../../install_interactive.pm_.c:100
msgid ""
"WARNING!\n"
"\n"
@@ -2001,172 +2075,72 @@ msgid ""
"When sure, press Ok."
msgstr ""
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:109
msgid "Which size do you want to keep for windows on"
msgstr ""
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:110
#, c-format
msgid "partition %s"
msgstr ""
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:116
#, c-format
msgid "FAT resizing failed: %s"
msgstr ""
-#: ../../install_interactive.pm_.c:127
+#: ../../install_interactive.pm_.c:131
msgid ""
"There is no FAT partitions to resize or to use as loopback (or not enough "
"space left)"
msgstr ""
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:137
msgid "Remove Windows(TM)"
msgstr ""
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:137
msgid "Take over the hard drive"
msgstr ""
-#: ../../install_interactive.pm_.c:135
+#: ../../install_interactive.pm_.c:139
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr ""
-#: ../../install_interactive.pm_.c:137
+#: ../../install_interactive.pm_.c:141
#, c-format
msgid "All existing partitions and their data will be lost on drive %s"
msgstr ""
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:149
msgid "Use diskdrake"
msgstr ""
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:153
msgid "Use fdisk"
msgstr ""
-#: ../../install_interactive.pm_.c:152
+#: ../../install_interactive.pm_.c:156
#, c-format
msgid ""
"You can now partition %s.\n"
"When you are done, don't forget to save using `w'"
msgstr ""
-#: ../../install_interactive.pm_.c:178
+#: ../../install_interactive.pm_.c:182
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr ""
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:186
#, c-format
msgid "Partitioning failed: %s"
msgstr ""
-#. -PO: the first %s is the card type (scsi, network, sound,...)
-#. -PO: the second is the vendor+model name
-#: ../../install_interactive.pm_.c:192
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:193
-#, c-format
-msgid "(module %s)"
-msgstr ""
-
-#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../install_interactive.pm_.c:204
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:212
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-
-#: ../../install_interactive.pm_.c:217
-msgid "Autoprobe"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:217
-msgid "Specify options"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:221
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr ""
-
-#: ../../install_interactive.pm_.c:227
-#, c-format
-msgid ""
-"You may now provide its options to module %s.\n"
-"Options are in format ``name=value name2=value2 ...''.\n"
-"For instance, ``io=0x300 irq=7''"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:230
-msgid "Module options:"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:240
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:251
-msgid "Configuring PCMCIA cards..."
-msgstr ""
-
-#: ../../install_interactive.pm_.c:251
-msgid "PCMCIA"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:273
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:274
-msgid "Do you have another one?"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:275
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:403
-#: ../../netconnect.pm_.c:576 ../../printerdrake.pm_.c:217
-msgid "No"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:401
-#: ../../netconnect.pm_.c:574
-msgid "Yes"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:278
-msgid "See hardware info"
-msgstr ""
-
-#: ../../install_interactive.pm_.c:293
+#: ../../install_interactive.pm_.c:201
msgid "Bringing up the network"
msgstr ""
-#: ../../install_interactive.pm_.c:298
+#: ../../install_interactive.pm_.c:206
msgid "Bringing down the network"
msgstr ""
@@ -2181,7 +2155,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr ""
-#: ../../install_steps.pm_.c:345
+#: ../../install_steps.pm_.c:357
msgid ""
"Some important packages didn't get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
@@ -2189,16 +2163,16 @@ msgid ""
"Mandrake/RPMS/*.rpm\"\n"
msgstr ""
-#: ../../install_steps.pm_.c:413
+#: ../../install_steps.pm_.c:425
#, c-format
msgid "Welcome to %s"
msgstr ""
-#: ../../install_steps.pm_.c:646
+#: ../../install_steps.pm_.c:649
msgid "No floppy drive available"
msgstr ""
-#: ../../install_steps_auto_install.pm_.c:42
+#: ../../install_steps_auto_install.pm_.c:45
#: ../../install_steps_stdio.pm_.c:26
#, c-format
msgid "Entering step `%s'\n"
@@ -2212,13 +2186,13 @@ msgstr ""
msgid "Total size: "
msgstr ""
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:351
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:356
#: ../../standalone/rpmdrake_.c:136
#, c-format
msgid "Version: %s\n"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:352
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:357
#: ../../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
@@ -2237,44 +2211,44 @@ msgstr ""
msgid "Install"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:442
msgid "Installing"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:445
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:473
msgid "Please wait, "
msgstr ""
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:475
msgid "Time remaining "
msgstr ""
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:448
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:476
msgid "Total time "
msgstr ""
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:485
+#: ../../install_steps_interactive.pm_.c:442
msgid "Preparing installation"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:501
#, c-format
msgid "Installing package %s"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:514
-#: ../../install_steps_gtk.pm_.c:518
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:546
msgid "Go on anyway?"
msgstr ""
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:514
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
msgid "There was an error ordering packages:"
msgstr ""
#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:841
msgid "Use existing configuration for X11?"
msgstr ""
@@ -2327,86 +2301,86 @@ msgstr ""
msgid "Automatic dependencies"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:329 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:335 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:330 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:336 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:331
+#: ../../install_steps_gtk.pm_.c:337
msgid "Toggle between flat and group sorted"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:349
+#: ../../install_steps_gtk.pm_.c:354
msgid "Bad package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:355
#, c-format
msgid "Name: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:353
+#: ../../install_steps_gtk.pm_.c:358
#, c-format
msgid "Importance: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:361
+#: ../../install_steps_gtk.pm_.c:366
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:371
-msgid "This is a mandatory package, it can't be unselected"
+#: ../../install_steps_gtk.pm_.c:385
+msgid ""
+"You can't select this package as there is not enough space left to install it"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:373
-msgid "You can't unselect this package. It is already installed"
+#: ../../install_steps_gtk.pm_.c:388
+msgid "The following packages are going to be installed/removed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:377
-msgid ""
-"This package must be upgraded\n"
-"Are you sure you want to deselect it?"
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:380
-msgid "You can't unselect this package. It must be upgraded"
+#: ../../install_steps_gtk.pm_.c:416
+msgid "This is a mandatory package, it can't be unselected"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:393
-msgid ""
-"You can't select this package as there is not enough space left to install it"
+#: ../../install_steps_gtk.pm_.c:418
+msgid "You can't unselect this package. It is already installed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:396
-msgid "The following packages are going to be installed/removed"
+#: ../../install_steps_gtk.pm_.c:422
+msgid ""
+"This package must be upgraded\n"
+"Are you sure you want to deselect it?"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:405
-msgid "You can't select/unselect this package"
+#: ../../install_steps_gtk.pm_.c:425
+msgid "You can't unselect this package. It must be upgraded"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:442
+#: ../../install_steps_gtk.pm_.c:470
msgid "Estimating"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:454 ../../install_steps_interactive.pm_.c:663
+#: ../../install_steps_gtk.pm_.c:482 ../../install_steps_interactive.pm_.c:579
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:233
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:205
-#: ../../my_gtk.pm_.c:463
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:210
+#: ../../my_gtk.pm_.c:444
msgid "Cancel"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_gtk.pm_.c:496
#, c-format
msgid "%d packages"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:499
+#: ../../install_steps_gtk.pm_.c:527
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2416,7 +2390,7 @@ msgid ""
"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:518
+#: ../../install_steps_gtk.pm_.c:546
msgid "There was an error installing packages:"
msgstr ""
@@ -2429,11 +2403,12 @@ msgid "Please, choose a language to use."
msgstr ""
#: ../../install_steps_interactive.pm_.c:80
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../standalone/keyboarddrake_.c:21
msgid "Keyboard"
msgstr ""
#: ../../install_steps_interactive.pm_.c:81
+#: ../../standalone/keyboarddrake_.c:22
msgid "Please, choose your keyboard layout."
msgstr ""
@@ -2482,7 +2457,7 @@ msgid ""
msgstr ""
#: ../../install_steps_interactive.pm_.c:132
-msgid "Upgrade"
+msgid "Rescue"
msgstr ""
#: ../../install_steps_interactive.pm_.c:138
@@ -2525,217 +2500,124 @@ msgstr ""
msgid "no available partitions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:202
+#: ../../install_steps_interactive.pm_.c:206
msgid "Choose the mount points"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:219
+#: ../../install_steps_interactive.pm_.c:223
#, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions and ALL DATA will be lost\n"
-"(%s)"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:228
+#: ../../install_steps_interactive.pm_.c:236
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:244
msgid "Root Partition"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:237
+#: ../../install_steps_interactive.pm_.c:245
msgid "What is the root partition (/) of your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:251
+#: ../../install_steps_interactive.pm_.c:259
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:277
+#: ../../install_steps_interactive.pm_.c:285
msgid "Choose the partitions you want to format"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:289
msgid "Check bad blocks?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:289
+#: ../../install_steps_interactive.pm_.c:297
msgid "Formatting partitions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:301
#, c-format
msgid "Creating and formatting file %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:296
+#: ../../install_steps_interactive.pm_.c:304
msgid "Not enough swap to fulfill installation, please add some"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:302
+#: ../../install_steps_interactive.pm_.c:310
msgid "Looking for available packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:308
+#: ../../install_steps_interactive.pm_.c:316
msgid "Finding packages to upgrade"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:325
+#: ../../install_steps_interactive.pm_.c:333
#, c-format
msgid ""
"Your system has not enough space left for installation or upgrade (%d > %d)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Complete (%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Minimum (%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Recommended (%dMB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:349
+msgid "Select the size you want to install"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:371
msgid "Package Group Selection"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:366
+#: ../../install_steps_interactive.pm_.c:374
msgid "Individual package selection"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:412
+#: ../../install_steps_interactive.pm_.c:420
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:415
+#: ../../install_steps_interactive.pm_.c:423
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr ""
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:451
msgid ""
"Installing package %s\n"
"%d%%"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:452
+#: ../../install_steps_interactive.pm_.c:460
msgid "Post-install configuration"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:462
-msgid "Keep the current IP configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:463
-msgid "Reconfigure network now"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:464
-msgid "Do not set up networking"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:467
-#: ../../install_steps_interactive.pm_.c:472
-msgid "Network Configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "Local networking has already been configured. Do you want to:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:473
-msgid "Do you want to configure a local network for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:479
-msgid "no network card found"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:497
-#: ../../install_steps_interactive.pm_.c:551
-msgid "Configuring network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:498
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:502
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Host name:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:521
-#: ../../install_steps_interactive.pm_.c:522
-#, c-format
-msgid "Configuring network device %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:523
-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:526
-msgid "Automatic IP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "IP address:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "Netmask:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "(bootp/dhcp)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:533 ../../printerdrake.pm_.c:107
-msgid "IP address should be in format 1.2.3.4"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:552
-msgid ""
-"Please enter your host name.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''.\n"
-"You may also enter the IP address of the gateway if you have one"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "DNS server:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Gateway device:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Gateway:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:572
+#: ../../install_steps_interactive.pm_.c:484
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -2774,92 +2656,92 @@ msgid ""
"USA"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:603
+#: ../../install_steps_interactive.pm_.c:515
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:611
+#: ../../install_steps_interactive.pm_.c:523
msgid "Contacting the mirror to get the list of available packages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:527
msgid "Please choose the packages you want to install."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:628
+#: ../../install_steps_interactive.pm_.c:540
msgid "Which is your timezone?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:541
msgid "Is your hardware clock set to GMT?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:662
+#: ../../install_steps_interactive.pm_.c:578
msgid "What printing system do you want to use?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:604
msgid "No password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:609
msgid "Use shadow file"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:609
msgid "shadow"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:610
msgid "MD5"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:610
msgid "Use MD5 passwords"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:612
msgid "Use NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:612
msgid "yellow pages"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:618
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:706
+#: ../../install_steps_interactive.pm_.c:625
msgid "Authentification NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:626
msgid "NIS Domain"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:626
msgid "NIS Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:651
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:651
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:652
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:652
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -2867,48 +2749,48 @@ msgid ""
"%s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:735
+#: ../../install_steps_interactive.pm_.c:654
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:736 ../../printerdrake.pm_.c:102
+#: ../../install_steps_interactive.pm_.c:655 ../../printerdrake.pm_.c:102
#: ../../printerdrake.pm_.c:136 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:741
+#: ../../install_steps_interactive.pm_.c:660
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:743
+#: ../../install_steps_interactive.pm_.c:662
#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../install_steps_interactive.pm_.c:672
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:754
+#: ../../install_steps_interactive.pm_.c:673
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:674
#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:675
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:781
+#: ../../install_steps_interactive.pm_.c:699
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 "
@@ -2926,19 +2808,19 @@ msgid ""
"drive and press \"Ok\"."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:715
msgid "First floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:716
msgid "Second floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:717
msgid "Skip"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:804
+#: ../../install_steps_interactive.pm_.c:722
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 "
@@ -2952,131 +2834,111 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:813
+#: ../../install_steps_interactive.pm_.c:731
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:816
+#: ../../install_steps_interactive.pm_.c:734
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:740
#, c-format
msgid "Insert a floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:825
+#: ../../install_steps_interactive.pm_.c:743
msgid "Creating bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:750
msgid "Preparing bootloader"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:840
+#: ../../install_steps_interactive.pm_.c:758
msgid "Do you want to use aboot?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:843
+#: ../../install_steps_interactive.pm_.c:761
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:852
+#: ../../install_steps_interactive.pm_.c:770
msgid "Installation of bootloader failed. The following error occured:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:867
-msgid "Proxies configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:868
-msgid "HTTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:869
-msgid "FTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:875
-msgid "Proxy should be http://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:876
-msgid "Proxy should be ftp://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:784 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:785 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:786 ../../standalone/draksec_.c:22
msgid "Low"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:787 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:788 ../../standalone/draksec_.c:24
msgid "High"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:789 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:802
msgid "Miscellaneous questions"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:803
msgid "(may cause data corruption)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:803
msgid "Use hard drive optimisations?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:804 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:907
+#: ../../install_steps_interactive.pm_.c:805
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:807
msgid "Removable media automounting"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:809
msgid "Clean /tmp at each boot"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:812
msgid "Enable multi profiles"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:814
msgid "Enable num lock at startup"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:817
msgid "Give the ram size in MB"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:921
+#: ../../install_steps_interactive.pm_.c:819
msgid "Can't use supermount in high security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:821
msgid ""
"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
"If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3085,13 +2947,13 @@ msgid ""
"You have been warned."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:826
msgid ""
"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
"give digits instead of normal letters (eg: pressing `p' gives `6')"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:847
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
"By default, the 4.0 server is used unless your card is not supported.\n"
@@ -3099,16 +2961,16 @@ msgid ""
"Do you want to keep XFree 3.3?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:878
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:880
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:996
+#: ../../install_steps_interactive.pm_.c:894
msgid "Creating auto install floppy"
msgstr ""
@@ -3543,135 +3405,135 @@ msgstr ""
msgid "Mouse Systems (serial)"
msgstr ""
-#: ../../my_gtk.pm_.c:463
+#: ../../my_gtk.pm_.c:444
msgid "Is this correct?"
msgstr ""
-#: ../../netconnect.pm_.c:88
+#: ../../netconnect.pm_.c:83
msgid "Internet configuration"
msgstr ""
-#: ../../netconnect.pm_.c:89
+#: ../../netconnect.pm_.c:84
msgid "Do you want to try to connect to the internet now?"
msgstr ""
-#: ../../netconnect.pm_.c:123 ../../netconnect.pm_.c:143
-#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:217
-#: ../../netconnect.pm_.c:229 ../../netconnect.pm_.c:241
+#: ../../netconnect.pm_.c:118 ../../netconnect.pm_.c:138
+#: ../../netconnect.pm_.c:192 ../../netconnect.pm_.c:212
+#: ../../netconnect.pm_.c:224 ../../netconnect.pm_.c:236
msgid "ISDN Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:124
+#: ../../netconnect.pm_.c:119
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
msgstr ""
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:139
msgid "Please fill or check the field below"
msgstr ""
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:141
msgid "Card IRQ"
msgstr ""
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:142
msgid "Card mem (DMA)"
msgstr ""
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:143
msgid "Card IO"
msgstr ""
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:144
msgid "Card IO_0"
msgstr ""
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:145
msgid "Card IO_1"
msgstr ""
-#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:478
+#: ../../netconnect.pm_.c:146 ../../netconnect.pm_.c:519
msgid "Connection name"
msgstr ""
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:147
msgid "Your personnal phone number"
msgstr ""
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:148
msgid "Provider name (ex provider.net)"
msgstr ""
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:149
msgid "Provider phone number"
msgstr ""
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:150
msgid "Provider dns 1"
msgstr ""
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:151
msgid "Provider dns 2"
msgstr ""
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:152
msgid "Dialing mode"
msgstr ""
-#: ../../netconnect.pm_.c:158
+#: ../../netconnect.pm_.c:153
msgid "Account Login"
msgstr ""
-#: ../../netconnect.pm_.c:159
+#: ../../netconnect.pm_.c:154
msgid "Account Password"
msgstr ""
-#: ../../netconnect.pm_.c:160
+#: ../../netconnect.pm_.c:155
msgid "Confirm Password"
msgstr ""
-#: ../../netconnect.pm_.c:190
+#: ../../netconnect.pm_.c:185
msgid "Germany (1TR6)"
msgstr ""
-#: ../../netconnect.pm_.c:192
+#: ../../netconnect.pm_.c:187
msgid "Europe (EDSS1)"
msgstr ""
-#: ../../netconnect.pm_.c:194
+#: ../../netconnect.pm_.c:189
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr ""
-#: ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:193
msgid "Which protocol do you want to use ?"
msgstr ""
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:204
msgid "ISA / PCMCIA"
msgstr ""
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:206
msgid "PCI"
msgstr ""
-#: ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:208
msgid "I don't know"
msgstr ""
-#: ../../netconnect.pm_.c:218
+#: ../../netconnect.pm_.c:213
msgid "What kind of card do you have?"
msgstr ""
-#: ../../netconnect.pm_.c:224
+#: ../../netconnect.pm_.c:219
msgid "Continue"
msgstr ""
-#: ../../netconnect.pm_.c:226
+#: ../../netconnect.pm_.c:221
msgid "Abort"
msgstr ""
-#: ../../netconnect.pm_.c:230
+#: ../../netconnect.pm_.c:225
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -3679,180 +3541,354 @@ msgid ""
"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
msgstr ""
-#: ../../netconnect.pm_.c:242
+#: ../../netconnect.pm_.c:237
msgid "Which is your ISDN card ?"
msgstr ""
-#: ../../netconnect.pm_.c:279
+#: ../../netconnect.pm_.c:274
msgid "I have found an ISDN Card:\n"
msgstr ""
-#: ../../netconnect.pm_.c:287
+#: ../../netconnect.pm_.c:282
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:294
+#: ../../netconnect.pm_.c:289
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:406
-msgid "ISDN configuration"
+#: ../../netconnect.pm_.c:329
+msgid "Internet Configuration."
+msgstr ""
+
+#: ../../netconnect.pm_.c:330
+msgid ""
+"I need to configure your network adaptater to be able to connect to internet."
msgstr ""
-#: ../../netconnect.pm_.c:407
+#: ../../netconnect.pm_.c:332 ../../netconnect.pm_.c:348
+#: ../../standalone/drakgw_.c:198
+msgid "Choose the network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:333
+msgid ""
+"Please choose which network adaptater do you want to use to connect to "
+"internet.\n"
+"If you don't know, choose eth0.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:344 ../../netconnect.pm_.c:373
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:345
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your internet connection with that adapter?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:349
+msgid ""
+"Please choose which network adaptater do you want to use to connect to "
+"internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:374
+msgid "I'm about to restart the network interface. Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:447
+msgid "ADSL configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:448
msgid "Do you want to start your connection at boot?"
msgstr ""
-#: ../../netconnect.pm_.c:461
+#: ../../netconnect.pm_.c:502
msgid "Try to find a modem?"
msgstr ""
-#: ../../netconnect.pm_.c:471
+#: ../../netconnect.pm_.c:512
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../netconnect.pm_.c:477
+#: ../../netconnect.pm_.c:518
msgid "Dialup options"
msgstr ""
-#: ../../netconnect.pm_.c:479
+#: ../../netconnect.pm_.c:520
msgid "Phone number"
msgstr ""
-#: ../../netconnect.pm_.c:480
+#: ../../netconnect.pm_.c:521
msgid "Login ID"
msgstr ""
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Authentication"
msgstr ""
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "CHAP"
msgstr ""
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "PAP"
msgstr ""
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Script-based"
msgstr ""
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Terminal-based"
msgstr ""
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:524
msgid "Domain name"
msgstr ""
-#: ../../netconnect.pm_.c:485
+#: ../../netconnect.pm_.c:526
msgid "First DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:527
msgid "Second DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:498
+#: ../../netconnect.pm_.c:545
msgid "Connect to internet"
msgstr ""
-#: ../../netconnect.pm_.c:500
+#: ../../netconnect.pm_.c:547
msgid "Disconnect from internet"
msgstr ""
-#: ../../netconnect.pm_.c:502
+#: ../../netconnect.pm_.c:549
msgid "Configure internet connexion"
msgstr ""
-#: ../../netconnect.pm_.c:505
+#: ../../netconnect.pm_.c:552
msgid "Internet connection & configuration"
msgstr ""
-#: ../../netconnect.pm_.c:506
+#: ../../netconnect.pm_.c:553
msgid "What do you wish to do?"
msgstr ""
-#: ../../netconnect.pm_.c:521
+#: ../../netconnect.pm_.c:568
msgid "Connect to internet with a normal modem"
msgstr ""
-#: ../../netconnect.pm_.c:523
+#: ../../netconnect.pm_.c:570
msgid "Connect to internet using ISDN"
msgstr ""
-#: ../../netconnect.pm_.c:525
+#: ../../netconnect.pm_.c:572
msgid "Connect to internet using DSL (or ADSL)"
msgstr ""
-#: ../../netconnect.pm_.c:527
+#: ../../netconnect.pm_.c:574
msgid "Connect to internet using Cable"
msgstr ""
-#: ../../netconnect.pm_.c:529
-msgid "Do not connect to internet"
+#: ../../netconnect.pm_.c:576
+msgid "Configure LAN"
msgstr ""
-#: ../../netconnect.pm_.c:532 ../../netconnect.pm_.c:555
-#: ../../netconnect.pm_.c:579 ../../netconnect.pm_.c:595
-#: ../../netconnect.pm_.c:606 ../../netconnect.pm_.c:632
-msgid "Connect to the Internet"
+#: ../../netconnect.pm_.c:578
+msgid "End configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:581
+msgid "Connect to the Internet / Configure LAN"
msgstr ""
-#: ../../netconnect.pm_.c:533
+#: ../../netconnect.pm_.c:582
msgid "How do you want to connect to the Internet?"
msgstr ""
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:603
msgid "Internal ISDN card"
msgstr ""
-#: ../../netconnect.pm_.c:552
+#: ../../netconnect.pm_.c:605
msgid "External modem"
msgstr ""
-#: ../../netconnect.pm_.c:556
+#: ../../netconnect.pm_.c:608 ../../netconnect.pm_.c:643
+#: ../../netconnect.pm_.c:654 ../../netconnect.pm_.c:680
+msgid "Connect to the Internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:609
msgid "What kind is your ISDN connection?"
msgstr ""
-#: ../../netconnect.pm_.c:580
-msgid "Have you been provided with a hostname?"
+#: ../../netconnect.pm_.c:628
+msgid "Cable connection"
+msgstr ""
+
+#: ../../netconnect.pm_.c:629 ../../network.pm_.c:278
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+
+#: ../../netconnect.pm_.c:633 ../../network.pm_.c:282 ../../network.pm_.c:322
+msgid "Host name:"
msgstr ""
-#: ../../netconnect.pm_.c:590
+#: ../../netconnect.pm_.c:638
msgid "France"
msgstr ""
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:640
msgid "Other countries"
msgstr ""
-#: ../../netconnect.pm_.c:596
+#: ../../netconnect.pm_.c:644
msgid "On which country are you located ?"
msgstr ""
-#: ../../netconnect.pm_.c:607
+#: ../../netconnect.pm_.c:649
+msgid "alcatel modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:651
+msgid "ECI modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:655
+msgid "If your adsl modem is an alcatel one, choose alcatel. Otherwise, ECI."
+msgstr ""
+
+#: ../../netconnect.pm_.c:675
+msgid "use pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:677
+msgid "don't use pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:681
msgid ""
-"If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, it exists some connexion that only use dhcp. If you don't know, "
+"choose 'use pppoe'"
+msgstr ""
+
+#: ../../network.pm_.c:242
+msgid "Keep the current IP configuration"
+msgstr ""
+
+#: ../../network.pm_.c:243
+msgid "Reconfigure network now"
+msgstr ""
+
+#: ../../network.pm_.c:244
+msgid "Do not set up networking"
+msgstr ""
+
+#: ../../network.pm_.c:247 ../../network.pm_.c:252
+msgid "Network Configuration"
+msgstr ""
+
+#: ../../network.pm_.c:248
+msgid "Local networking has already been configured. Do you want to:"
+msgstr ""
+
+#: ../../network.pm_.c:253
+msgid "Do you want to configure a local network for your system?"
+msgstr ""
+
+#: ../../network.pm_.c:259
+msgid "no network card found"
+msgstr ""
+
+#: ../../network.pm_.c:277 ../../network.pm_.c:317
+msgid "Configuring network"
+msgstr ""
+
+#: ../../network.pm_.c:296
+msgid "Proxies configuration"
+msgstr ""
+
+#: ../../network.pm_.c:297
+msgid "HTTP proxy"
msgstr ""
-#: ../../netconnect.pm_.c:627
-msgid "using pppoe"
+#: ../../network.pm_.c:298
+msgid "FTP proxy"
msgstr ""
-#: ../../netconnect.pm_.c:629
-msgid "using dhcp"
+#: ../../network.pm_.c:304
+msgid "Proxy should be http://..."
msgstr ""
-#: ../../netconnect.pm_.c:633
+#: ../../network.pm_.c:305
+msgid "Proxy should be ftp://..."
+msgstr ""
+
+#: ../../network.pm_.c:318
msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"However, it exists some connexion that use dhcp. Dhcp usually doesn't "
-"require login/password, so it may be a hint to know what your connexion is."
+"Please enter your host name.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''.\n"
+"You may also enter the IP address of the gateway if you have one"
+msgstr ""
+
+#: ../../network.pm_.c:322
+msgid "DNS server:"
+msgstr ""
+
+#: ../../network.pm_.c:322
+msgid "Gateway device:"
+msgstr ""
+
+#: ../../network.pm_.c:322
+msgid "Gateway:"
+msgstr ""
+
+#: ../../network.pm_.c:356 ../../network.pm_.c:357
+#, c-format
+msgid "Configuring network device %s"
+msgstr ""
+
+#: ../../network.pm_.c:358
+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 ""
+
+#: ../../network.pm_.c:361
+msgid "Automatic IP"
+msgstr ""
+
+#: ../../network.pm_.c:361
+msgid "IP address:"
+msgstr ""
+
+#: ../../network.pm_.c:361
+msgid "Netmask:"
+msgstr ""
+
+#: ../../network.pm_.c:362
+msgid "(bootp/dhcp)"
+msgstr ""
+
+#: ../../network.pm_.c:368 ../../printerdrake.pm_.c:107
+msgid "IP address should be in format 1.2.3.4"
msgstr ""
#: ../../partition_table.pm_.c:542
@@ -3914,15 +3950,15 @@ msgstr ""
msgid "maybe"
msgstr ""
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
msgid "i18n (important)"
msgstr ""
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
msgid "i18n (very nice)"
msgstr ""
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
msgid "i18n (nice)"
msgstr ""
@@ -4189,26 +4225,26 @@ msgstr ""
msgid "Would you like to configure a printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:335
+#: ../../printerdrake.pm_.c:334
msgid ""
"Here are the following print queues.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../../printerdrake.pm_.c:363 ../../printerdrake.pm_.c:370
-#: ../../printerdrake.pm_.c:382
+#: ../../printerdrake.pm_.c:362 ../../printerdrake.pm_.c:369
+#: ../../printerdrake.pm_.c:381
msgid "Select Printer Connection"
msgstr ""
-#: ../../printerdrake.pm_.c:364
+#: ../../printerdrake.pm_.c:363
msgid "How is the printer connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:382
+#: ../../printerdrake.pm_.c:369 ../../printerdrake.pm_.c:381
msgid "Remove queue"
msgstr ""
-#: ../../printerdrake.pm_.c:371
+#: ../../printerdrake.pm_.c:370
msgid ""
"Every printer managed by CUPS need a name (for example lp).\n"
"Other parameter like the description of the printer or its location\n"
@@ -4216,23 +4252,23 @@ msgid ""
"how is the printer connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:375
+#: ../../printerdrake.pm_.c:374
msgid "Name of printer"
msgstr ""
-#: ../../printerdrake.pm_.c:376
+#: ../../printerdrake.pm_.c:375
msgid "Description"
msgstr ""
-#: ../../printerdrake.pm_.c:377
+#: ../../printerdrake.pm_.c:376
msgid "Location"
msgstr ""
-#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:388
+#: ../../printerdrake.pm_.c:377 ../../printerdrake.pm_.c:387
msgid "Printer Connection"
msgstr ""
-#: ../../printerdrake.pm_.c:383
+#: ../../printerdrake.pm_.c:382
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"
@@ -4240,11 +4276,11 @@ msgid ""
"connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:386
+#: ../../printerdrake.pm_.c:385
msgid "Name of queue"
msgstr ""
-#: ../../printerdrake.pm_.c:387
+#: ../../printerdrake.pm_.c:386
msgid "Spool directory"
msgstr ""
@@ -4439,150 +4475,117 @@ msgid ""
"I'll try to go on blanking bad partitions"
msgstr ""
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
msgid "Configure LILO/GRUB"
msgstr ""
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
msgid "Create a boot floppy"
msgstr ""
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
msgid "Format floppy"
msgstr ""
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
msgid "Choice"
msgstr ""
-#: ../../standalone/drakboot_.c:58
+#: ../../standalone/drakboot_.c:59
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../../standalone/drakgw_.c:84
+#: ../../standalone/drakgw_.c:86
msgid "Internet Connection Sharing currently enabled"
msgstr ""
-#: ../../standalone/drakgw_.c:85 ../../standalone/drakgw_.c:103
+#: ../../standalone/drakgw_.c:87 ../../standalone/drakgw_.c:105
msgid "The setup of Internet connection sharing has already been done.\n"
msgstr ""
-#: ../../standalone/drakgw_.c:102
+#: ../../standalone/drakgw_.c:104
msgid "Internet Connection Sharing currently disabled"
msgstr ""
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:122
msgid "Config file content could not be interpreted."
msgstr ""
-#: ../../standalone/drakgw_.c:130
+#: ../../standalone/drakgw_.c:132
msgid "Internet Connection Sharing"
msgstr ""
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:133
msgid ""
"Your computer can be configured to share its Internet connection.\n"
"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:180
+#: ../../standalone/drakgw_.c:186
msgid "No network adapter on your system!"
msgstr ""
-#: ../../standalone/drakgw_.c:181
-msgid ""
-"No ethernet network adapter is currently configured on your system. Please "
-"run the hardware configuration tool."
-msgstr ""
-
#: ../../standalone/drakgw_.c:187
-msgid "Network interface"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:188
msgid ""
-"There is only one configured network adapter on your system:\n"
-"\n"
-"$interface\n"
-"\n"
-"Would you like to setup your Local Area Network with that adapter?"
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
msgstr ""
-#: ../../standalone/drakgw_.c:192
-msgid "Choose the network interface"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:193
+#: ../../standalone/drakgw_.c:199
msgid ""
-"Please choose what network adapter will be connected\n"
-"to your Local Area Network."
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
msgstr ""
-#: ../../standalone/drakgw_.c:205
-msgid "Local Area Network specification"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:206
-msgid "You may now decide which class C network to use.\n"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:207
-msgid "Network:"
+#: ../../standalone/drakgw_.c:208
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
msgstr ""
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:233
msgid "Potential LAN address conflict found in current config of $_!\n"
msgstr ""
-#: ../../standalone/drakgw_.c:233
-msgid "Internet Connection Sharing - setup of $device"
+#: ../../standalone/drakgw_.c:243
+msgid "Firewalling configuration detected!"
msgstr ""
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:244
msgid ""
-"The following interface is about to be configured:\n"
-"\n"
-"$interface\n"
-"\n"
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
msgstr ""
-#: ../../standalone/drakgw_.c:245
+#: ../../standalone/drakgw_.c:258
msgid "Configuring scripts, installing software, starting servers..."
msgstr ""
-#: ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:282
msgid "Could not install ipchains RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:395
+#: ../../standalone/drakgw_.c:432
msgid "Could not install dhcp RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:419
+#: ../../standalone/drakgw_.c:456
msgid "Could not install linuxconf RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:435
+#: ../../standalone/drakgw_.c:472
msgid "Could not install bind RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:439
+#: ../../standalone/drakgw_.c:476
msgid "Could not install caching-nameserver RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:451
-msgid "Firewalling configuration detected.!"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:452
-msgid "Warning! An existing firewalling configuration has been detected.\n"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:455
-msgid "Everything configured!"
+#: ../../standalone/drakgw_.c:488
+msgid "Congratulations!"
msgstr ""
-#: ../../standalone/drakgw_.c:456
+#: ../../standalone/drakgw_.c:489
msgid "Everything has been configured.\n"
msgstr ""
@@ -4633,10 +4636,6 @@ msgstr ""
msgid "Choose the tool you want to use"
msgstr ""
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr ""
-
#: ../../standalone/mousedrake_.c:25
msgid "What is the type of your mouse?"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 96f28e686..5ac04f005 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-08-31 20:21+0200\n"
+"POT-Creation-Date: 2000-09-02 12:09+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:289
msgid "Generic"
msgstr "Generisk"
@@ -33,11 +33,11 @@ msgstr "Velg en X-tjener"
msgid "X server"
msgstr "X-tjener"
-#: ../../Xconfigurator.pm_.c:203
+#: ../../Xconfigurator.pm_.c:204
msgid "Do you want support for hardware 3D acceleration?"
msgstr "иnsker du stјtte for maskinvare 3D akselerasjon"
-#: ../../Xconfigurator.pm_.c:211
+#: ../../Xconfigurator.pm_.c:212
msgid ""
"Your card can have 3D acceleration but only with XFree 3.3.\n"
"Do You want to use XFree 3.3 instead of XFree 4.0?"
@@ -45,23 +45,23 @@ msgstr ""
"Kortet ditt kan ha 3D akselerasjon, men bare med XFree 3.3.\n"
"иnsker du х bruke XFree 3.3 istedet for XFree 4.0?"
-#: ../../Xconfigurator.pm_.c:235
+#: ../../Xconfigurator.pm_.c:236
msgid "Select the memory size of your graphic card"
msgstr "Velg minnestјrrelsen til grafikk-kortet ditt"
-#: ../../Xconfigurator.pm_.c:277
+#: ../../Xconfigurator.pm_.c:278
msgid "Choose options for server"
msgstr "Velg opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:289
msgid "Choose a monitor"
msgstr "Velg en monitor"
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:289
msgid "Monitor"
msgstr "Monitor"
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:292
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -85,39 +85,39 @@ msgstr ""
"skjermen din.\n"
"Hvis du er usikker, velg en konservativ innstilling."
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:299
msgid "Horizontal refresh rate"
msgstr "Horisontal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:299
msgid "Vertical refresh rate"
msgstr "Vertikal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:337
+#: ../../Xconfigurator.pm_.c:338
msgid "Monitor not configured"
msgstr "Monitor er ikke konfigurert"
-#: ../../Xconfigurator.pm_.c:340
+#: ../../Xconfigurator.pm_.c:341
msgid "Graphic card not configured yet"
msgstr "Grafikk-kort er ikke konfigurert ennх"
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:344
msgid "Resolutions not chosen yet"
msgstr "Opplјsninger er ikke valgt ennх"
-#: ../../Xconfigurator.pm_.c:356
+#: ../../Xconfigurator.pm_.c:357
msgid "Do you want to test the configuration?"
msgstr "Vil du teste konfigurasjonen?"
-#: ../../Xconfigurator.pm_.c:360
+#: ../../Xconfigurator.pm_.c:361
msgid "Warning: testing is dangerous on this graphic card"
msgstr "Advarsel: testing er farlig med dette grafikk-kortet"
-#: ../../Xconfigurator.pm_.c:363
+#: ../../Xconfigurator.pm_.c:364
msgid "Test of the configuration"
msgstr "Test konfigurasjon"
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:403
msgid ""
"\n"
"try to change some parameters"
@@ -125,28 +125,28 @@ msgstr ""
"\n"
"prјv х endre noen parametere"
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:403
msgid "An error has occurred:"
msgstr "En feil oppsto:"
-#: ../../Xconfigurator.pm_.c:425
+#: ../../Xconfigurator.pm_.c:426
#, c-format
msgid "Leaving in %d seconds"
msgstr "Slutter om %d sekunder"
-#: ../../Xconfigurator.pm_.c:429
+#: ../../Xconfigurator.pm_.c:430
msgid "Is this the correct setting?"
msgstr "Er dette den riktige innstillingen?"
-#: ../../Xconfigurator.pm_.c:437
+#: ../../Xconfigurator.pm_.c:438
msgid "An error has occurred, try to change some parameters"
msgstr "En feil oppsto, prјv х endre noen parametere"
-#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:446 ../../Xconfigurator.pm_.c:630
msgid "Automatic resolutions"
msgstr "Automatiske opplјsninger"
-#: ../../Xconfigurator.pm_.c:446
+#: ../../Xconfigurator.pm_.c:447
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -281,7 +281,7 @@ msgstr "Test igjen"
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr "Hva јnsker du х gjјre?"
@@ -310,11 +310,11 @@ msgstr ""
"Jeg kan sette opp maskinen din til х automatisk starte X ved oppstart.\n"
"Vil du at X skal starte nхr du starter maskinen pх nytt?"
-#: ../../Xconfigurator.pm_.c:1116
+#: ../../Xconfigurator.pm_.c:1117
msgid "Autologin"
msgstr "Autoinnlogg"
-#: ../../Xconfigurator.pm_.c:1117
+#: ../../Xconfigurator.pm_.c:1118
msgid ""
"I can set up your computer to automatically log on one user.\n"
"If you don't want to use this feature, click on the cancel button."
@@ -322,235 +322,211 @@ msgstr ""
"Jeg kan sette opp maskinen din til х automatisk logge pх en bruker.\n"
"иnsker du х bruke denne funksjonen?"
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1120
msgid "Choose the default user:"
msgstr "Velg standard bruker :"
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1121
+#, fuzzy
+msgid "Choose the window_manager to run:"
+msgstr "Velg verktјyet du јnsker х bruke"
+
+#: ../../Xconfigurator_consts.pm_.c:5
msgid "256 colors (8 bits)"
msgstr "256 farger (8 bits)"
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:6
msgid "32 thousand colors (15 bits)"
msgstr "32 tusen farger (15 bits)"
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:7
msgid "65 thousand colors (16 bits)"
msgstr "65 tusen farger (16 bits)"
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:8
msgid "16 million colors (24 bits)"
msgstr "16 millioner farger (24 bits)"
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:9
msgid "4 billion colors (32 bits)"
msgstr "4 milliarder farger (32 bits)"
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "256 kB"
msgstr "256 kB"
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "512 kB"
msgstr "512 kB"
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "1 MB"
msgstr "1 MB"
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "2 MB"
msgstr "2 MB"
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "4 MB"
msgstr "4 MB"
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "8 MB"
msgstr "8 MB"
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:110
msgid "16 MB or more"
msgstr "16 MB eller mer"
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:115 ../../Xconfigurator_consts.pm_.c:116
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr "Standard VGA, 640x480 ved 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "Super VGA, 800x600 at 56 Hz"
msgstr "Super VGA 800x600 ved 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr "8514 kompatibel, 1024x768 ved 87 Hz interlaced (ikke 800x600)"
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr "Super VGA, 1024x768 ved 87 Hz interlaced, 800x600 ved 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr "Utvidet Super VGA, 800x600 ved 60 Hz, 640x480 ved 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr "Ikke-interlaced SVGA, 1024x768 ved 60 Hz, 800x600 ved 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr "Hјyfrekvens SVGA, 1024x768 ved 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 74 Hz"
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 76 Hz"
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr "Monitor som kan klare 1600x1200 ved 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:127
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr "Monitor som kan klare 1600x1200 ved 76 Hz"
-#: ../../any.pm_.c:20
-msgid "curly"
-msgstr "krјllet"
-
-#: ../../any.pm_.c:20
-msgid "default"
-msgstr "standard"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:20
-msgid "tie"
-msgstr "bхnd"
-
-#: ../../any.pm_.c:21
-msgid "brunette"
-msgstr "brunette"
-
-#: ../../any.pm_.c:21
-msgid "girl"
-msgstr "jente"
-
-#: ../../any.pm_.c:21
-msgid "woman-blond"
-msgstr "kvinneblond"
-
-#: ../../any.pm_.c:22
-msgid "automagic"
-msgstr "Automagisk"
-
-#: ../../any.pm_.c:85 ../../any.pm_.c:115
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
msgid "First sector of boot partition"
msgstr "Fјrste sektor av oppstartspartisjon"
-#: ../../any.pm_.c:85 ../../any.pm_.c:115 ../../any.pm_.c:144
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
msgid "First sector of drive (MBR)"
msgstr "Fјrste sektor av disk (MBR)"
-#: ../../any.pm_.c:89
+#: ../../any.pm_.c:95
msgid "SILO Installation"
msgstr "SILO-installasjon"
-#: ../../any.pm_.c:90 ../../any.pm_.c:96
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
msgid "Where do you want to install the bootloader?"
msgstr "Hvor јnsker du installere oppstartslasteren?"
-#: ../../any.pm_.c:95
+#: ../../any.pm_.c:101
msgid "LILO/grub Installation"
msgstr "LILO/grub-installasjon"
-#: ../../any.pm_.c:105
+#: ../../any.pm_.c:111
msgid "None"
msgstr "Ingen"
-#: ../../any.pm_.c:105
+#: ../../any.pm_.c:111
msgid "Which bootloader(s) do you want to use?"
msgstr "Hvilken oppstartslaster(e) vil du bruke?"
-#: ../../any.pm_.c:119
+#: ../../any.pm_.c:125
msgid "Bootloader installation"
msgstr "Installasjon oppstartslaster"
-#: ../../any.pm_.c:121
+#: ../../any.pm_.c:127
msgid "Boot device"
msgstr "Oppstartsenhet"
-#: ../../any.pm_.c:122
+#: ../../any.pm_.c:128
msgid "LBA (doesn't work on old BIOSes)"
msgstr "LBA (virker ikke pх gamle BIOS'er)"
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:129
msgid "Compact"
msgstr "Kompakt"
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:129
msgid "compact"
msgstr "kompakt"
-#: ../../any.pm_.c:124
+#: ../../any.pm_.c:130
msgid "Video mode"
msgstr "Skjermmodus"
-#: ../../any.pm_.c:126
+#: ../../any.pm_.c:132
msgid "Delay before booting default image"
msgstr "Forsinkelse fјr oppstart av standard bilde"
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:687
-#: ../../install_steps_interactive.pm_.c:738 ../../netconnect.pm_.c:481
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:657 ../../netconnect.pm_.c:522
#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:137
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "Passord"
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:688
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:658
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "Passord (igjen)"
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:136
msgid "Restrict command line options"
msgstr "Begrense kommandolinje-opsjoner"
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:136
msgid "restrict"
msgstr "begrense"
-#: ../../any.pm_.c:136
+#: ../../any.pm_.c:142
msgid "Bootloader main options"
msgstr "Hovedopsjoner for oppstartslaster"
-#: ../../any.pm_.c:139
+#: ../../any.pm_.c:145
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:140 ../../install_steps_interactive.pm_.c:697
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:616
+#: ../../install_steps_interactive.pm_.c:671
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "Vennligst prјv igjen"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:616
+#: ../../install_steps_interactive.pm_.c:671
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:157
msgid ""
"Here are the different entries.\n"
"You can add some more or change the existing ones."
@@ -558,91 +534,202 @@ msgstr ""
"Her er de forskjellige oppfјringene.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:337
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:336
#: ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "Legg til"
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:732 ../../printerdrake.pm_.c:337
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
+#: ../../install_steps_interactive.pm_.c:651 ../../printerdrake.pm_.c:336
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Ferdig"
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:174
msgid "Which type of entry do you want to add?"
msgstr "Hvilken inngangstype vil du legge til"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Linux"
msgstr "Linux"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Other OS (SunOS...)"
msgstr "Andre OS (SunOS...)"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Other OS (windows...)"
msgstr "Andre OS (windows...)"
-#: ../../any.pm_.c:190
+#: ../../any.pm_.c:196
msgid "Image"
msgstr "Bilde"
-#: ../../any.pm_.c:191 ../../any.pm_.c:199
+#: ../../any.pm_.c:197 ../../any.pm_.c:205
msgid "Root"
msgstr "Root"
-#: ../../any.pm_.c:192
+#: ../../any.pm_.c:198
msgid "Append"
msgstr "Tilfјye"
-#: ../../any.pm_.c:193
+#: ../../any.pm_.c:199
msgid "Initrd"
msgstr "Initrd"
-#: ../../any.pm_.c:194
+#: ../../any.pm_.c:200
msgid "Read-write"
msgstr "Les-skriv"
-#: ../../any.pm_.c:201
+#: ../../any.pm_.c:207
msgid "Table"
msgstr "Tabell"
-#: ../../any.pm_.c:202
+#: ../../any.pm_.c:208
msgid "Unsafe"
msgstr "Usikker"
-#: ../../any.pm_.c:208
+#: ../../any.pm_.c:214
msgid "Label"
msgstr "Etikett"
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:216
msgid "Default"
msgstr "Standard"
-#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:685 ../../interactive.pm_.c:74
+#: ../../any.pm_.c:219 ../../install_steps_gtk.pm_.c:608
+#: ../../install_steps_interactive.pm_.c:604 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:370
-#: ../../printerdrake.pm_.c:382
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:209
+#: ../../my_gtk.pm_.c:444 ../../my_gtk.pm_.c:619 ../../printerdrake.pm_.c:369
+#: ../../printerdrake.pm_.c:381
msgid "Ok"
msgstr "Ok"
-#: ../../any.pm_.c:213
+#: ../../any.pm_.c:219
msgid "Remove entry"
msgstr "Fjern inngang"
-#: ../../any.pm_.c:216
+#: ../../any.pm_.c:222
msgid "Empty label not allowed"
msgstr "Tom etikett er ikke tillatt"
-#: ../../any.pm_.c:217
+#: ../../any.pm_.c:223
msgid "This label is already used"
msgstr "Denne etiketten er allerede i bruk"
+#: ../../any.pm_.c:420
+msgid "Configuring PCMCIA cards..."
+msgstr "Konfigurerer PCMCIA kort..."
+
+#: ../../any.pm_.c:420
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../any.pm_.c:441
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Fant %s %s grensesnitt"
+
+#: ../../any.pm_.c:442
+msgid "Do you have another one?"
+msgstr "Har du enda ett?"
+
+#: ../../any.pm_.c:443
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Har du noen %s grensesnitt?"
+
+#: ../../any.pm_.c:445 ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:443
+#: ../../netconnect.pm_.c:80 ../../netconnect.pm_.c:444
+#: ../../printerdrake.pm_.c:217
+msgid "No"
+msgstr "Nei"
+
+#: ../../any.pm_.c:445 ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:443
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:442
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../any.pm_.c:446
+msgid "See hardware info"
+msgstr "Se maskinvareinfo"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:463
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Installerer driver for %s kort %s"
+
+#: ../../any.pm_.c:464
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:474
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Hvilken %s driver skal jeg prјve?"
+
+#: ../../any.pm_.c:482
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"I noen tilfeller trenger %s driveren х ha ekstra informasjon for х virke\n"
+"ordentlig, selv om den normalt virker fint foruten. иnsker du х spesifisere "
+"ekstra\n"
+"opsjoner for den eller tillate driveren х sondere maskinen din for\n"
+"informasjonen den trenger? Av og til vil sondering stoppe maskinen, men "
+"burde\n"
+"ikke forхrsake noen skader."
+
+#: ../../any.pm_.c:487
+msgid "Autoprobe"
+msgstr "Automatisk sondering"
+
+#: ../../any.pm_.c:487
+msgid "Specify options"
+msgstr "Spesifiser opsjoner"
+
+#: ../../any.pm_.c:491
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Du kan nх gi dens opsjoner til modul %s."
+
+#: ../../any.pm_.c:497
+#, c-format
+msgid ""
+"You may now provide its options to module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For instance, ``io=0x300 irq=7''"
+msgstr ""
+"Du kan nх oppgi dens opsjoner for modul %s.\n"
+"Opsjonene er i format ``name=value name2=value2 ...''.\n"
+"F.eks., ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:500
+msgid "Module options:"
+msgstr "Modulopsjoner:"
+
+#: ../../any.pm_.c:510
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Lasting av modul %s feilet.\n"
+"иnsker du х prјve igjen med andre parametere?"
+
# NOTE: this message will be displayed at boot time; that is
# only the ascii charset will be available on most machines
# so use only 7bit for this message (and do transliteration or
@@ -675,7 +762,7 @@ msgstr ""
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:589
+#: ../../bootloader.pm_.c:599
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Velkommen til GRUB, operativsystem-velgeren!"
@@ -687,7 +774,7 @@ msgstr "Velkommen til GRUB, operativsystem-velgeren!"
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:590
+#: ../../bootloader.pm_.c:600
#, 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."
@@ -700,7 +787,7 @@ msgstr "Bruk %c og %c tastene for х velge hvilken inngang som er markert."
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:591
+#: ../../bootloader.pm_.c:601
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
@@ -712,7 +799,7 @@ msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:592
+#: ../../bootloader.pm_.c:602
msgid "commands before booting, or 'c' for a command-line."
msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
@@ -724,21 +811,21 @@ msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:593
+#: ../../bootloader.pm_.c:603
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "Den markerte inngangen vil bli startet automatisk om %d sekunder."
-#: ../../bootloader.pm_.c:597
+#: ../../bootloader.pm_.c:607
msgid "not enough room in /boot"
msgstr "ikke nok plass i /boot"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:676
+#: ../../bootloader.pm_.c:686
msgid "Desktop"
msgstr "Skrivebord"
-#: ../../bootloader.pm_.c:676
+#: ../../bootloader.pm_.c:686
msgid "Start Menu"
msgstr "Startmeny"
@@ -926,7 +1013,7 @@ msgstr "Vцr forsiktig: denne operasjonen er farlig."
# #: ../install_steps_interactive.pm_.c:37
#: ../../diskdrake.pm_.c:201 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:222 ../../standalone/diskdrake_.c:60
#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "Feil"
@@ -1181,7 +1268,7 @@ msgstr "Formatering"
msgid "Formatting loopback file %s"
msgstr "Formaterer loopback-fil %s"
-#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:294
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:302
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
@@ -1227,12 +1314,12 @@ msgstr "Partisjonstabellen pх disk %s blir nх skrevet til disk!"
msgid "You'll need to reboot before the modification can take place"
msgstr "Du mх starte maskinen pх nytt for at modifiseringene skal tre i kraft"
-#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:90
+#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:94
msgid "Computing FAT filesystem bounds"
msgstr "Beregner fat filsystemgrense"
#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:94
msgid "Resizing"
msgstr "Endrer stјrrelse"
@@ -1344,25 +1431,25 @@ msgstr "Velg en eksisterende RAID for х legge til"
msgid "new"
msgstr "ny"
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:94 ../../fs.pm_.c:100 ../../fs.pm_.c:106
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s formatering av %s mislykket"
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:132
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "Jeg vet ikke hvordan formatere %s i type %s"
-#: ../../fs.pm_.c:186
+#: ../../fs.pm_.c:189
msgid "nfs mount failed"
msgstr "nfs montering mislykket"
-#: ../../fs.pm_.c:213
+#: ../../fs.pm_.c:216
msgid "mount failed: "
msgstr "montering mislykket: "
-#: ../../fs.pm_.c:224
+#: ../../fs.pm_.c:227
#, c-format
msgid "error unmounting %s: %s"
msgstr "feil ved demontering av %s: %s"
@@ -1413,12 +1500,12 @@ msgid "Choose the layout corresponding to your keyboard from the list above"
msgstr "Velg oppsettet som stemmer med tastaturet ditt fra listen ovenfor"
#: ../../help.pm_.c:13
-#, c-format
+#, fuzzy, c-format
msgid ""
"Choose \"Install\" if there are no previous versions of GNU/Linux\n"
"installed, or if you wish to use multiple distributions or versions.\n"
"\n"
-"Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+"Choose \"Rescue\" if you wish to rescue a previous version of Mandrake "
"Linux:\n"
"%s or %s.\n"
"\n"
@@ -2346,7 +2433,7 @@ msgstr "Konfigurer mus"
msgid "Choose your keyboard"
msgstr "Velg tastatur"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:364
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:372
msgid "Miscellaneous"
msgstr "Forskjellig"
@@ -2386,8 +2473,8 @@ msgstr "Konfigurer tjenester"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:685
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:604
+#: ../../install_steps_interactive.pm_.c:605
msgid "Set root password"
msgstr "Sett root-passord"
@@ -2415,7 +2502,7 @@ msgstr "Diskett autoinstallering"
msgid "Exit install"
msgstr "Avslutt installering"
-#: ../../install_any.pm_.c:570
+#: ../../install_any.pm_.c:573
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
@@ -2443,51 +2530,51 @@ msgstr ""
"\n"
"Fortsette likevel?"
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:57
msgid "Use free space"
msgstr "Bruk ledig plass"
-#: ../../install_interactive.pm_.c:58
+#: ../../install_interactive.pm_.c:59
msgid "Not enough free space to allocate new partitions"
msgstr "Ikke nok plass til х allokere en ny partisjon"
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:68
msgid "Use existing partition"
msgstr "Bruk eksisterende partisjon"
-#: ../../install_interactive.pm_.c:66
+#: ../../install_interactive.pm_.c:70
msgid "There is no existing partition to use"
msgstr "Det finnes ingen eksisterende partisjon som kan brukes"
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:77
msgid "Use the FAT partition for loopback"
msgstr "Bruk FAT partisjonen for loopback"
-#: ../../install_interactive.pm_.c:76
+#: ../../install_interactive.pm_.c:80
msgid "Which partition do you want to use to put Linux4Win?"
msgstr "Hvilken partisjon vil du bruke til х plassere Linux4Win?"
-#: ../../install_interactive.pm_.c:77
+#: ../../install_interactive.pm_.c:81
msgid "Choose the sizes"
msgstr "Velg stјrrelsene"
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:82
msgid "Root partition size in MB: "
msgstr "Root-partisjonsstјrrelse i MB: "
-#: ../../install_interactive.pm_.c:79
+#: ../../install_interactive.pm_.c:83
msgid "Swap partition size in MB: "
msgstr "Veksel-partisjonsstјrrelse i MB: "
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:91
msgid "Use the free space on the FAT partition"
msgstr "Bruk den ledige plassen pх FAT partisjonen"
-#: ../../install_interactive.pm_.c:89
+#: ../../install_interactive.pm_.c:93
msgid "Which partition do you want to resize?"
msgstr "Hvilken partisjonstype јnsker du х forandre stјrrelse pх?"
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:96
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
@@ -2496,12 +2583,12 @@ msgstr ""
"Stјrrelsesendreren for FAT greide ikke х hхndtere din partisjon, \n"
"fјlgende feil oppsto: %s"
-#: ../../install_interactive.pm_.c:95
+#: ../../install_interactive.pm_.c:99
msgid "Your windows partition is too fragmented, please run ``defrag'' first"
msgstr ""
"Windows-partisjonen din er for fragmentert, vennligst kjјr ``defrag'' fјrst"
-#: ../../install_interactive.pm_.c:96
+#: ../../install_interactive.pm_.c:100
msgid ""
"WARNING!\n"
"\n"
@@ -2521,21 +2608,21 @@ msgstr ""
"dine data.\n"
"Nхr du er sikker, trykk Ok."
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:109
msgid "Which size do you want to keep for windows on"
msgstr "Hvilken stјrrelse јnsker du х beholde vinduer pх?"
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:110
#, c-format
msgid "partition %s"
msgstr "partisjon %s"
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:116
#, c-format
msgid "FAT resizing failed: %s"
msgstr "Krymping/forstјrring av FAT feilet: %s"
-#: ../../install_interactive.pm_.c:127
+#: ../../install_interactive.pm_.c:131
msgid ""
"There is no FAT partitions to resize or to use as loopback (or not enough "
"space left)"
@@ -2543,32 +2630,32 @@ msgstr ""
"Det finnes ingen FAT partisjon х forandre stјrrelsen pх eller х brukes som "
"loopback (ikke nok plass igjen)"
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:137
msgid "Remove Windows(TM)"
msgstr "Fjern Windows(TM)"
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:137
msgid "Take over the hard drive"
msgstr "Ta over harddisken"
-#: ../../install_interactive.pm_.c:135
+#: ../../install_interactive.pm_.c:139
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "Du har mer enn en harddisk, hvilken јnsker du х installere linux pх?"
-#: ../../install_interactive.pm_.c:137
+#: ../../install_interactive.pm_.c:141
#, c-format
msgid "All existing partitions and their data will be lost on drive %s"
msgstr "Alle eksisterende partisjoner og deres data vil vцre tapt pх disk %s"
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:149
msgid "Use diskdrake"
msgstr "Bruk diskdrake"
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:153
msgid "Use fdisk"
msgstr "Bruk fdisk"
-#: ../../install_interactive.pm_.c:152
+#: ../../install_interactive.pm_.c:156
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -2577,132 +2664,20 @@ msgstr ""
"Du kan nх partisjonere %s.\n"
"Nхr du er ferdig ikke glem х lagre med `w'"
-#: ../../install_interactive.pm_.c:178
+#: ../../install_interactive.pm_.c:182
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX partisjonsveiviseren fant disse lјsningene:"
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:186
#, c-format
msgid "Partitioning failed: %s"
msgstr "Partisjonering feilet: %s"
-#. -PO: the first %s is the card type (scsi, network, sound,...)
-#. -PO: the second is the vendor+model name
-#: ../../install_interactive.pm_.c:192
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Installerer driver for %s kort %s"
-
-#: ../../install_interactive.pm_.c:193
-#, c-format
-msgid "(module %s)"
-msgstr "(modul %s)"
-
-#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../install_interactive.pm_.c:204
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Hvilken %s driver skal jeg prјve?"
-
-#: ../../install_interactive.pm_.c:212
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"I noen tilfeller trenger %s driveren х ha ekstra informasjon for х virke\n"
-"ordentlig, selv om den normalt virker fint foruten. иnsker du х spesifisere "
-"ekstra\n"
-"opsjoner for den eller tillate driveren х sondere maskinen din for\n"
-"informasjonen den trenger? Av og til vil sondering stoppe maskinen, men "
-"burde\n"
-"ikke forхrsake noen skader."
-
-#: ../../install_interactive.pm_.c:217
-msgid "Autoprobe"
-msgstr "Automatisk sondering"
-
-#: ../../install_interactive.pm_.c:217
-msgid "Specify options"
-msgstr "Spesifiser opsjoner"
-
-#: ../../install_interactive.pm_.c:221
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Du kan nх gi dens opsjoner til modul %s."
-
-#: ../../install_interactive.pm_.c:227
-#, c-format
-msgid ""
-"You may now provide its options to module %s.\n"
-"Options are in format ``name=value name2=value2 ...''.\n"
-"For instance, ``io=0x300 irq=7''"
-msgstr ""
-"Du kan nх oppgi dens opsjoner for modul %s.\n"
-"Opsjonene er i format ``name=value name2=value2 ...''.\n"
-"F.eks., ``io=0x300 irq=7''"
-
-#: ../../install_interactive.pm_.c:230
-msgid "Module options:"
-msgstr "Modulopsjoner:"
-
-#: ../../install_interactive.pm_.c:240
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Lasting av modul %s feilet.\n"
-"иnsker du х prјve igjen med andre parametere?"
-
-#: ../../install_interactive.pm_.c:251
-msgid "Configuring PCMCIA cards..."
-msgstr "Konfigurerer PCMCIA kort..."
-
-#: ../../install_interactive.pm_.c:251
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_interactive.pm_.c:273
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Fant %s %s grensesnitt"
-
-#: ../../install_interactive.pm_.c:274
-msgid "Do you have another one?"
-msgstr "Har du enda ett?"
-
-#: ../../install_interactive.pm_.c:275
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Har du noen %s grensesnitt?"
-
-#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:403
-#: ../../netconnect.pm_.c:576 ../../printerdrake.pm_.c:217
-msgid "No"
-msgstr "Nei"
-
-#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:401
-#: ../../netconnect.pm_.c:574
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../install_interactive.pm_.c:278
-msgid "See hardware info"
-msgstr "Se maskinvareinfo"
-
-#: ../../install_interactive.pm_.c:293
+#: ../../install_interactive.pm_.c:201
msgid "Bringing up the network"
msgstr "Henter opp nettverket"
-#: ../../install_interactive.pm_.c:298
+#: ../../install_interactive.pm_.c:206
msgid "Bringing down the network"
msgstr "Tar ned nettverket"
@@ -2720,7 +2695,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "Dupliser monteringspunkt %s"
-#: ../../install_steps.pm_.c:345
+#: ../../install_steps.pm_.c:357
msgid ""
"Some important packages didn't get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
@@ -2732,16 +2707,16 @@ msgstr ""
"Sjekk cd-platen pх en installert maskin med \"rpm -qpl "
"Mandrake/RPMS/*.rpm\"\n"
-#: ../../install_steps.pm_.c:413
+#: ../../install_steps.pm_.c:425
#, c-format
msgid "Welcome to %s"
msgstr "Velkommen til %s"
-#: ../../install_steps.pm_.c:646
+#: ../../install_steps.pm_.c:649
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
-#: ../../install_steps_auto_install.pm_.c:42
+#: ../../install_steps_auto_install.pm_.c:45
#: ../../install_steps_stdio.pm_.c:26
#, c-format
msgid "Entering step `%s'\n"
@@ -2755,13 +2730,13 @@ msgstr "Velg stјrrelsen du јnsker х installere"
msgid "Total size: "
msgstr "Total stјrrelse: "
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:351
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:356
#: ../../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:352
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:357
#: ../../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
@@ -2780,44 +2755,44 @@ msgstr "Info"
msgid "Install"
msgstr "Installer"
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:442
msgid "Installing"
msgstr "Installerer"
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:445
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:473
msgid "Please wait, "
msgstr "Vennligst vent, "
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:475
msgid "Time remaining "
msgstr "Tid som gjenstхr "
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:448
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:476
msgid "Total time "
msgstr "Total tid "
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:485
+#: ../../install_steps_interactive.pm_.c:442
msgid "Preparing installation"
msgstr "Forbereder installasjon"
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:501
#, c-format
msgid "Installing package %s"
msgstr "Installerer pakke %s"
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:514
-#: ../../install_steps_gtk.pm_.c:518
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:546
msgid "Go on anyway?"
msgstr "Fortsette uansett?"
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:514
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
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:943
+#: ../../install_steps_interactive.pm_.c:841
msgid "Use existing configuration for X11?"
msgstr "Bruke eksisterende konfigurasjon for X11?"
@@ -2885,46 +2860,61 @@ msgstr "Prosentdel av pakker х installere"
msgid "Automatic dependencies"
msgstr "Avhengigheter automatisk"
-#: ../../install_steps_gtk.pm_.c:329 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:335 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr "Utvid tre"
-#: ../../install_steps_gtk.pm_.c:330 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:336 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr "Trekk sammen tre"
-#: ../../install_steps_gtk.pm_.c:331
+#: ../../install_steps_gtk.pm_.c:337
msgid "Toggle between flat and group sorted"
msgstr "Skift mellom flat og gruppesortert"
-#: ../../install_steps_gtk.pm_.c:349
+#: ../../install_steps_gtk.pm_.c:354
msgid "Bad package"
msgstr "Dхrlig pakke"
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:355
#, c-format
msgid "Name: %s\n"
msgstr "Navn: %s\n"
-#: ../../install_steps_gtk.pm_.c:353
+#: ../../install_steps_gtk.pm_.c:358
#, c-format
msgid "Importance: %s\n"
msgstr "Viktighet: %s\n"
-#: ../../install_steps_gtk.pm_.c:361
+#: ../../install_steps_gtk.pm_.c:366
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Total stјrrelse: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:371
+#: ../../install_steps_gtk.pm_.c:385
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"Du kan ikke velge denne pakken da det ikke er igjen nok plass til х "
+"installere denne"
+
+#: ../../install_steps_gtk.pm_.c:388
+msgid "The following packages are going to be installed/removed"
+msgstr "Fјlgende pakker vil bli installert/fjernet"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Du kan ikke velge/fjerne denne pakken"
+
+#: ../../install_steps_gtk.pm_.c:416
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:373
+#: ../../install_steps_gtk.pm_.c:418
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:377
+#: ../../install_steps_gtk.pm_.c:422
msgid ""
"This package must be upgraded\n"
"Are you sure you want to deselect it?"
@@ -2932,43 +2922,28 @@ msgstr ""
"Denne pakken mх oppgraderes\n"
"Er du sikker pх at du ikke vil velge denne?"
-#: ../../install_steps_gtk.pm_.c:380
+#: ../../install_steps_gtk.pm_.c:425
msgid "You can't unselect this package. It must be upgraded"
msgstr "Du kan ikke fjerne denne pakken. Den mх oppgraderes"
-#: ../../install_steps_gtk.pm_.c:393
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr ""
-"Du kan ikke velge denne pakken da det ikke er igjen nok plass til х "
-"installere denne"
-
-#: ../../install_steps_gtk.pm_.c:396
-msgid "The following packages are going to be installed/removed"
-msgstr "Fјlgende pakker vil bli installert/fjernet"
-
-#: ../../install_steps_gtk.pm_.c:405
-msgid "You can't select/unselect this package"
-msgstr "Du kan ikke velge/fjerne denne pakken"
-
-#: ../../install_steps_gtk.pm_.c:442
+#: ../../install_steps_gtk.pm_.c:470
msgid "Estimating"
msgstr "Beregner"
-#: ../../install_steps_gtk.pm_.c:454 ../../install_steps_interactive.pm_.c:663
+#: ../../install_steps_gtk.pm_.c:482 ../../install_steps_interactive.pm_.c:579
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:233
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:205
-#: ../../my_gtk.pm_.c:463
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:210
+#: ../../my_gtk.pm_.c:444
msgid "Cancel"
msgstr "Avbryt"
-#: ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_gtk.pm_.c:496
#, c-format
msgid "%d packages"
msgstr "%d pakker"
-#: ../../install_steps_gtk.pm_.c:499
+#: ../../install_steps_gtk.pm_.c:527
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2983,7 +2958,7 @@ msgstr ""
"ferdig.\n"
"Hvis du ikke har den trykk Avbryt for х unngх installasjon fra denne CD'en."
-#: ../../install_steps_gtk.pm_.c:518
+#: ../../install_steps_gtk.pm_.c:546
msgid "There was an error installing packages:"
msgstr "Det var en feil ved installering av pakkene:"
@@ -2996,11 +2971,12 @@ msgid "Please, choose a language to use."
msgstr "Vennligst velg sprхk som skal brukes."
#: ../../install_steps_interactive.pm_.c:80
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../standalone/keyboarddrake_.c:21
msgid "Keyboard"
msgstr "Tastatur"
#: ../../install_steps_interactive.pm_.c:81
+#: ../../standalone/keyboarddrake_.c:22
msgid "Please, choose your keyboard layout."
msgstr "Vennligst velg tastatur-oppsettet ditt."
@@ -3051,8 +3027,9 @@ msgstr ""
"Du fхr tilgang til х gjјre kraftige, men farlige ting her."
#: ../../install_steps_interactive.pm_.c:132
-msgid "Upgrade"
-msgstr "Oppgrader"
+#, fuzzy
+msgid "Rescue"
+msgstr "Endre stјrrelse"
#: ../../install_steps_interactive.pm_.c:138
#, fuzzy
@@ -3095,22 +3072,25 @@ msgstr "IDE"
msgid "no available partitions"
msgstr "ingen tilgjengelige partisjoner"
-#: ../../install_steps_interactive.pm_.c:202
+#: ../../install_steps_interactive.pm_.c:206
msgid "Choose the mount points"
msgstr "Velg monteringspunktene"
-#: ../../install_steps_interactive.pm_.c:219
-#, c-format
+#: ../../install_steps_interactive.pm_.c:223
+#, fuzzy, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions and ALL DATA will be lost\n"
-"(%s)"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
msgstr ""
"Jeg kan ikke lese partisjonstabellen din, den er for јdelagt for meg :(\n"
"Jeg vil fјrsјke х blanke ut dхrlige partisjoner, ALLE DATA vil gх tapt\n"
"(%s)"
-#: ../../install_steps_interactive.pm_.c:228
+#: ../../install_steps_interactive.pm_.c:236
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -3118,51 +3098,51 @@ msgstr ""
"DiskDrake klarte ikke х lese partisjonstabellen korrekt.\n"
"Fortsett pх eget ansvar!"
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:244
msgid "Root Partition"
msgstr "Root-partisjon"
-#: ../../install_steps_interactive.pm_.c:237
+#: ../../install_steps_interactive.pm_.c:245
msgid "What is the root partition (/) of your system?"
msgstr "Hva er root-partisjonen (/) pх systemet ditt?"
-#: ../../install_steps_interactive.pm_.c:251
+#: ../../install_steps_interactive.pm_.c:259
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:277
+#: ../../install_steps_interactive.pm_.c:285
msgid "Choose the partitions you want to format"
msgstr "Velg de partisjonene du јnsker х formatere"
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:289
msgid "Check bad blocks?"
msgstr "Sjekke dхrlige blokker?"
-#: ../../install_steps_interactive.pm_.c:289
+#: ../../install_steps_interactive.pm_.c:297
msgid "Formatting partitions"
msgstr "Formaterer partisjoner"
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:301
#, c-format
msgid "Creating and formatting file %s"
msgstr "Oppretter og formaterer fil %s"
-#: ../../install_steps_interactive.pm_.c:296
+#: ../../install_steps_interactive.pm_.c:304
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:302
+#: ../../install_steps_interactive.pm_.c:310
msgid "Looking for available packages"
msgstr "Ser etter tilgjengelige pakker"
-#: ../../install_steps_interactive.pm_.c:308
+#: ../../install_steps_interactive.pm_.c:316
msgid "Finding packages to upgrade"
msgstr "Finner pakker х oppgradere"
-#: ../../install_steps_interactive.pm_.c:325
+#: ../../install_steps_interactive.pm_.c:333
#, c-format
msgid ""
"Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -3170,30 +3150,35 @@ msgstr ""
"Systemet ditt har ikke nok plass for installasjon eller oppgradering (%d > "
"%d)"
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Complete (%dMB)"
msgstr "Ferdig (%dMB)"
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Minimum (%dMB)"
msgstr "Minimum (%dMB)"
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, c-format
msgid "Recommended (%dMB)"
msgstr "Anbefalt (%dMB)"
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:349
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Velg stјrrelsen du јnsker х installere"
+
+#: ../../install_steps_interactive.pm_.c:371
msgid "Package Group Selection"
msgstr "Valg pakkegruppe"
-#: ../../install_steps_interactive.pm_.c:366
+#: ../../install_steps_interactive.pm_.c:374
msgid "Individual package selection"
msgstr "Individuelt pakkevalg"
-#: ../../install_steps_interactive.pm_.c:412
+#: ../../install_steps_interactive.pm_.c:420
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -3203,12 +3188,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:415
+#: ../../install_steps_interactive.pm_.c:423
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "CD-ROM merket \"%s\""
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:451
msgid ""
"Installing package %s\n"
"%d%%"
@@ -3216,122 +3201,11 @@ msgstr ""
"Installerer pakke %s\n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:452
+#: ../../install_steps_interactive.pm_.c:460
msgid "Post-install configuration"
msgstr "Konfigurasjon postinstallering"
-#: ../../install_steps_interactive.pm_.c:462
-msgid "Keep the current IP configuration"
-msgstr "Behold nхvцrende IP-konfigurasjon"
-
-#: ../../install_steps_interactive.pm_.c:463
-msgid "Reconfigure network now"
-msgstr "Rekonfigurer nettverket nх"
-
-#: ../../install_steps_interactive.pm_.c:464
-msgid "Do not set up networking"
-msgstr "Ikke sett opp nettverk"
-
-#: ../../install_steps_interactive.pm_.c:467
-#: ../../install_steps_interactive.pm_.c:472
-msgid "Network Configuration"
-msgstr "Nettverkskonfigurasjon"
-
-#: ../../install_steps_interactive.pm_.c:468
-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:473
-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:479
-msgid "no network card found"
-msgstr "ingen nettverkskort funnet"
-
-#: ../../install_steps_interactive.pm_.c:497
-#: ../../install_steps_interactive.pm_.c:551
-msgid "Configuring network"
-msgstr "Konfigurerer nettverk"
-
-#: ../../install_steps_interactive.pm_.c:498
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-"Vennligst entre vertsnavnet ditt hvis du vet det.\n"
-"Noen DHCP tjenere trenger vertsnavnet for х virke.\n"
-"Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
-"som ``minboks.mittlab.mittfirma.no''."
-
-#: ../../install_steps_interactive.pm_.c:502
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Host name:"
-msgstr "Vertsnavn:"
-
-#: ../../install_steps_interactive.pm_.c:521
-#: ../../install_steps_interactive.pm_.c:522
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Konfigurerer nettverksenhet %s"
-
-#: ../../install_steps_interactive.pm_.c:523
-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 ""
-"Vennligst entre IP-konfigurasjonen for denne maskinen.\n"
-"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:526
-msgid "Automatic IP"
-msgstr "Automatisk IP"
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "IP address:"
-msgstr "IP-adresse:"
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "Netmask:"
-msgstr "Nettmaske:"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:533 ../../printerdrake.pm_.c:107
-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:552
-msgid ""
-"Please enter your host name.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''.\n"
-"You may also enter the IP address of the gateway if you have one"
-msgstr ""
-"Vennligst entre vertsnavnet ditt.\n"
-"Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
-"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:556
-msgid "DNS server:"
-msgstr "DNS-tjener:"
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Gateway device:"
-msgstr "Gateway-enhet:"
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:572
+#: ../../install_steps_interactive.pm_.c:484
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -3405,93 +3279,93 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:603
+#: ../../install_steps_interactive.pm_.c:515
msgid "Choose a mirror from which to get the packages"
msgstr "Velg et speil som pakkene kan hentes fra"
-#: ../../install_steps_interactive.pm_.c:611
+#: ../../install_steps_interactive.pm_.c:523
msgid "Contacting the mirror to get the list of available packages"
msgstr "Kontakter speilet for х fх en liste over tilgjengelige pakker"
-#: ../../install_steps_interactive.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:527
msgid "Please choose the packages you want to install."
msgstr "Vennligst velg pakkene du јnsker х installere."
-#: ../../install_steps_interactive.pm_.c:628
+#: ../../install_steps_interactive.pm_.c:540
msgid "Which is your timezone?"
msgstr "Hva er din tidsone?"
-#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:541
msgid "Is your hardware clock set to GMT?"
msgstr "Er maskinvareklokken din satt til GMT?"
-#: ../../install_steps_interactive.pm_.c:662
+#: ../../install_steps_interactive.pm_.c:578
#, fuzzy
msgid "What printing system do you want to use?"
msgstr "Hvilken partisjonstype јnsker du х forandre stјrrelse pх?"
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:604
msgid "No password"
msgstr "Intet passord"
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:609
msgid "Use shadow file"
msgstr "Bruk skyggefil"
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:609
msgid "shadow"
msgstr "skygge"
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:610
msgid "MD5"
msgstr "MD5"
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:610
msgid "Use MD5 passwords"
msgstr "Bruk MD5 passord"
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:612
msgid "Use NIS"
msgstr "Bruk NIS"
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:612
msgid "yellow pages"
msgstr "gule sider"
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:618
#, 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:706
+#: ../../install_steps_interactive.pm_.c:625
msgid "Authentification NIS"
msgstr "Autentifikasjon NIS"
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:626
msgid "NIS Domain"
msgstr "NIS-domene"
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:626
msgid "NIS Server"
msgstr "NIS-tjener"
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:651
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "Godta bruker"
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:651
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "Legg til bruker"
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:652
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "(allerede lagt til %s)"
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:652
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -3501,48 +3375,48 @@ msgstr ""
"Entre en bruker\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:735
+#: ../../install_steps_interactive.pm_.c:654
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "Virkelig navn"
-#: ../../install_steps_interactive.pm_.c:736 ../../printerdrake.pm_.c:102
+#: ../../install_steps_interactive.pm_.c:655 ../../printerdrake.pm_.c:102
#: ../../printerdrake.pm_.c:136 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "Brukernavn"
-#: ../../install_steps_interactive.pm_.c:741
+#: ../../install_steps_interactive.pm_.c:660
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Skall"
-#: ../../install_steps_interactive.pm_.c:743
+#: ../../install_steps_interactive.pm_.c:662
#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr "Ikon"
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../install_steps_interactive.pm_.c:672
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "Dette passordet er for enkelt"
-#: ../../install_steps_interactive.pm_.c:754
+#: ../../install_steps_interactive.pm_.c:673
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "Vennligst oppgi et brukernavn"
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:674
#: ../../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:756
+#: ../../install_steps_interactive.pm_.c:675
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "Denne brukeren er allerede lagt til"
-#: ../../install_steps_interactive.pm_.c:781
+#: ../../install_steps_interactive.pm_.c:699
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 "
@@ -3573,19 +3447,19 @@ msgstr ""
"en diskett\n"
"i den fјrste stasjonen og trykk \"Ok\"."
-#: ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:715
msgid "First floppy drive"
msgstr "Fјrste diskettstasjon"
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:716
msgid "Second floppy drive"
msgstr "Andre diskettstasjon"
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:717
msgid "Skip"
msgstr "Dropp"
-#: ../../install_steps_interactive.pm_.c:804
+#: ../../install_steps_interactive.pm_.c:722
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 "
@@ -3610,32 +3484,32 @@ msgstr ""
"etter systemsvikt. иnsker du х opprette en oppstartsdiskett for systemet "
"ditt?"
-#: ../../install_steps_interactive.pm_.c:813
+#: ../../install_steps_interactive.pm_.c:731
msgid "Sorry, no floppy drive available"
msgstr "Beklager, ingen diskettstasjon tilgjengelig"
-#: ../../install_steps_interactive.pm_.c:816
+#: ../../install_steps_interactive.pm_.c:734
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:822
+#: ../../install_steps_interactive.pm_.c:740
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Sett inn en diskett i stasjon %s"
-#: ../../install_steps_interactive.pm_.c:825
+#: ../../install_steps_interactive.pm_.c:743
msgid "Creating bootdisk"
msgstr "Oppretter oppstartdiskett"
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:750
msgid "Preparing bootloader"
msgstr "Klargjјr oppstartslaster"
-#: ../../install_steps_interactive.pm_.c:840
+#: ../../install_steps_interactive.pm_.c:758
msgid "Do you want to use aboot?"
msgstr "иnsker du х bruke aboot?"
-#: ../../install_steps_interactive.pm_.c:843
+#: ../../install_steps_interactive.pm_.c:761
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -3643,100 +3517,80 @@ msgstr ""
"Feil ved installasjon av aboot, \n"
"prјve х installere selv om det јdelegger den fјrste partisjonen?"
-#: ../../install_steps_interactive.pm_.c:852
+#: ../../install_steps_interactive.pm_.c:770
msgid "Installation of bootloader failed. The following error occured:"
msgstr "Installasjon av oppstartslaster mislykket. Fјlgende feil oppsto:"
-#: ../../install_steps_interactive.pm_.c:867
-msgid "Proxies configuration"
-msgstr "Konfigurasjon proxy"
-
-#: ../../install_steps_interactive.pm_.c:868
-msgid "HTTP proxy"
-msgstr "HTTP-proxy"
-
-#: ../../install_steps_interactive.pm_.c:869
-msgid "FTP proxy"
-msgstr "FTP-proxy"
-
-#: ../../install_steps_interactive.pm_.c:875
-msgid "Proxy should be http://..."
-msgstr "Proxy burde vцre http://..."
-
-#: ../../install_steps_interactive.pm_.c:876
-msgid "Proxy should be ftp://..."
-msgstr "Proxy burde vцre ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:784 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Velkommen til Crackers"
-#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:785 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "Dхrlig"
-#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:786 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "Lav"
-#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:787 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "Medium"
-#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:788 ../../standalone/draksec_.c:24
msgid "High"
msgstr "Hјy"
-#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:789 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Paranoid"
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:802
msgid "Miscellaneous questions"
msgstr "Forskjellige spјrsmхl"
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:803
msgid "(may cause data corruption)"
msgstr "(kan forхrsake korrupsjon av data)"
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:803
msgid "Use hard drive optimisations?"
msgstr "Bruk harddisk-optimisering?"
-#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:804 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Velg sikkerhetsnivх"
-#: ../../install_steps_interactive.pm_.c:907
+#: ../../install_steps_interactive.pm_.c:805
#, 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:909
+#: ../../install_steps_interactive.pm_.c:807
msgid "Removable media automounting"
msgstr "Fjernbart media automontering"
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:809
msgid "Clean /tmp at each boot"
msgstr "Tјm /tmp ved hver oppstart"
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:812
msgid "Enable multi profiles"
msgstr "Slх pх multiprofiler"
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:814
msgid "Enable num lock at startup"
msgstr "Slх pх num lock ved oppstart"
-#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:817
msgid "Give the ram size in MB"
msgstr "Oppgi ram-stјrrelsen i MB"
-#: ../../install_steps_interactive.pm_.c:921
+#: ../../install_steps_interactive.pm_.c:819
msgid "Can't use supermount in high security level"
msgstr "Kan ikke bruke supermount i hјyt sikkerhetsnivх"
-#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:821
msgid ""
"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
"If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3750,7 +3604,7 @@ msgstr ""
"Mere generelt, ikke forvent х bruke maskinen din til annet enn en tjener.\n"
"Du har blitt advart."
-#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:826
msgid ""
"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
"give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -3758,7 +3612,7 @@ msgstr ""
"Vцr forsiktig, х ha numlock slхtt pх forхrsaker at mange av tastene\n"
"gir tall istedenfor vanlige bokstaver (f.eks: `p' gir `6')"
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:847
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
"By default, the 4.0 server is used unless your card is not supported.\n"
@@ -3770,17 +3624,17 @@ msgstr ""
"\n"
"иnsker du х beholde XFree 3.3?"
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:878
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
"иnsker du х generere en auto installeringsdiskett for linux replikasjon?"
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:880
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sett inn en tom diskett i stasjon %s"
-#: ../../install_steps_interactive.pm_.c:996
+#: ../../install_steps_interactive.pm_.c:894
msgid "Creating auto install floppy"
msgstr "Oppretter diskett for autoinstallasjon"
@@ -4216,25 +4070,25 @@ msgstr "Kensington Thinking Mouse (seriell)"
msgid "Mouse Systems (serial)"
msgstr "Mouse Systems (seriell)"
-#: ../../my_gtk.pm_.c:463
+#: ../../my_gtk.pm_.c:444
msgid "Is this correct?"
msgstr "Er dette riktig?"
-#: ../../netconnect.pm_.c:88
+#: ../../netconnect.pm_.c:83
msgid "Internet configuration"
msgstr "Internett-konfigurasjon"
-#: ../../netconnect.pm_.c:89
+#: ../../netconnect.pm_.c:84
msgid "Do you want to try to connect to the internet now?"
msgstr "Vil du prјve х koble opp mot Internett nх?"
-#: ../../netconnect.pm_.c:123 ../../netconnect.pm_.c:143
-#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:217
-#: ../../netconnect.pm_.c:229 ../../netconnect.pm_.c:241
+#: ../../netconnect.pm_.c:118 ../../netconnect.pm_.c:138
+#: ../../netconnect.pm_.c:192 ../../netconnect.pm_.c:212
+#: ../../netconnect.pm_.c:224 ../../netconnect.pm_.c:236
msgid "ISDN Configuration"
msgstr "ISDN-konfigurasjon"
-#: ../../netconnect.pm_.c:124
+#: ../../netconnect.pm_.c:119
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
@@ -4242,111 +4096,111 @@ msgstr ""
"Velg din tilbyder.\n"
" Hvis den ikke er i listen, velg ikke i listen"
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:139
msgid "Please fill or check the field below"
msgstr "Vennnligst fyll eller merk feltet under"
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:141
msgid "Card IRQ"
msgstr "Kort IRQ"
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:142
msgid "Card mem (DMA)"
msgstr "Kort mem (DMA)"
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:143
msgid "Card IO"
msgstr "Kort IO"
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:144
msgid "Card IO_0"
msgstr "Kort IO_0"
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:145
msgid "Card IO_1"
msgstr "Kort IO_1"
-#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:478
+#: ../../netconnect.pm_.c:146 ../../netconnect.pm_.c:519
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:147
msgid "Your personnal phone number"
msgstr "Ditt telefonnummer"
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:148
msgid "Provider name (ex provider.net)"
msgstr "Navn tilbyder (f.eks. tilbyder.net)"
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:149
msgid "Provider phone number"
msgstr "Telefonnummer tilbyder"
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:150
msgid "Provider dns 1"
msgstr "Tilbyder dns 1"
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:151
msgid "Provider dns 2"
msgstr "Tilbyder dns 2"
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:152
msgid "Dialing mode"
msgstr "Oppringningsmodus"
-#: ../../netconnect.pm_.c:158
+#: ../../netconnect.pm_.c:153
msgid "Account Login"
msgstr "Logg inn"
-#: ../../netconnect.pm_.c:159
+#: ../../netconnect.pm_.c:154
msgid "Account Password"
msgstr "Passord"
-#: ../../netconnect.pm_.c:160
+#: ../../netconnect.pm_.c:155
msgid "Confirm Password"
msgstr "Bekreft passord"
-#: ../../netconnect.pm_.c:190
+#: ../../netconnect.pm_.c:185
msgid "Germany (1TR6)"
msgstr "Tyskland (1TR6)"
-#: ../../netconnect.pm_.c:192
+#: ../../netconnect.pm_.c:187
msgid "Europe (EDSS1)"
msgstr "Europa (EDSS1)"
-#: ../../netconnect.pm_.c:194
+#: ../../netconnect.pm_.c:189
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr "Resten av verden - ingen D-kanal (leid linje)"
-#: ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:193
msgid "Which protocol do you want to use ?"
msgstr "Hvilken protokoll јnsker du х bruke?"
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:204
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:206
msgid "PCI"
msgstr "PCI"
-#: ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:208
msgid "I don't know"
msgstr "Jeg vet ikke"
-#: ../../netconnect.pm_.c:218
+#: ../../netconnect.pm_.c:213
msgid "What kind of card do you have?"
msgstr "Hva slags kort har du?"
-#: ../../netconnect.pm_.c:224
+#: ../../netconnect.pm_.c:219
msgid "Continue"
msgstr "Fortsett"
-#: ../../netconnect.pm_.c:226
+#: ../../netconnect.pm_.c:221
msgid "Abort"
msgstr "Avbryt"
-#: ../../netconnect.pm_.c:230
+#: ../../netconnect.pm_.c:225
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -4358,15 +4212,15 @@ msgstr ""
"\n"
"Hvis du har et PCMCIA kort mх du vite irq og io for kortet.\n"
-#: ../../netconnect.pm_.c:242
+#: ../../netconnect.pm_.c:237
msgid "Which is your ISDN card ?"
msgstr "Hvilket er ditt ISDN-kort?"
-#: ../../netconnect.pm_.c:279
+#: ../../netconnect.pm_.c:274
msgid "I have found an ISDN Card:\n"
msgstr "Jeg har funnet et ISDN-kort:\n"
-#: ../../netconnect.pm_.c:287
+#: ../../netconnect.pm_.c:282
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
@@ -4374,167 +4228,371 @@ msgstr ""
"Jeg har oppdaget et ISDN PCI-kort, men jeg vet ikke hviklet type. Vennligst "
"velg et PCI-kort i neste skjermbilde."
-#: ../../netconnect.pm_.c:294
+#: ../../netconnect.pm_.c:289
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr "Ingen ISDN PCI-kort funnet. Vennligst velg et i neste skjermbilde."
-#: ../../netconnect.pm_.c:406
-msgid "ISDN configuration"
+#: ../../netconnect.pm_.c:329
+#, fuzzy
+msgid "Internet Configuration."
+msgstr "Internett-konfigurasjon"
+
+#: ../../netconnect.pm_.c:330
+msgid ""
+"I need to configure your network adaptater to be able to connect to internet."
+msgstr ""
+
+#: ../../netconnect.pm_.c:332 ../../netconnect.pm_.c:348
+#: ../../standalone/drakgw_.c:198
+msgid "Choose the network interface"
+msgstr "Velg nettverksgrensesnitt"
+
+#: ../../netconnect.pm_.c:333
+#, fuzzy
+msgid ""
+"Please choose which network adaptater do you want to use to connect to "
+"internet.\n"
+"If you don't know, choose eth0.\n"
+msgstr ""
+"Vennligst velg hvilket nettverksadapter som skal kobles\n"
+"til ditt lokale nettverk (LAN)."
+
+#: ../../netconnect.pm_.c:344 ../../netconnect.pm_.c:373
+msgid "Network interface"
+msgstr "Nettverksgrensesnitt"
+
+#: ../../netconnect.pm_.c:345
+#, fuzzy
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your internet connection with that adapter?"
+msgstr ""
+"Det er bare ett konfigurert nettverksadapter i systemet ditt:\n"
+"\n"
+"$grensesnitt\n"
+"\n"
+"иnsker du х sette opp ditt lokale nettverk (LAN) med det adapteret?"
+
+#: ../../netconnect.pm_.c:349
+#, fuzzy
+msgid ""
+"Please choose which network adaptater do you want to use to connect to "
+"internet"
+msgstr "Vennligst velg hvilken serieport musen din koblet til."
+
+#: ../../netconnect.pm_.c:374
+msgid "I'm about to restart the network interface. Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:447
+#, fuzzy
+msgid "ADSL configuration"
msgstr "ISDN-konfigurasjon"
-#: ../../netconnect.pm_.c:407
+#: ../../netconnect.pm_.c:448
msgid "Do you want to start your connection at boot?"
msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
-#: ../../netconnect.pm_.c:461
+#: ../../netconnect.pm_.c:502
msgid "Try to find a modem?"
msgstr "Prјve х finne et modem?"
-#: ../../netconnect.pm_.c:471
+#: ../../netconnect.pm_.c:512
msgid "Please choose which serial port your modem is connected to."
msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
-#: ../../netconnect.pm_.c:477
+#: ../../netconnect.pm_.c:518
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../../netconnect.pm_.c:479
+#: ../../netconnect.pm_.c:520
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../../netconnect.pm_.c:480
+#: ../../netconnect.pm_.c:521
msgid "Login ID"
msgstr "Login ID"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "CHAP"
msgstr "CHAP"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:524
msgid "Domain name"
msgstr "Domenenavn"
-#: ../../netconnect.pm_.c:485
+#: ../../netconnect.pm_.c:526
msgid "First DNS Server"
msgstr "Fјrste DNS-tjener"
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:527
msgid "Second DNS Server"
msgstr "Andre DNS-tjener"
-#: ../../netconnect.pm_.c:498
+#: ../../netconnect.pm_.c:545
msgid "Connect to internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:500
+#: ../../netconnect.pm_.c:547
msgid "Disconnect from internet"
msgstr "Koble ned fra Internett"
-#: ../../netconnect.pm_.c:502
+#: ../../netconnect.pm_.c:549
msgid "Configure internet connexion"
msgstr "Konfigurer Internett-tilkobling"
-#: ../../netconnect.pm_.c:505
+#: ../../netconnect.pm_.c:552
msgid "Internet connection & configuration"
msgstr "Internett tilkobling & konfigurasjon"
-#: ../../netconnect.pm_.c:506
+#: ../../netconnect.pm_.c:553
msgid "What do you wish to do?"
msgstr "Hva јnsker du х gjјre?"
-#: ../../netconnect.pm_.c:521
+#: ../../netconnect.pm_.c:568
msgid "Connect to internet with a normal modem"
msgstr "Koble opp mot Internett med vanlig modem"
-#: ../../netconnect.pm_.c:523
+#: ../../netconnect.pm_.c:570
msgid "Connect to internet using ISDN"
msgstr "Koble opp mot Internett med ISDN"
-#: ../../netconnect.pm_.c:525
+#: ../../netconnect.pm_.c:572
msgid "Connect to internet using DSL (or ADSL)"
msgstr "Koble opp mot Internett med DSL (eller ADSL)"
-#: ../../netconnect.pm_.c:527
+#: ../../netconnect.pm_.c:574
msgid "Connect to internet using Cable"
msgstr "Koble opp mot Internett med kabel"
-#: ../../netconnect.pm_.c:529
-msgid "Do not connect to internet"
-msgstr "Ikke koble opp mot Internett"
+#: ../../netconnect.pm_.c:576
+#, fuzzy
+msgid "Configure LAN"
+msgstr "Konfigurer X"
-#: ../../netconnect.pm_.c:532 ../../netconnect.pm_.c:555
-#: ../../netconnect.pm_.c:579 ../../netconnect.pm_.c:595
-#: ../../netconnect.pm_.c:606 ../../netconnect.pm_.c:632
-msgid "Connect to the Internet"
+#: ../../netconnect.pm_.c:578
+#, fuzzy
+msgid "End configuration"
+msgstr "ISDN-konfigurasjon"
+
+#: ../../netconnect.pm_.c:581
+#, fuzzy
+msgid "Connect to the Internet / Configure LAN"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:533
+#: ../../netconnect.pm_.c:582
msgid "How do you want to connect to the Internet?"
msgstr "Hvordan vil du koble opp mot Internett?"
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:603
msgid "Internal ISDN card"
msgstr "Internt ISDN-kort"
-#: ../../netconnect.pm_.c:552
+#: ../../netconnect.pm_.c:605
msgid "External modem"
msgstr "Eksternt modem"
-#: ../../netconnect.pm_.c:556
+#: ../../netconnect.pm_.c:608 ../../netconnect.pm_.c:643
+#: ../../netconnect.pm_.c:654 ../../netconnect.pm_.c:680
+msgid "Connect to the Internet"
+msgstr "Koble opp mot Internett"
+
+#: ../../netconnect.pm_.c:609
msgid "What kind is your ISDN connection?"
msgstr "Hva slags type er ISDN-tilknytningen din?"
-#: ../../netconnect.pm_.c:580
-msgid "Have you been provided with a hostname?"
-msgstr "Har du et vertsnavn?"
+#: ../../netconnect.pm_.c:628
+#, fuzzy
+msgid "Cable connection"
+msgstr "Skrivertilkobling"
-#: ../../netconnect.pm_.c:590
+#: ../../netconnect.pm_.c:629 ../../network.pm_.c:278
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
+msgstr ""
+"Vennligst entre vertsnavnet ditt hvis du vet det.\n"
+"Noen DHCP tjenere trenger vertsnavnet for х virke.\n"
+"Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
+"som ``minboks.mittlab.mittfirma.no''."
+
+#: ../../netconnect.pm_.c:633 ../../network.pm_.c:282 ../../network.pm_.c:322
+msgid "Host name:"
+msgstr "Vertsnavn:"
+
+#: ../../netconnect.pm_.c:638
msgid "France"
msgstr "Frankrike"
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:640
msgid "Other countries"
msgstr "Andre land"
-#: ../../netconnect.pm_.c:596
+#: ../../netconnect.pm_.c:644
msgid "On which country are you located ?"
msgstr "I hvilket land er du ?"
-#: ../../netconnect.pm_.c:607
-msgid ""
-"If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
+#: ../../netconnect.pm_.c:649
+#, fuzzy
+msgid "alcatel modem"
+msgstr "Eksternt modem"
+
+#: ../../netconnect.pm_.c:651
+#, fuzzy
+msgid "ECI modem"
+msgstr "Eksternt modem"
+
+#: ../../netconnect.pm_.c:655
+#, fuzzy
+msgid "If your adsl modem is an alcatel one, choose alcatel. Otherwise, ECI."
msgstr "Hvis adsl modemet ditt er alcatel, velg pptp alcatel. ellers, pppoe."
-#: ../../netconnect.pm_.c:627
-msgid "using pppoe"
+#: ../../netconnect.pm_.c:675
+msgid "use pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:677
+msgid "don't use pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:681
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, it exists some connexion that only use dhcp. If you don't know, "
+"choose 'use pppoe'"
msgstr ""
-#: ../../netconnect.pm_.c:629
-msgid "using dhcp"
+#: ../../network.pm_.c:242
+msgid "Keep the current IP configuration"
+msgstr "Behold nхvцrende IP-konfigurasjon"
+
+#: ../../network.pm_.c:243
+msgid "Reconfigure network now"
+msgstr "Rekonfigurer nettverket nх"
+
+#: ../../network.pm_.c:244
+msgid "Do not set up networking"
+msgstr "Ikke sett opp nettverk"
+
+#: ../../network.pm_.c:247 ../../network.pm_.c:252
+msgid "Network Configuration"
+msgstr "Nettverkskonfigurasjon"
+
+#: ../../network.pm_.c:248
+msgid "Local networking has already been configured. Do you want to:"
+msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:"
+
+#: ../../network.pm_.c:253
+msgid "Do you want to configure a local network for your system?"
+msgstr "Vil du konfigurere lokalt LAN-nettverk for systemet ditt?"
+
+#: ../../network.pm_.c:259
+msgid "no network card found"
+msgstr "ingen nettverkskort funnet"
+
+#: ../../network.pm_.c:277 ../../network.pm_.c:317
+msgid "Configuring network"
+msgstr "Konfigurerer nettverk"
+
+#: ../../network.pm_.c:296
+msgid "Proxies configuration"
+msgstr "Konfigurasjon proxy"
+
+#: ../../network.pm_.c:297
+msgid "HTTP proxy"
+msgstr "HTTP-proxy"
+
+#: ../../network.pm_.c:298
+msgid "FTP proxy"
+msgstr "FTP-proxy"
+
+#: ../../network.pm_.c:304
+msgid "Proxy should be http://..."
+msgstr "Proxy burde vцre http://..."
+
+#: ../../network.pm_.c:305
+msgid "Proxy should be ftp://..."
+msgstr "Proxy burde vцre ftp://..."
+
+#: ../../network.pm_.c:318
+msgid ""
+"Please enter your host name.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''.\n"
+"You may also enter the IP address of the gateway if you have one"
msgstr ""
+"Vennligst entre vertsnavnet ditt.\n"
+"Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
+"sх som ``minboks.mittlab.mittfirma.no''.\n"
+"Du kan ogsх entre IP-adressen til gateway'en hvis du har en"
+
+#: ../../network.pm_.c:322
+msgid "DNS server:"
+msgstr "DNS-tjener:"
+
+#: ../../network.pm_.c:322
+msgid "Gateway device:"
+msgstr "Gateway-enhet:"
+
+#: ../../network.pm_.c:322
+msgid "Gateway:"
+msgstr "Gateway:"
-#: ../../netconnect.pm_.c:633
+#: ../../network.pm_.c:356 ../../network.pm_.c:357
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Konfigurerer nettverksenhet %s"
+
+#: ../../network.pm_.c:358
msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"However, it exists some connexion that use dhcp. Dhcp usually doesn't "
-"require login/password, so it may be a hint to know what your connexion is."
+"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 ""
+"Vennligst entre IP-konfigurasjonen for denne maskinen.\n"
+"Hvert element bјr entres som en IP-adresse i punkt-desimal\n"
+"notasjon (f.eks, 1.2.3.4)."
+
+#: ../../network.pm_.c:361
+msgid "Automatic IP"
+msgstr "Automatisk IP"
+
+#: ../../network.pm_.c:361
+msgid "IP address:"
+msgstr "IP-adresse:"
+
+#: ../../network.pm_.c:361
+msgid "Netmask:"
+msgstr "Nettmaske:"
+
+#: ../../network.pm_.c:362
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:368 ../../printerdrake.pm_.c:107
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP-adresse bјr vцre i format 1.2.3.4"
#: ../../partition_table.pm_.c:542
msgid "Extended partition not supported on this platform"
@@ -4598,15 +4656,15 @@ msgstr "interessant"
msgid "maybe"
msgstr "kanskje"
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
msgid "i18n (important)"
msgstr "i18n (viktig)"
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
msgid "i18n (very nice)"
msgstr "i18n (veldig bra)"
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
msgid "i18n (nice)"
msgstr "i18n (bra)"
@@ -4904,7 +4962,7 @@ msgstr "Skriver"
msgid "Would you like to configure a printer?"
msgstr "иnsker du х konfigurere en skriver?"
-#: ../../printerdrake.pm_.c:335
+#: ../../printerdrake.pm_.c:334
msgid ""
"Here are the following print queues.\n"
"You can add some more or change the existing ones."
@@ -4912,20 +4970,20 @@ msgstr ""
"Her er fјlgende skriverkј.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../../printerdrake.pm_.c:363 ../../printerdrake.pm_.c:370
-#: ../../printerdrake.pm_.c:382
+#: ../../printerdrake.pm_.c:362 ../../printerdrake.pm_.c:369
+#: ../../printerdrake.pm_.c:381
msgid "Select Printer Connection"
msgstr "Velg skrivertilkobling"
-#: ../../printerdrake.pm_.c:364
+#: ../../printerdrake.pm_.c:363
msgid "How is the printer connected?"
msgstr "Hvordan er skriveren tilkoblet?"
-#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:382
+#: ../../printerdrake.pm_.c:369 ../../printerdrake.pm_.c:381
msgid "Remove queue"
msgstr "Fjern kј"
-#: ../../printerdrake.pm_.c:371
+#: ../../printerdrake.pm_.c:370
#, fuzzy
msgid ""
"Every printer managed by CUPS need a name (for example lp).\n"
@@ -4937,26 +4995,26 @@ 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:375
+#: ../../printerdrake.pm_.c:374
#, fuzzy
msgid "Name of printer"
msgstr "Lokal skriver"
-#: ../../printerdrake.pm_.c:376
+#: ../../printerdrake.pm_.c:375
#, fuzzy
msgid "Description"
msgstr "Spesifiser opsjoner"
-#: ../../printerdrake.pm_.c:377
+#: ../../printerdrake.pm_.c:376
#, fuzzy
msgid "Location"
msgstr "Informasjon"
-#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:388
+#: ../../printerdrake.pm_.c:377 ../../printerdrake.pm_.c:387
msgid "Printer Connection"
msgstr "Skrivertilkobling"
-#: ../../printerdrake.pm_.c:383
+#: ../../printerdrake.pm_.c:382
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"
@@ -4967,11 +5025,11 @@ 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:386
+#: ../../printerdrake.pm_.c:385
msgid "Name of queue"
msgstr "Kјens navn"
-#: ../../printerdrake.pm_.c:387
+#: ../../printerdrake.pm_.c:386
msgid "Spool directory"
msgstr "Spolingskatalog"
@@ -5230,48 +5288,48 @@ msgstr ""
"Jeg kan ikke lese partisjonstabellen din, den er for јdelagt for meg :(\n"
"Jeg vil fјrsјke х blanke ut dхrlige partisjoner"
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
msgid "Configure LILO/GRUB"
msgstr "Konfigurer LILO/GRUB"
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
msgid "Create a boot floppy"
msgstr "Opprett en oppstartdiskett"
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
msgid "Format floppy"
msgstr "Formater diskett"
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
msgid "Choice"
msgstr "Valg"
-#: ../../standalone/drakboot_.c:58
+#: ../../standalone/drakboot_.c:59
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. Fјlgende feil oppsto:"
-#: ../../standalone/drakgw_.c:84
+#: ../../standalone/drakgw_.c:86
msgid "Internet Connection Sharing currently enabled"
msgstr "Deling av Internett tilkobling er slхtt pх"
-#: ../../standalone/drakgw_.c:85 ../../standalone/drakgw_.c:103
+#: ../../standalone/drakgw_.c:87 ../../standalone/drakgw_.c:105
msgid "The setup of Internet connection sharing has already been done.\n"
msgstr ""
"Innstilling av deling av Internett tilkobling har allerede blitt gjort.\n"
-#: ../../standalone/drakgw_.c:102
+#: ../../standalone/drakgw_.c:104
msgid "Internet Connection Sharing currently disabled"
msgstr "Deling av Internett tilkobling er slхtt av"
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:122
msgid "Config file content could not be interpreted."
msgstr "Innhold i konfig-fil kunne ikke bli tolket."
-#: ../../standalone/drakgw_.c:130
+#: ../../standalone/drakgw_.c:132
msgid "Internet Connection Sharing"
msgstr "Deling av Internett tilkobling"
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:133
msgid ""
"Your computer can be configured to share its Internet connection.\n"
"\n"
@@ -5279,117 +5337,83 @@ msgstr ""
"Maskin din kan konfigureres til х dele dens Internett tilkobling.\n"
"\n"
-#: ../../standalone/drakgw_.c:180
+#: ../../standalone/drakgw_.c:186
msgid "No network adapter on your system!"
msgstr "Ikke noe nettverksadapter i systemet ditt!"
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:187
+#, fuzzy
msgid ""
-"No ethernet network adapter is currently configured on your system. Please "
-"run the hardware configuration tool."
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
msgstr ""
"Ikke noe ethernet nettverksadapter er for јyeblikket konfigurert i systemet "
"ditt. Vennligst bruk verktјyet for maskinvarekonfigurasjon."
-#: ../../standalone/drakgw_.c:187
-msgid "Network interface"
-msgstr "Nettverksgrensesnitt"
-
-#: ../../standalone/drakgw_.c:188
-msgid ""
-"There is only one configured network adapter on your system:\n"
-"\n"
-"$interface\n"
-"\n"
-"Would you like to setup your Local Area Network with that adapter?"
-msgstr ""
-"Det er bare ett konfigurert nettverksadapter i systemet ditt:\n"
-"\n"
-"$grensesnitt\n"
-"\n"
-"иnsker du х sette opp ditt lokale nettverk (LAN) med det adapteret?"
-
-#: ../../standalone/drakgw_.c:192
-msgid "Choose the network interface"
-msgstr "Velg nettverksgrensesnitt"
-
-#: ../../standalone/drakgw_.c:193
+#: ../../standalone/drakgw_.c:199
+#, fuzzy
msgid ""
-"Please choose what network adapter will be connected\n"
-"to your Local Area Network."
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
msgstr ""
"Vennligst velg hvilket nettverksadapter som skal kobles\n"
"til ditt lokale nettverk (LAN)."
-#: ../../standalone/drakgw_.c:205
-msgid "Local Area Network specification"
-msgstr "Spesifikasjon lokalt nettverk (LAN)"
-
-#: ../../standalone/drakgw_.c:206
-msgid "You may now decide which class C network to use.\n"
-msgstr "Du kan nх bestemme hvilket klasse C nettverk som skal brukes.\n"
-
-#: ../../standalone/drakgw_.c:207
-msgid "Network:"
-msgstr "Nettverk:"
+#: ../../standalone/drakgw_.c:208
+#, fuzzy
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
+msgstr ""
+"Ikke noe ethernet nettverksadapter er for јyeblikket konfigurert i systemet "
+"ditt. Vennligst bruk verktјyet for maskinvarekonfigurasjon."
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:233
msgid "Potential LAN address conflict found in current config of $_!\n"
msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til $_!\n"
-#: ../../standalone/drakgw_.c:233
-msgid "Internet Connection Sharing - setup of $device"
-msgstr "Deling av Internett tilkobling - oppsett av $enhet"
+#: ../../standalone/drakgw_.c:243
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Brannmurkonfigurasjon oppdaget.!"
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:244
+#, fuzzy
msgid ""
-"The following interface is about to be configured:\n"
-"\n"
-"$interface\n"
-"\n"
-msgstr ""
-"Fјlgende grensesnitt er i ferd med х bli konfigurert:\n"
-"\n"
-"$grensesnitt\n"
-"\n"
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
+msgstr "Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget.\n"
-#: ../../standalone/drakgw_.c:245
+#: ../../standalone/drakgw_.c:258
msgid "Configuring scripts, installing software, starting servers..."
msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
-#: ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:282
msgid "Could not install ipchains RPM with urpmi."
msgstr "Kunne ikke installere ipchains RPM med urpmi."
-#: ../../standalone/drakgw_.c:395
+#: ../../standalone/drakgw_.c:432
msgid "Could not install dhcp RPM with urpmi."
msgstr "Kunne ikke installere dhcp RPM med urpmi."
-#: ../../standalone/drakgw_.c:419
+#: ../../standalone/drakgw_.c:456
msgid "Could not install linuxconf RPM with urpmi."
msgstr "Kunne ikke installere linuxconf RPM med urpmi."
-#: ../../standalone/drakgw_.c:435
+#: ../../standalone/drakgw_.c:472
msgid "Could not install bind RPM with urpmi."
msgstr "Kunne ikke installere bind RPM med urpmi."
-#: ../../standalone/drakgw_.c:439
+#: ../../standalone/drakgw_.c:476
msgid "Could not install caching-nameserver RPM with urpmi."
msgstr "Kunne ikke installere caching-nameserver RPM med urpmi."
-#: ../../standalone/drakgw_.c:451
-msgid "Firewalling configuration detected.!"
-msgstr "Brannmurkonfigurasjon oppdaget.!"
-
-#: ../../standalone/drakgw_.c:452
-msgid "Warning! An existing firewalling configuration has been detected.\n"
-msgstr "Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget.\n"
-
-#: ../../standalone/drakgw_.c:455
-msgid "Everything configured!"
-msgstr "Alt er konfigurert!"
+#: ../../standalone/drakgw_.c:488
+#, fuzzy
+msgid "Congratulations!"
+msgstr "Konfigurasjon"
-#: ../../standalone/drakgw_.c:456
+#: ../../standalone/drakgw_.c:489
msgid "Everything has been configured.\n"
msgstr "Alt har blitt konfigurert.\n"
@@ -5454,10 +5478,6 @@ msgstr "Setter sikkerhetsnivх"
msgid "Choose the tool you want to use"
msgstr "Velg verktјyet du јnsker х bruke"
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Hva er tastatur-oppsettet ditt?"
-
#: ../../standalone/mousedrake_.c:25
msgid "What is the type of your mouse?"
msgstr "Hva slags type er musen din?"
@@ -5683,6 +5703,65 @@ msgstr "Finner tillatelser"
msgid "Finding leaves takes some time"
msgstr "Finne tillatelser vil ta litt tid"
+#~ msgid "curly"
+#~ msgstr "krјllet"
+
+#~ msgid "default"
+#~ msgstr "standard"
+
+#~ msgid "tie"
+#~ msgstr "bхnd"
+
+#~ msgid "brunette"
+#~ msgstr "brunette"
+
+#~ msgid "girl"
+#~ msgstr "jente"
+
+#~ msgid "woman-blond"
+#~ msgstr "kvinneblond"
+
+#~ msgid "automagic"
+#~ msgstr "Automagisk"
+
+#~ msgid "Upgrade"
+#~ msgstr "Oppgrader"
+
+#~ msgid "Do not connect to internet"
+#~ msgstr "Ikke koble opp mot Internett"
+
+#~ msgid "Have you been provided with a hostname?"
+#~ msgstr "Har du et vertsnavn?"
+
+#~ msgid "Local Area Network specification"
+#~ msgstr "Spesifikasjon lokalt nettverk (LAN)"
+
+#~ msgid "You may now decide which class C network to use.\n"
+#~ msgstr "Du kan nх bestemme hvilket klasse C nettverk som skal brukes.\n"
+
+#~ msgid "Network:"
+#~ msgstr "Nettverk:"
+
+#~ msgid "Internet Connection Sharing - setup of $device"
+#~ msgstr "Deling av Internett tilkobling - oppsett av $enhet"
+
+#~ msgid ""
+#~ "The following interface is about to be configured:\n"
+#~ "\n"
+#~ "$interface\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Fјlgende grensesnitt er i ferd med х bli konfigurert:\n"
+#~ "\n"
+#~ "$grensesnitt\n"
+#~ "\n"
+
+#~ msgid "Everything configured!"
+#~ msgstr "Alt er konfigurert!"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Hva er tastatur-oppsettet ditt?"
+
#~ msgid "Normal"
#~ msgstr "Normal"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 37bca29a5..72dd17f7c 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-08-31 20:21+0200\n"
+"POT-Creation-Date: 2000-09-02 12:09+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"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:289
msgid "Generic"
msgstr "Generic"
@@ -35,33 +35,33 @@ msgstr "Изаберите X сервер"
msgid "X server"
msgstr "X сервер"
-#: ../../Xconfigurator.pm_.c:203
+#: ../../Xconfigurator.pm_.c:204
msgid "Do you want support for hardware 3D acceleration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:211
+#: ../../Xconfigurator.pm_.c:212
msgid ""
"Your card can have 3D acceleration but only with XFree 3.3.\n"
"Do You want to use XFree 3.3 instead of XFree 4.0?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:235
+#: ../../Xconfigurator.pm_.c:236
msgid "Select the memory size of your graphic card"
msgstr "Количина меморије на графичкој картици"
-#: ../../Xconfigurator.pm_.c:277
+#: ../../Xconfigurator.pm_.c:278
msgid "Choose options for server"
msgstr "Опције за сервер"
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:289
msgid "Choose a monitor"
msgstr "Изаберите монитор"
-#: ../../Xconfigurator.pm_.c:288
+#: ../../Xconfigurator.pm_.c:289
msgid "Monitor"
msgstr "Монитор"
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:292
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -81,39 +81,39 @@ msgstr ""
"ВЕОМА ЈЕ ВАЖНО да не наведете тип монитора који има овај опсег већи него\n"
"што га има ваш монитор. Ако нисте сигурни, одаберите мање вредности."
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:299
msgid "Horizontal refresh rate"
msgstr "Хоризонтална фреквенција"
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:299
msgid "Vertical refresh rate"
msgstr "Вертикална фреквенција"
-#: ../../Xconfigurator.pm_.c:337
+#: ../../Xconfigurator.pm_.c:338
msgid "Monitor not configured"
msgstr "Монитор није конфигурисан"
-#: ../../Xconfigurator.pm_.c:340
+#: ../../Xconfigurator.pm_.c:341
msgid "Graphic card not configured yet"
msgstr "Графичка карта још није конфигурисана"
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:344
msgid "Resolutions not chosen yet"
msgstr "Резолуција још није изабрана"
-#: ../../Xconfigurator.pm_.c:356
+#: ../../Xconfigurator.pm_.c:357
msgid "Do you want to test the configuration?"
msgstr "Да ли хоћете да тестирате конфигурацију?"
-#: ../../Xconfigurator.pm_.c:360
+#: ../../Xconfigurator.pm_.c:361
msgid "Warning: testing is dangerous on this graphic card"
msgstr "Упозорење: тестирање може бити опасно по графичку картицу"
-#: ../../Xconfigurator.pm_.c:363
+#: ../../Xconfigurator.pm_.c:364
msgid "Test of the configuration"
msgstr "Тестирање конфигурације"
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:403
msgid ""
"\n"
"try to change some parameters"
@@ -121,28 +121,28 @@ msgstr ""
"\n"
"покушајте са променом параметара"
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:403
msgid "An error has occurred:"
msgstr "Хм, грешка:"
-#: ../../Xconfigurator.pm_.c:425
+#: ../../Xconfigurator.pm_.c:426
#, c-format
msgid "Leaving in %d seconds"
msgstr "Излаз за %d секунди"
-#: ../../Xconfigurator.pm_.c:429
+#: ../../Xconfigurator.pm_.c:430
msgid "Is this the correct setting?"
msgstr "Да ли је ово исправно подeшено?"
-#: ../../Xconfigurator.pm_.c:437
+#: ../../Xconfigurator.pm_.c:438
msgid "An error has occurred, try to change some parameters"
msgstr "Хм, појавила се грешка, пробајте да променитe параметре"
-#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:446 ../../Xconfigurator.pm_.c:630
msgid "Automatic resolutions"
msgstr "Аутоматско подешавање резолуције"
-#: ../../Xconfigurator.pm_.c:446
+#: ../../Xconfigurator.pm_.c:447
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -277,7 +277,7 @@ msgstr "Тестирај поново"
msgid "Quit"
msgstr "Крај"
-#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1059 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr "Шта желите да урадите?"
@@ -306,11 +306,11 @@ msgstr ""
"Ja могу подести ваш рачунар да аутоматски подиже X окружење при стартању.\n"
"Да ли желите X окружење при рестарту ?"
-#: ../../Xconfigurator.pm_.c:1116
+#: ../../Xconfigurator.pm_.c:1117
msgid "Autologin"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1117
+#: ../../Xconfigurator.pm_.c:1118
#, fuzzy
msgid ""
"I can set up your computer to automatically log on one user.\n"
@@ -319,236 +319,212 @@ msgstr ""
"Ja могу подести ваш рачунар да аутоматски подиже X окружење при стартању.\n"
"Да ли желите X окружење при рестарту ?"
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1120
#, fuzzy
msgid "Choose the default user:"
msgstr "Изаберите нову величину"
-#: ../../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator.pm_.c:1121
+#, fuzzy
+msgid "Choose the window_manager to run:"
+msgstr "Изаберите алат које желите да користите"
+
+#: ../../Xconfigurator_consts.pm_.c:5
msgid "256 colors (8 bits)"
msgstr "256 боја (8-битна палета)"
-#: ../../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:6
msgid "32 thousand colors (15 bits)"
msgstr "32 хиљаде боја (15-битна палета)"
-#: ../../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:7
msgid "65 thousand colors (16 bits)"
msgstr "65 хиљада боја (16-битна палета)"
-#: ../../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:8
msgid "16 million colors (24 bits)"
msgstr "16 милиона боја (24-битна палета)"
-#: ../../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:9
msgid "4 billion colors (32 bits)"
msgstr "4 милијарде боја (32-битна палета)"
-#: ../../Xconfigurator_consts.pm_.c:103
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "256 kB"
msgstr "256 kB"
-#: ../../Xconfigurator_consts.pm_.c:104
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "512 kB"
msgstr "512 kB"
-#: ../../Xconfigurator_consts.pm_.c:105
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "1 MB"
msgstr "1 MB"
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "2 MB"
msgstr "2 MB"
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "4 MB"
msgstr "4 MB"
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "8 MB"
msgstr "8 MB"
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:110
msgid "16 MB or more"
msgstr "16 MB или више"
-#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:115 ../../Xconfigurator_consts.pm_.c:116
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr "Стандардни VGA, 640x480 на 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "Super VGA, 800x600 at 56 Hz"
msgstr "Супер VGA, 800x600 на 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr "8514 компат., 1024x768 на 87 Hz са преплитањем (не 800x600)"
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr "Супер VGA, 1024x768 на 87 Hz са преплитањем, 800x600 на 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr "Extended Super VGA, 800x600 на 60 Hz, 640x480 на 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr "SVGA без преплитања, 1024x768 на 60 Hz, 800x600 на 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr "Високофреквентни SVGA, 1024x768 на 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr "Монитор који ради са 1280x1024 на 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr "Монитор који ради са 1280x1024 на 74 Hz"
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr "Монитор који ради са 1280x1024 на 76 Hz"
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr "Монитор који ради са 1600x1200 на 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:127
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr "Монитор који ради са 1600x1200 на 76 Hz"
-#: ../../any.pm_.c:20
-msgid "curly"
-msgstr "таласасто"
-
-#: ../../any.pm_.c:20
-msgid "default"
-msgstr "По default-y"
-
-#. -PO: names (tie, curly...) have corresponding icons for kdm
-#: ../../any.pm_.c:20
-msgid "tie"
-msgstr "краватa"
-
-#: ../../any.pm_.c:21
-msgid "brunette"
-msgstr "црнкa"
-
-#: ../../any.pm_.c:21
-msgid "girl"
-msgstr "девоjкa"
-
-#: ../../any.pm_.c:21
-msgid "woman-blond"
-msgstr "плавушa"
-
-#: ../../any.pm_.c:22
-msgid "automagic"
-msgstr "Аутомагија"
-
-#: ../../any.pm_.c:85 ../../any.pm_.c:115
+#: ../../any.pm_.c:91 ../../any.pm_.c:121
msgid "First sector of boot partition"
msgstr "Први сектор стартне партиције"
-#: ../../any.pm_.c:85 ../../any.pm_.c:115 ../../any.pm_.c:144
+#: ../../any.pm_.c:91 ../../any.pm_.c:121 ../../any.pm_.c:150
msgid "First sector of drive (MBR)"
msgstr "Први сектор диска (MBR)"
-#: ../../any.pm_.c:89
+#: ../../any.pm_.c:95
msgid "SILO Installation"
msgstr "SILO инсталација"
-#: ../../any.pm_.c:90 ../../any.pm_.c:96
+#: ../../any.pm_.c:96 ../../any.pm_.c:102
msgid "Where do you want to install the bootloader?"
msgstr "Где бисте да инсталирате стартер?"
-#: ../../any.pm_.c:95
+#: ../../any.pm_.c:101
msgid "LILO/grub Installation"
msgstr "LILO/grub инсталација"
-#: ../../any.pm_.c:105
+#: ../../any.pm_.c:111
msgid "None"
msgstr "Ниjедан"
-#: ../../any.pm_.c:105
+#: ../../any.pm_.c:111
msgid "Which bootloader(s) do you want to use?"
msgstr "Који стартер желитe да користитe ?"
-#: ../../any.pm_.c:119
+#: ../../any.pm_.c:125
msgid "Bootloader installation"
msgstr "Инсталациja стартерa"
-#: ../../any.pm_.c:121
+#: ../../any.pm_.c:127
msgid "Boot device"
msgstr "Стартни (boot) уређај"
-#: ../../any.pm_.c:122
+#: ../../any.pm_.c:128
msgid "LBA (doesn't work on old BIOSes)"
msgstr "LBA (не ради на старим BIOS-имa)"
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:129
msgid "Compact"
msgstr "Компакт"
-#: ../../any.pm_.c:123
+#: ../../any.pm_.c:129
msgid "compact"
msgstr "компакт"
-#: ../../any.pm_.c:124
+#: ../../any.pm_.c:130
msgid "Video mode"
msgstr "Видео мод"
-#: ../../any.pm_.c:126
+#: ../../any.pm_.c:132
msgid "Delay before booting default image"
msgstr "Пауза пре стартања default image-а"
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:687
-#: ../../install_steps_interactive.pm_.c:738 ../../netconnect.pm_.c:481
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:606
+#: ../../install_steps_interactive.pm_.c:657 ../../netconnect.pm_.c:522
#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:137
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "Лозинка"
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:688
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:607
+#: ../../install_steps_interactive.pm_.c:658
#: ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "Лозинка (поновите)"
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:136
msgid "Restrict command line options"
msgstr "Ограничена командна линика - опције"
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:136
msgid "restrict"
msgstr "ограничено"
-#: ../../any.pm_.c:136
+#: ../../any.pm_.c:142
msgid "Bootloader main options"
msgstr "Главне опције стартерa"
-#: ../../any.pm_.c:139
+#: ../../any.pm_.c:145
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"Опција``Ограничена командна линика - опције'' је неупотребљива без лозинке"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:616
+#: ../../install_steps_interactive.pm_.c:671
#: ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "Пробајте поново"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:697
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:616
+#: ../../install_steps_interactive.pm_.c:671
#: ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "Неподударност лозинки"
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:157
msgid ""
"Here are the different entries.\n"
"You can add some more or change the existing ones."
@@ -556,91 +532,199 @@ msgstr ""
"Ово су постављне опције.\n"
"Можете додати нове или изменити старе."
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:337
+#: ../../any.pm_.c:165 ../../printerdrake.pm_.c:336
#: ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "Додај"
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:732 ../../printerdrake.pm_.c:337
+#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
+#: ../../install_steps_interactive.pm_.c:651 ../../printerdrake.pm_.c:336
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Урађено"
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:174
msgid "Which type of entry do you want to add?"
msgstr "Коју врсту уносa додаjетe ?"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Linux"
msgstr "Линукс"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Other OS (SunOS...)"
msgstr "Други ОС-ови (SunОS,Windows,BSD,BeOS,...)"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:175
msgid "Other OS (windows...)"
msgstr "Други ОС-ови (Windows,BSD,BeOS,...)"
-#: ../../any.pm_.c:190
+#: ../../any.pm_.c:196
msgid "Image"
msgstr "Слика"
-#: ../../any.pm_.c:191 ../../any.pm_.c:199
+#: ../../any.pm_.c:197 ../../any.pm_.c:205
msgid "Root"
msgstr "Root"
-#: ../../any.pm_.c:192
+#: ../../any.pm_.c:198
msgid "Append"
msgstr "Додатaк"
-#: ../../any.pm_.c:193
+#: ../../any.pm_.c:199
msgid "Initrd"
msgstr "Initrd"
-#: ../../any.pm_.c:194
+#: ../../any.pm_.c:200
msgid "Read-write"
msgstr "Читање-писање RW"
-#: ../../any.pm_.c:201
+#: ../../any.pm_.c:207
msgid "Table"
msgstr "Табела"
-#: ../../any.pm_.c:202
+#: ../../any.pm_.c:208
msgid "Unsafe"
msgstr "Несигурно"
-#: ../../any.pm_.c:208
+#: ../../any.pm_.c:214
msgid "Label"
msgstr "Ознака"
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:216
msgid "Default"
msgstr "Подразумевано"
-#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
-#: ../../install_steps_interactive.pm_.c:685 ../../interactive.pm_.c:74
+#: ../../any.pm_.c:219 ../../install_steps_gtk.pm_.c:608
+#: ../../install_steps_interactive.pm_.c:604 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:370
-#: ../../printerdrake.pm_.c:382
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:209
+#: ../../my_gtk.pm_.c:444 ../../my_gtk.pm_.c:619 ../../printerdrake.pm_.c:369
+#: ../../printerdrake.pm_.c:381
msgid "Ok"
msgstr "У реду"
-#: ../../any.pm_.c:213
+#: ../../any.pm_.c:219
msgid "Remove entry"
msgstr "Уклањам унос"
-#: ../../any.pm_.c:216
+#: ../../any.pm_.c:222
msgid "Empty label not allowed"
msgstr "Празна ознака није дозвољена"
-#: ../../any.pm_.c:217
+#: ../../any.pm_.c:223
msgid "This label is already used"
msgstr "Ова ознака је већ у употреби"
+#: ../../any.pm_.c:420
+msgid "Configuring PCMCIA cards..."
+msgstr "Конфигуришем PCMCIA картице..."
+
+#: ../../any.pm_.c:420
+msgid "PCMCIA"
+msgstr "PCMCIA"
+
+#: ../../any.pm_.c:441
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Пронађено %s %s интерфејсa"
+
+#: ../../any.pm_.c:442
+msgid "Do you have another one?"
+msgstr "Да ли имате још један?"
+
+#: ../../any.pm_.c:443
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Имате ли још %s интерфејса?"
+
+#: ../../any.pm_.c:445 ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:443
+#: ../../netconnect.pm_.c:80 ../../netconnect.pm_.c:444
+#: ../../printerdrake.pm_.c:217
+msgid "No"
+msgstr "Не"
+
+#: ../../any.pm_.c:445 ../../interactive.pm_.c:79 ../../my_gtk.pm_.c:443
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:442
+msgid "Yes"
+msgstr "Да"
+
+#: ../../any.pm_.c:446
+msgid "See hardware info"
+msgstr "Погледај информације о хардверу"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../any.pm_.c:463
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Инсталирам драјвер за %s картицу %s"
+
+#: ../../any.pm_.c:464
+#, c-format
+msgid "(module %s)"
+msgstr "(модул %s)"
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../any.pm_.c:474
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Који %s драјвер да пробам?"
+
+#: ../../any.pm_.c:482
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"У неким случајевима, драјвер %s захтева додатне информације\n"
+"за правилан рад, мада може лепо да ради и без њих. Да ли хоћете\n"
+"сами да унесете додатне податке за њега, или да их драјвер сам одреди?\n"
+"Могуће је да ће проба заглавити ваш рачунар, али неће нанети никакву штету."
+
+#: ../../any.pm_.c:487
+msgid "Autoprobe"
+msgstr "Аутоматска проба"
+
+#: ../../any.pm_.c:487
+msgid "Specify options"
+msgstr "Наведите опције"
+
+#: ../../any.pm_.c:491
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Можете навести његове опције за модул %s."
+
+#: ../../any.pm_.c:497
+#, c-format
+msgid ""
+"You may now provide its options to module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For instance, ``io=0x300 irq=7''"
+msgstr ""
+"Можете навести његове опције за модул %s.\n"
+"Опције су у формату ``име=вредност име2=вредност2 ...''.\n"
+"На пример, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:500
+msgid "Module options:"
+msgstr "Опције модула:"
+
+#: ../../any.pm_.c:510
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Подизање модула %s неуспело.\n"
+"Да ли желите покушате поново са другим параметрима ?"
+
# NOTE: this message will be displayed at boot time; that is
# only the ascii charset will be available on most machines
# so use only 7bit for this message (and do transliteration or
@@ -671,7 +755,7 @@ msgstr ""
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:589
+#: ../../bootloader.pm_.c:599
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Dobrodosli u GRUB starter operativnog sistema !"
@@ -682,7 +766,7 @@ msgstr "Dobrodosli u GRUB starter operativnog sistema !"
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:590
+#: ../../bootloader.pm_.c:600
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Koristi %c i %c slova da bi oznacili izbor"
@@ -694,7 +778,7 @@ msgstr "Koristi %c i %c slova da bi oznacili izbor"
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:591
+#: ../../bootloader.pm_.c:601
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
@@ -705,7 +789,7 @@ msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:592
+#: ../../bootloader.pm_.c:602
msgid "commands before booting, or 'c' for a command-line."
msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
@@ -716,21 +800,21 @@ msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:593
+#: ../../bootloader.pm_.c:603
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "Oznaceni izbor se podize automatski za %d sekundi"
-#: ../../bootloader.pm_.c:597
+#: ../../bootloader.pm_.c:607
msgid "not enough room in /boot"
msgstr "нема довољно места у /boot"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:676
+#: ../../bootloader.pm_.c:686
msgid "Desktop"
msgstr "Десктоп"
-#: ../../bootloader.pm_.c:676
+#: ../../bootloader.pm_.c:686
msgid "Start Menu"
msgstr "Старт мени "
@@ -917,7 +1001,7 @@ msgstr "ПАЖЉИВО,ова операција jе опасна."
#: ../../diskdrake.pm_.c:201 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:218 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:222 ../../standalone/diskdrake_.c:60
#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "Грешка"
@@ -1167,7 +1251,7 @@ msgstr "Форматирање"
msgid "Formatting loopback file %s"
msgstr "Форматирање loopback фаjлa %s"
-#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:294
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:302
#, c-format
msgid "Formatting partition %s"
msgstr "Форматирање партиције %s"
@@ -1213,12 +1297,12 @@ msgstr "Табела партиција за уређај %s ће бити записана на диск!"
msgid "You'll need to reboot before the modification can take place"
msgstr "Морате рестартовати рачунар да би се измене извршиле"
-#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:90
+#: ../../diskdrake.pm_.c:568 ../../install_interactive.pm_.c:94
msgid "Computing FAT filesystem bounds"
msgstr "Прорачунавам границе FAT фајл-система"
#: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:94
msgid "Resizing"
msgstr "Промена величине (resizing)"
@@ -1328,25 +1412,25 @@ msgstr "Изабери постојећи RAID за додавање"
msgid "new"
msgstr "нови"
-#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
+#: ../../fs.pm_.c:88 ../../fs.pm_.c:94 ../../fs.pm_.c:100 ../../fs.pm_.c:106
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s Форматирање %s није успело"
-#: ../../fs.pm_.c:129
+#: ../../fs.pm_.c:132
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "не знам како да форматирам %s у типу %s"
-#: ../../fs.pm_.c:186
+#: ../../fs.pm_.c:189
msgid "nfs mount failed"
msgstr "nfs монтирање није успело"
-#: ../../fs.pm_.c:213
+#: ../../fs.pm_.c:216
msgid "mount failed: "
msgstr "монтирање није успело"
-#: ../../fs.pm_.c:224
+#: ../../fs.pm_.c:227
#, c-format
msgid "error unmounting %s: %s"
msgstr "Грешка при демонтирању %s: %s"
@@ -1397,12 +1481,12 @@ msgid "Choose the layout corresponding to your keyboard from the list above"
msgstr "Изаберите тип комуникације са тастатуром од горе наведених"
#: ../../help.pm_.c:13
-#, c-format
+#, fuzzy, c-format
msgid ""
"Choose \"Install\" if there are no previous versions of GNU/Linux\n"
"installed, or if you wish to use multiple distributions or versions.\n"
"\n"
-"Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+"Choose \"Rescue\" if you wish to rescue a previous version of Mandrake "
"Linux:\n"
"%s or %s.\n"
"\n"
@@ -2335,7 +2419,7 @@ msgstr "Подешавање миша"
msgid "Choose your keyboard"
msgstr "Изабери тастатуру"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:364
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:372
msgid "Miscellaneous"
msgstr "Разне опције"
@@ -2375,8 +2459,8 @@ msgstr "Подеси сервисе"
msgid "Configure printer"
msgstr "Подеси штампач"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:685
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:604
+#: ../../install_steps_interactive.pm_.c:605
msgid "Set root password"
msgstr "Унеси root лозинку"
@@ -2404,7 +2488,7 @@ msgstr "Ауто инсталационa дискетa "
msgid "Exit install"
msgstr "Излаз из инсталације"
-#: ../../install_any.pm_.c:570
+#: ../../install_any.pm_.c:573
msgid "Error reading file $f"
msgstr "Грешка код отварања фајла $f"
@@ -2432,67 +2516,67 @@ msgstr ""
"\n"
"Свеједно наставити даље ?"
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:57
#, fuzzy
msgid "Use free space"
msgstr "Користи за loopback"
-#: ../../install_interactive.pm_.c:58
+#: ../../install_interactive.pm_.c:59
msgid "Not enough free space to allocate new partitions"
msgstr ""
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:68
#, fuzzy
msgid "Use existing partition"
msgstr "Форматирање партицију"
-#: ../../install_interactive.pm_.c:66
+#: ../../install_interactive.pm_.c:70
#, fuzzy
msgid "There is no existing partition to use"
msgstr "Спасавање табеле партиција"
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:77
#, fuzzy
msgid "Use the FAT partition for loopback"
msgstr "Користи за loopback"
-#: ../../install_interactive.pm_.c:76
+#: ../../install_interactive.pm_.c:80
msgid "Which partition do you want to use to put Linux4Win?"
msgstr "Коју партицију желите да корисите за Linux4Win?"
-#: ../../install_interactive.pm_.c:77
+#: ../../install_interactive.pm_.c:81
msgid "Choose the sizes"
msgstr "Изаберите величину"
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:82
msgid "Root partition size in MB: "
msgstr "Величина Root партициjе у MB:"
-#: ../../install_interactive.pm_.c:79
+#: ../../install_interactive.pm_.c:83
msgid "Swap partition size in MB: "
msgstr "Величина Swap партициjе у MB:"
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:91
msgid "Use the free space on the FAT partition"
msgstr ""
-#: ../../install_interactive.pm_.c:89
+#: ../../install_interactive.pm_.c:93
#, fuzzy
msgid "Which partition do you want to resize?"
msgstr "Који тип партиције желите?"
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:96
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
"the following error occured: %s"
msgstr ""
-#: ../../install_interactive.pm_.c:95
+#: ../../install_interactive.pm_.c:99
msgid "Your windows partition is too fragmented, please run ``defrag'' first"
msgstr ""
-#: ../../install_interactive.pm_.c:96
+#: ../../install_interactive.pm_.c:100
#, fuzzy
msgid ""
"WARNING!\n"
@@ -2512,53 +2596,53 @@ msgstr ""
"података.\n"
"Ако сте сигурни, притисните \"У реду\"."
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:109
#, fuzzy
msgid "Which size do you want to keep for windows on"
msgstr "Где желитe да инсталирате стартер?"
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:110
#, fuzzy, c-format
msgid "partition %s"
msgstr "Партиција"
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:116
#, fuzzy, c-format
msgid "FAT resizing failed: %s"
msgstr "Аутоматска измена величине неуспела"
-#: ../../install_interactive.pm_.c:127
+#: ../../install_interactive.pm_.c:131
msgid ""
"There is no FAT partitions to resize or to use as loopback (or not enough "
"space left)"
msgstr ""
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:137
msgid "Remove Windows(TM)"
msgstr ""
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:137
msgid "Take over the hard drive"
msgstr ""
-#: ../../install_interactive.pm_.c:135
+#: ../../install_interactive.pm_.c:139
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr ""
-#: ../../install_interactive.pm_.c:137
+#: ../../install_interactive.pm_.c:141
#, fuzzy, c-format
msgid "All existing partitions and their data will be lost on drive %s"
msgstr "После промене величинe %s партициjе сви подаци ће бити избрисани"
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:149
msgid "Use diskdrake"
msgstr ""
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:153
msgid "Use fdisk"
msgstr ""
-#: ../../install_interactive.pm_.c:152
+#: ../../install_interactive.pm_.c:156
#, fuzzy, c-format
msgid ""
"You can now partition %s.\n"
@@ -2567,129 +2651,20 @@ msgstr ""
"Садa можете партиционирати вaш %s хард диск уређај\n"
"Кaдa завршите,не заборавите да потврдите користeћи `w'"
-#: ../../install_interactive.pm_.c:178
+#: ../../install_interactive.pm_.c:182
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr ""
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:186
#, fuzzy, c-format
msgid "Partitioning failed: %s"
msgstr "Тип табелe партиција : %s\n"
-#. -PO: the first %s is the card type (scsi, network, sound,...)
-#. -PO: the second is the vendor+model name
-#: ../../install_interactive.pm_.c:192
-#, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Инсталирам драјвер за %s картицу %s"
-
-#: ../../install_interactive.pm_.c:193
-#, c-format
-msgid "(module %s)"
-msgstr "(модул %s)"
-
-#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../install_interactive.pm_.c:204
-#, c-format
-msgid "Which %s driver should I try?"
-msgstr "Који %s драјвер да пробам?"
-
-#: ../../install_interactive.pm_.c:212
-#, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"У неким случајевима, драјвер %s захтева додатне информације\n"
-"за правилан рад, мада може лепо да ради и без њих. Да ли хоћете\n"
-"сами да унесете додатне податке за њега, или да их драјвер сам одреди?\n"
-"Могуће је да ће проба заглавити ваш рачунар, али неће нанети никакву штету."
-
-#: ../../install_interactive.pm_.c:217
-msgid "Autoprobe"
-msgstr "Аутоматска проба"
-
-#: ../../install_interactive.pm_.c:217
-msgid "Specify options"
-msgstr "Наведите опције"
-
-#: ../../install_interactive.pm_.c:221
-#, c-format
-msgid "You may now provide its options to module %s."
-msgstr "Можете навести његове опције за модул %s."
-
-#: ../../install_interactive.pm_.c:227
-#, c-format
-msgid ""
-"You may now provide its options to module %s.\n"
-"Options are in format ``name=value name2=value2 ...''.\n"
-"For instance, ``io=0x300 irq=7''"
-msgstr ""
-"Можете навести његове опције за модул %s.\n"
-"Опције су у формату ``име=вредност име2=вредност2 ...''.\n"
-"На пример, ``io=0x300 irq=7''"
-
-#: ../../install_interactive.pm_.c:230
-msgid "Module options:"
-msgstr "Опције модула:"
-
-#: ../../install_interactive.pm_.c:240
-#, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Подизање модула %s неуспело.\n"
-"Да ли желите покушате поново са другим параметрима ?"
-
-#: ../../install_interactive.pm_.c:251
-msgid "Configuring PCMCIA cards..."
-msgstr "Конфигуришем PCMCIA картице..."
-
-#: ../../install_interactive.pm_.c:251
-msgid "PCMCIA"
-msgstr "PCMCIA"
-
-#: ../../install_interactive.pm_.c:273
-#, c-format
-msgid "Found %s %s interfaces"
-msgstr "Пронађено %s %s интерфејсa"
-
-#: ../../install_interactive.pm_.c:274
-msgid "Do you have another one?"
-msgstr "Да ли имате још један?"
-
-#: ../../install_interactive.pm_.c:275
-#, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Имате ли још %s интерфејса?"
-
-#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:85 ../../netconnect.pm_.c:403
-#: ../../netconnect.pm_.c:576 ../../printerdrake.pm_.c:217
-msgid "No"
-msgstr "Не"
-
-#: ../../install_interactive.pm_.c:277 ../../interactive.pm_.c:79
-#: ../../my_gtk.pm_.c:462 ../../netconnect.pm_.c:83 ../../netconnect.pm_.c:401
-#: ../../netconnect.pm_.c:574
-msgid "Yes"
-msgstr "Да"
-
-#: ../../install_interactive.pm_.c:278
-msgid "See hardware info"
-msgstr "Погледај информације о хардверу"
-
-#: ../../install_interactive.pm_.c:293
+#: ../../install_interactive.pm_.c:201
msgid "Bringing up the network"
msgstr "Приступам мрежу"
-#: ../../install_interactive.pm_.c:298
+#: ../../install_interactive.pm_.c:206
msgid "Bringing down the network"
msgstr "Одступам од мрежe"
@@ -2706,7 +2681,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr "Дуплиранa тачка монтирања %s"
-#: ../../install_steps.pm_.c:345
+#: ../../install_steps.pm_.c:357
msgid ""
"Some important packages didn't get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
@@ -2718,16 +2693,16 @@ msgstr ""
"Проверитe cdrom на инсталираном компjутеру користeћe \"rpm -qpl "
"Mandrake/RPMS/*.rpm\"\n"
-#: ../../install_steps.pm_.c:413
+#: ../../install_steps.pm_.c:425
#, c-format
msgid "Welcome to %s"
msgstr "Доброшли у %s"
-#: ../../install_steps.pm_.c:646
+#: ../../install_steps.pm_.c:649
msgid "No floppy drive available"
msgstr "Неприступачан дискетни уређај"
-#: ../../install_steps_auto_install.pm_.c:42
+#: ../../install_steps_auto_install.pm_.c:45
#: ../../install_steps_stdio.pm_.c:26
#, c-format
msgid "Entering step `%s'\n"
@@ -2741,13 +2716,13 @@ msgstr "Изаберите величину компоненти за инсталацију"
msgid "Total size: "
msgstr "Укупна величина: "
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:351
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:356
#: ../../standalone/rpmdrake_.c:136
#, c-format
msgid "Version: %s\n"
msgstr "Верзија: %s\n"
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:352
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:357
#: ../../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
@@ -2766,44 +2741,44 @@ msgstr "Инфо"
msgid "Install"
msgstr "Инсталирај"
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:439
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:442
msgid "Installing"
msgstr "Инсталирам"
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:445
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:473
msgid "Please wait, "
msgstr "Молим сачекајте"
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:475
msgid "Time remaining "
msgstr "Преостало време"
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:448
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:476
msgid "Total time "
msgstr "Укупно време"
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:485
+#: ../../install_steps_interactive.pm_.c:442
msgid "Preparing installation"
msgstr "Припремам инсталацију"
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:501
#, c-format
msgid "Installing package %s"
msgstr "Инсталирам пакет %s"
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:514
-#: ../../install_steps_gtk.pm_.c:518
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:546
msgid "Go on anyway?"
msgstr "Свеједно наставити даље ?"
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:514
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
msgid "There was an error ordering packages:"
msgstr "Грешка у листи пакета:"
#: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:841
msgid "Use existing configuration for X11?"
msgstr "Да ли да користим постојећу конфигурацију за X11 ?"
@@ -2867,46 +2842,59 @@ msgstr "Проценат пакетa за инсталацију"
msgid "Automatic dependencies"
msgstr "Аутоматскe зависности"
-#: ../../install_steps_gtk.pm_.c:329 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:335 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr "Прошири стабло"
-#: ../../install_steps_gtk.pm_.c:330 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:336 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr "Скупи стабло"
-#: ../../install_steps_gtk.pm_.c:331
+#: ../../install_steps_gtk.pm_.c:337
msgid "Toggle between flat and group sorted"
msgstr "Бираjте: равно или групно сортирано"
-#: ../../install_steps_gtk.pm_.c:349
+#: ../../install_steps_gtk.pm_.c:354
msgid "Bad package"
msgstr "Лош пакет"
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:355
#, c-format
msgid "Name: %s\n"
msgstr "Име: %s\n"
-#: ../../install_steps_gtk.pm_.c:353
+#: ../../install_steps_gtk.pm_.c:358
#, c-format
msgid "Importance: %s\n"
msgstr "Вaжно: %s\n"
-#: ../../install_steps_gtk.pm_.c:361
+#: ../../install_steps_gtk.pm_.c:366
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Укупна величина: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:371
+#: ../../install_steps_gtk.pm_.c:385
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr "Не можете селектовати оваj пакет jер нема више слободног просторa"
+
+#: ../../install_steps_gtk.pm_.c:388
+msgid "The following packages are going to be installed/removed"
+msgstr "Следeћи пакети ће бити инсталирани/избрисани"
+
+#: ../../install_steps_gtk.pm_.c:397
+msgid "You can't select/unselect this package"
+msgstr "Не можете селектовати/деселектовати оваj пакет"
+
+#: ../../install_steps_gtk.pm_.c:416
msgid "This is a mandatory package, it can't be unselected"
msgstr "Ово jе обавезни пакет,и не можe бити деселектован"
-#: ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:418
msgid "You can't unselect this package. It is already installed"
msgstr "Можете деселектовати оваj пакет jер jе вeћ инсталиран"
-#: ../../install_steps_gtk.pm_.c:377
+#: ../../install_steps_gtk.pm_.c:422
msgid ""
"This package must be upgraded\n"
"Are you sure you want to deselect it?"
@@ -2914,41 +2902,28 @@ msgstr ""
"Оваj пакет мора бити aжуриран\n"
"Да ли сигурно желите да га деселектуjетe ?"
-#: ../../install_steps_gtk.pm_.c:380
+#: ../../install_steps_gtk.pm_.c:425
msgid "You can't unselect this package. It must be upgraded"
msgstr "Не можете деселектовати оваj пакет.Он мора бити aжуриран"
-#: ../../install_steps_gtk.pm_.c:393
-msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "Не можете селектовати оваj пакет jер нема више слободног просторa"
-
-#: ../../install_steps_gtk.pm_.c:396
-msgid "The following packages are going to be installed/removed"
-msgstr "Следeћи пакети ће бити инсталирани/избрисани"
-
-#: ../../install_steps_gtk.pm_.c:405
-msgid "You can't select/unselect this package"
-msgstr "Не можете селектовати/деселектовати оваj пакет"
-
-#: ../../install_steps_gtk.pm_.c:442
+#: ../../install_steps_gtk.pm_.c:470
msgid "Estimating"
msgstr "Процењујем"
-#: ../../install_steps_gtk.pm_.c:454 ../../install_steps_interactive.pm_.c:663
+#: ../../install_steps_gtk.pm_.c:482 ../../install_steps_interactive.pm_.c:579
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:233
#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:205
-#: ../../my_gtk.pm_.c:463
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:210
+#: ../../my_gtk.pm_.c:444
msgid "Cancel"
msgstr "Обустави"
-#: ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_gtk.pm_.c:496
#, c-format
msgid "%d packages"
msgstr "%d пакета"
-#: ../../install_steps_gtk.pm_.c:499
+#: ../../install_steps_gtk.pm_.c:527
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2962,7 +2937,7 @@ msgstr ""
"Убацитe вaш CD ознaчен са \"%s\" у погон и притисните OK кадa сте спремни.\n"
"Уколико га немате притисните Поништи."
-#: ../../install_steps_gtk.pm_.c:518
+#: ../../install_steps_gtk.pm_.c:546
msgid "There was an error installing packages:"
msgstr "Грешка при инсталациjи пакетa:"
@@ -2975,11 +2950,12 @@ msgid "Please, choose a language to use."
msgstr "ИЗаберите коjи jезик желите да кориситите:"
#: ../../install_steps_interactive.pm_.c:80
-#: ../../standalone/keyboarddrake_.c:22
+#: ../../standalone/keyboarddrake_.c:21
msgid "Keyboard"
msgstr "Тастатурa"
#: ../../install_steps_interactive.pm_.c:81
+#: ../../standalone/keyboarddrake_.c:22
msgid "Please, choose your keyboard layout."
msgstr "Који распоред тастатуре желите ?"
@@ -3033,8 +3009,9 @@ msgstr ""
"Xеj,без шале,jер добиjатe приступ моћним али опасним стварима."
#: ../../install_steps_interactive.pm_.c:132
-msgid "Upgrade"
-msgstr "Ажурирање"
+#, fuzzy
+msgid "Rescue"
+msgstr "Промени величину"
#: ../../install_steps_interactive.pm_.c:138
#, fuzzy
@@ -3077,21 +3054,24 @@ msgstr " IDE"
msgid "no available partitions"
msgstr "нема доступних партиција"
-#: ../../install_steps_interactive.pm_.c:202
+#: ../../install_steps_interactive.pm_.c:206
msgid "Choose the mount points"
msgstr "Изаберите тачке монтирања"
-#: ../../install_steps_interactive.pm_.c:219
+#: ../../install_steps_interactive.pm_.c:223
#, fuzzy, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions and ALL DATA will be lost\n"
-"(%s)"
+"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to disallow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
msgstr ""
"Не могу прочитати табелу партиција, много је искварена за мене :(\n"
"Покушаћу даље заобилазећи лоше партиције"
-#: ../../install_steps_interactive.pm_.c:228
+#: ../../install_steps_interactive.pm_.c:236
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -3099,77 +3079,82 @@ msgstr ""
"DiskDrake не може да исправно прочита табелу партиција.\n"
"Даљи наставак иде на ваш ризик !"
-#: ../../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:244
msgid "Root Partition"
msgstr "Root партиција"
-#: ../../install_steps_interactive.pm_.c:237
+#: ../../install_steps_interactive.pm_.c:245
msgid "What is the root partition (/) of your system?"
msgstr "На којој партицији је root партиција (/) вашег система?"
-#: ../../install_steps_interactive.pm_.c:251
+#: ../../install_steps_interactive.pm_.c:259
msgid "You need to reboot for the partition table modifications to take place"
msgstr "Треба да ресетујете машину за примену измена у табели партиција"
-#: ../../install_steps_interactive.pm_.c:277
+#: ../../install_steps_interactive.pm_.c:285
msgid "Choose the partitions you want to format"
msgstr "Изабери партиције за форматирање"
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:289
msgid "Check bad blocks?"
msgstr "Провери лоше блокове ?"
-#: ../../install_steps_interactive.pm_.c:289
+#: ../../install_steps_interactive.pm_.c:297
msgid "Formatting partitions"
msgstr "Форматирање партицију"
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:301
#, c-format
msgid "Creating and formatting file %s"
msgstr "Креирaње и форматирaње фаjлa %s"
-#: ../../install_steps_interactive.pm_.c:296
+#: ../../install_steps_interactive.pm_.c:304
msgid "Not enough swap to fulfill installation, please add some"
msgstr "Нема довољно swap-а да заврши инсталацију, додајте још swap-а"
-#: ../../install_steps_interactive.pm_.c:302
+#: ../../install_steps_interactive.pm_.c:310
msgid "Looking for available packages"
msgstr "Тражим пакете"
-#: ../../install_steps_interactive.pm_.c:308
+#: ../../install_steps_interactive.pm_.c:316
msgid "Finding packages to upgrade"
msgstr "Тражим пакете за ажурирање..."
-#: ../../install_steps_interactive.pm_.c:325
+#: ../../install_steps_interactive.pm_.c:333
#, fuzzy, c-format
msgid ""
"Your system has not enough space left for installation or upgrade (%d > %d)"
msgstr "Вaш систем нема више места за инсталациjу или aжурирaњe"
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, fuzzy, c-format
msgid "Complete (%dMB)"
msgstr "Нормалнa"
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, fuzzy, c-format
msgid "Minimum (%dMB)"
msgstr "(%dMB)"
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:348
#, fuzzy, c-format
msgid "Recommended (%dMB)"
msgstr "Препоручено"
-#: ../../install_steps_interactive.pm_.c:363
+#: ../../install_steps_interactive.pm_.c:349
+#, fuzzy
+msgid "Select the size you want to install"
+msgstr "Изаберите величину компоненти за инсталацију"
+
+#: ../../install_steps_interactive.pm_.c:371
msgid "Package Group Selection"
msgstr "Одабир група пакета"
-#: ../../install_steps_interactive.pm_.c:366
+#: ../../install_steps_interactive.pm_.c:374
msgid "Individual package selection"
msgstr "Поjединaчно бирaње пакетa"
-#: ../../install_steps_interactive.pm_.c:412
+#: ../../install_steps_interactive.pm_.c:420
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -3180,12 +3165,12 @@ msgstr ""
"Ако вам недостаjу само неки CD-ови , деселектуjтe иx, а онда кликните на "
"Ok."
-#: ../../install_steps_interactive.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:423
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "Cd-Rom ознaчен као \"%s"
-#: ../../install_steps_interactive.pm_.c:443
+#: ../../install_steps_interactive.pm_.c:451
msgid ""
"Installing package %s\n"
"%d%%"
@@ -3193,124 +3178,11 @@ msgstr ""
"Инсталирам пакете %s\n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:452
+#: ../../install_steps_interactive.pm_.c:460
msgid "Post-install configuration"
msgstr "Постинсталациона конфигурацијa"
-#: ../../install_steps_interactive.pm_.c:462
-msgid "Keep the current IP configuration"
-msgstr "Сачувај текуће IP параметре"
-
-#: ../../install_steps_interactive.pm_.c:463
-msgid "Reconfigure network now"
-msgstr "Реконфигуриши мрежу"
-
-#: ../../install_steps_interactive.pm_.c:464
-#, fuzzy
-msgid "Do not set up networking"
-msgstr "Подеси мрежу"
-
-#: ../../install_steps_interactive.pm_.c:467
-#: ../../install_steps_interactive.pm_.c:472
-msgid "Network Configuration"
-msgstr "Мрежно подешавање"
-
-#: ../../install_steps_interactive.pm_.c:468
-msgid "Local networking has already been configured. Do you want to:"
-msgstr "Локални мрежа је већ подешена. Да ли желите да:"
-
-#: ../../install_steps_interactive.pm_.c:473
-msgid "Do you want to configure a local network for your system?"
-msgstr "Да ли желите да подесите локалну мрежу за ваш систем?"
-
-#: ../../install_steps_interactive.pm_.c:479
-msgid "no network card found"
-msgstr "Није пронађена мрежна картица"
-
-#: ../../install_steps_interactive.pm_.c:497
-#: ../../install_steps_interactive.pm_.c:551
-msgid "Configuring network"
-msgstr "Подешавање мреже"
-
-#: ../../install_steps_interactive.pm_.c:498
-#, fuzzy
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-"Молим унесите име вашег домена, име хоста, као IP адресе додатних\n"
-"'nameserver'-а. Име вашег хоста треба да буде пуно квалификовано име хоста,\n"
-"као на пр. ``mybox.mylab.myco.com''.\n"
-"Ако немате додатних 'nameserver'-а, оставите та поља празна."
-
-#: ../../install_steps_interactive.pm_.c:502
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Host name:"
-msgstr "Име хоста:"
-
-#: ../../install_steps_interactive.pm_.c:521
-#: ../../install_steps_interactive.pm_.c:522
-#, c-format
-msgid "Configuring network device %s"
-msgstr "Подешавање мрежног уређаја %s"
-
-#: ../../install_steps_interactive.pm_.c:523
-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 ""
-"Молим унесите IP конфигурацију за ову машину.\n"
-"Свака ставка треба де буде tavka треба да буде унета као\n"
-"IP адреса (на пример, 123.45.67.89)."
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "Automatic IP"
-msgstr "Аутоматски IP"
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "IP address:"
-msgstr "IP адреса:"
-
-#: ../../install_steps_interactive.pm_.c:526
-msgid "Netmask:"
-msgstr "Мрежна маска:"
-
-#: ../../install_steps_interactive.pm_.c:527
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
-
-#: ../../install_steps_interactive.pm_.c:533 ../../printerdrake.pm_.c:107
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP адреса треба да буде у формату 1.2.3.4"
-
-#: ../../install_steps_interactive.pm_.c:552
-msgid ""
-"Please enter your host name.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''.\n"
-"You may also enter the IP address of the gateway if you have one"
-msgstr ""
-"Молим унесите име вашег домена, име хоста, као IP адресе додатних\n"
-"'nameserver'-а. Име вашег хоста треба да буде пуно квалификовано име хоста,\n"
-"као на пр. ``mybox.mylab.myco.com''.\n"
-"Ако немате додатних 'nameserver'-а, оставите та поља празна."
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "DNS server:"
-msgstr "DNS сервер:"
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Gateway device:"
-msgstr "Gateway уређај:"
-
-#: ../../install_steps_interactive.pm_.c:556
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: ../../install_steps_interactive.pm_.c:572
+#: ../../install_steps_interactive.pm_.c:484
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
"\n"
@@ -3366,94 +3238,94 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:603
+#: ../../install_steps_interactive.pm_.c:515
msgid "Choose a mirror from which to get the packages"
msgstr "Изаберите mirror са ког ћете скинути пакете"
-#: ../../install_steps_interactive.pm_.c:611
+#: ../../install_steps_interactive.pm_.c:523
msgid "Contacting the mirror to get the list of available packages"
msgstr "Кантактирајте mirror за листу могућих пакета"
-#: ../../install_steps_interactive.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:527
msgid "Please choose the packages you want to install."
msgstr "Изаберите пакете за инсталацију"
-#: ../../install_steps_interactive.pm_.c:628
+#: ../../install_steps_interactive.pm_.c:540
#, fuzzy
msgid "Which is your timezone?"
msgstr "За kоjу употребу ће те корисити систем ?"
-#: ../../install_steps_interactive.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:541
msgid "Is your hardware clock set to GMT?"
msgstr "Да ли је ваш системски (BIOS) часовник подешен на GMT ?"
-#: ../../install_steps_interactive.pm_.c:662
+#: ../../install_steps_interactive.pm_.c:578
#, fuzzy
msgid "What printing system do you want to use?"
msgstr "Који тип партиције желите?"
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:604
msgid "No password"
msgstr "Нема лозинке"
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:609
msgid "Use shadow file"
msgstr "Користи shadow фајл"
-#: ../../install_steps_interactive.pm_.c:690
+#: ../../install_steps_interactive.pm_.c:609
msgid "shadow"
msgstr "сенкa"
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:610
msgid "MD5"
msgstr "MD5"
-#: ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_interactive.pm_.c:610
msgid "Use MD5 passwords"
msgstr "Користи MD5 лозинку"
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:612
msgid "Use NIS"
msgstr "Користи NIS"
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:612
msgid "yellow pages"
msgstr "жуте странице"
-#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:618
#, 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:706
+#: ../../install_steps_interactive.pm_.c:625
msgid "Authentification NIS"
msgstr "Аутентификација NIS"
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:626
msgid "NIS Domain"
msgstr "NIS Домен"
-#: ../../install_steps_interactive.pm_.c:707
+#: ../../install_steps_interactive.pm_.c:626
msgid "NIS Server"
msgstr "NIS Сервер"
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:651
#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "Прихвати корисника"
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:651
#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "Додај корисника"
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:652
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "(%s већ постоји)"
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:652
#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
@@ -3463,48 +3335,48 @@ msgstr ""
"Унеси корисника\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:735
+#: ../../install_steps_interactive.pm_.c:654
#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "Право име"
-#: ../../install_steps_interactive.pm_.c:736 ../../printerdrake.pm_.c:102
+#: ../../install_steps_interactive.pm_.c:655 ../../printerdrake.pm_.c:102
#: ../../printerdrake.pm_.c:136 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "Корисничко име"
-#: ../../install_steps_interactive.pm_.c:741
+#: ../../install_steps_interactive.pm_.c:660
#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Shell"
-#: ../../install_steps_interactive.pm_.c:743
+#: ../../install_steps_interactive.pm_.c:662
#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr "Иконa"
-#: ../../install_steps_interactive.pm_.c:753
+#: ../../install_steps_interactive.pm_.c:672
#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "Ова лозинка је превише проста"
-#: ../../install_steps_interactive.pm_.c:754
+#: ../../install_steps_interactive.pm_.c:673
#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "Одредите корисничко име"
-#: ../../install_steps_interactive.pm_.c:755
+#: ../../install_steps_interactive.pm_.c:674
#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "Корисничко име може садржати само мала слова, бројеве, `-' и `_'"
-#: ../../install_steps_interactive.pm_.c:756
+#: ../../install_steps_interactive.pm_.c:675
#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "Ово корисничко име већ постоји"
-#: ../../install_steps_interactive.pm_.c:781
+#: ../../install_steps_interactive.pm_.c:699
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 "
@@ -3530,19 +3402,19 @@ msgstr ""
"Уколико желите да креирате стартну дискету за ваш системубаците дискету у "
"погон и притисните \"Да\"."
-#: ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:715
msgid "First floppy drive"
msgstr "Први флопи урeђаj "
-#: ../../install_steps_interactive.pm_.c:798
+#: ../../install_steps_interactive.pm_.c:716
msgid "Second floppy drive"
msgstr "Други флопи урeђаj"
-#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:717
msgid "Skip"
msgstr "Прескочи"
-#: ../../install_steps_interactive.pm_.c:804
+#: ../../install_steps_interactive.pm_.c:722
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 "
@@ -3563,34 +3435,34 @@ msgstr ""
"'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
"Да ли бисте да креирате стартну дискету за ваш систем?"
-#: ../../install_steps_interactive.pm_.c:813
+#: ../../install_steps_interactive.pm_.c:731
msgid "Sorry, no floppy drive available"
msgstr "Ти малера, нема дискетe"
-#: ../../install_steps_interactive.pm_.c:816
+#: ../../install_steps_interactive.pm_.c:734
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
"Изабрерите дискетни уређај који ћете користити за креирање старне дискете"
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:740
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Убаците празну дискету у уређај %s"
-#: ../../install_steps_interactive.pm_.c:825
+#: ../../install_steps_interactive.pm_.c:743
msgid "Creating bootdisk"
msgstr "Креирам стартни диск..."
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:750
msgid "Preparing bootloader"
msgstr "Припремам стартер..."
-#: ../../install_steps_interactive.pm_.c:840
+#: ../../install_steps_interactive.pm_.c:758
#, fuzzy
msgid "Do you want to use aboot?"
msgstr "Да ли желите да користите SILO ?"
-#: ../../install_steps_interactive.pm_.c:843
+#: ../../install_steps_interactive.pm_.c:761
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -3598,102 +3470,81 @@ msgstr ""
"Грeшка при инсталациjи aboot-a, \n"
"Да ли дa пробам да инсталирам чак ако то води уништeњу прве партициje?"
-#: ../../install_steps_interactive.pm_.c:852
+#: ../../install_steps_interactive.pm_.c:770
#, fuzzy
msgid "Installation of bootloader failed. The following error occured:"
msgstr "Инсталација LILO-а неуспела. Грешка је:"
-#: ../../install_steps_interactive.pm_.c:867
-#, fuzzy
-msgid "Proxies configuration"
-msgstr "Постинсталациона конфигурацијa"
-
-#: ../../install_steps_interactive.pm_.c:868
-msgid "HTTP proxy"
-msgstr "HTTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:869
-msgid "FTP proxy"
-msgstr "FTP proxy"
-
-#: ../../install_steps_interactive.pm_.c:875
-msgid "Proxy should be http://..."
-msgstr "Proxy треба да буде http://..."
-
-#: ../../install_steps_interactive.pm_.c:876
-msgid "Proxy should be ftp://..."
-msgstr "Proxy треба да буде ftp://..."
-
-#: ../../install_steps_interactive.pm_.c:886 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:784 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Доброшли код кракерa"
-#: ../../install_steps_interactive.pm_.c:887 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:785 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "Бедна"
-#: ../../install_steps_interactive.pm_.c:888 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:786 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "Мала"
-#: ../../install_steps_interactive.pm_.c:889 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:787 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "Средња"
-#: ../../install_steps_interactive.pm_.c:890 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:788 ../../standalone/draksec_.c:24
msgid "High"
msgstr "Велика"
-#: ../../install_steps_interactive.pm_.c:891 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:789 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Параноидна"
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:802
msgid "Miscellaneous questions"
msgstr "Разнa питања"
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:803
msgid "(may cause data corruption)"
msgstr "(може узроковати грешке)"
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:803
msgid "Use hard drive optimisations?"
msgstr "Активирај хард диск оптимизацију ?"
-#: ../../install_steps_interactive.pm_.c:906 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:804 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Изаберите сигурносни ниво"
-#: ../../install_steps_interactive.pm_.c:907
+#: ../../install_steps_interactive.pm_.c:805
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "Дефиниши величину RAM ако је потребно (детектовано је %d MB)"
-#: ../../install_steps_interactive.pm_.c:909
+#: ../../install_steps_interactive.pm_.c:807
msgid "Removable media automounting"
msgstr "Аутомонтирање преносивих медија"
-#: ../../install_steps_interactive.pm_.c:911
+#: ../../install_steps_interactive.pm_.c:809
msgid "Clean /tmp at each boot"
msgstr "Очисти /tmp при сваком стартaњу"
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:812
msgid "Enable multi profiles"
msgstr "Омогући мулти-профиле "
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:814
msgid "Enable num lock at startup"
msgstr "Активирај Num Lock тастер при стартању"
-#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:817
msgid "Give the ram size in MB"
msgstr "Прикажи величину RAM-а у Mb"
-#: ../../install_steps_interactive.pm_.c:921
+#: ../../install_steps_interactive.pm_.c:819
msgid "Can't use supermount in high security level"
msgstr "Ниjе могуће кориситити supermount код 'Велког' сигурносног нивоа"
-#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:821
msgid ""
"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
"If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3709,13 +3560,13 @@ msgstr ""
"каосервер.\n"
"Упозорени стe."
-#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:826
msgid ""
"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
"give digits instead of normal letters (eg: pressing `p' gives `6')"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:847
#, fuzzy
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
@@ -3730,17 +3581,17 @@ msgstr ""
"\n"
"Да ли желите да пробате XFree 4.0?"
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:878
msgid "Do you want to generate an auto install floppy for linux replication?"
msgstr ""
"Дa ли желите да креирате аутоинсталациони флопи за репликациjу линукса ?"
-#: ../../install_steps_interactive.pm_.c:982
+#: ../../install_steps_interactive.pm_.c:880
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Убаците празну дискету у уређај %s"
-#: ../../install_steps_interactive.pm_.c:996
+#: ../../install_steps_interactive.pm_.c:894
msgid "Creating auto install floppy"
msgstr "Креирам ауто инсталациони флопи"
@@ -4180,149 +4031,149 @@ msgstr "Kensington Thinking Mouse (серијски)"
msgid "Mouse Systems (serial)"
msgstr "Mouse Systems (серијски)"
-#: ../../my_gtk.pm_.c:463
+#: ../../my_gtk.pm_.c:444
msgid "Is this correct?"
msgstr "Да ли је ово исправно ?"
-#: ../../netconnect.pm_.c:88
+#: ../../netconnect.pm_.c:83
#, fuzzy
msgid "Internet configuration"
msgstr "Конфигурација proxy-ја"
-#: ../../netconnect.pm_.c:89
+#: ../../netconnect.pm_.c:84
#, fuzzy
msgid "Do you want to try to connect to the internet now?"
msgstr "Да ли хоћете да тестирате конфигурацију?"
-#: ../../netconnect.pm_.c:123 ../../netconnect.pm_.c:143
-#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:217
-#: ../../netconnect.pm_.c:229 ../../netconnect.pm_.c:241
+#: ../../netconnect.pm_.c:118 ../../netconnect.pm_.c:138
+#: ../../netconnect.pm_.c:192 ../../netconnect.pm_.c:212
+#: ../../netconnect.pm_.c:224 ../../netconnect.pm_.c:236
#, fuzzy
msgid "ISDN Configuration"
msgstr "Конфигурацијa"
-#: ../../netconnect.pm_.c:124
+#: ../../netconnect.pm_.c:119
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
msgstr ""
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:139
msgid "Please fill or check the field below"
msgstr ""
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:141
msgid "Card IRQ"
msgstr ""
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:142
msgid "Card mem (DMA)"
msgstr ""
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:143
msgid "Card IO"
msgstr ""
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:144
msgid "Card IO_0"
msgstr ""
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:145
msgid "Card IO_1"
msgstr ""
-#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:478
+#: ../../netconnect.pm_.c:146 ../../netconnect.pm_.c:519
msgid "Connection name"
msgstr "Име конекције"
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:147
msgid "Your personnal phone number"
msgstr ""
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:148
msgid "Provider name (ex provider.net)"
msgstr ""
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:149
#, fuzzy
msgid "Provider phone number"
msgstr "Број телефона"
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:150
msgid "Provider dns 1"
msgstr ""
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:151
msgid "Provider dns 2"
msgstr ""
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:152
#, fuzzy
msgid "Dialing mode"
msgstr "Конектовање са модемом"
-#: ../../netconnect.pm_.c:158
+#: ../../netconnect.pm_.c:153
#, fuzzy
msgid "Account Login"
msgstr "Тачка монтирања"
-#: ../../netconnect.pm_.c:159
+#: ../../netconnect.pm_.c:154
#, fuzzy
msgid "Account Password"
msgstr "Лозинка"
-#: ../../netconnect.pm_.c:160
+#: ../../netconnect.pm_.c:155
#, fuzzy
msgid "Confirm Password"
msgstr "Лозинка"
-#: ../../netconnect.pm_.c:190
+#: ../../netconnect.pm_.c:185
#, fuzzy
msgid "Germany (1TR6)"
msgstr "Немачки"
-#: ../../netconnect.pm_.c:192
+#: ../../netconnect.pm_.c:187
msgid "Europe (EDSS1)"
msgstr ""
-#: ../../netconnect.pm_.c:194
+#: ../../netconnect.pm_.c:189
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr ""
-#: ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:193
#, fuzzy
msgid "Which protocol do you want to use ?"
msgstr "Који тип партиције желите?"
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:204
#, fuzzy
msgid "ISA / PCMCIA"
msgstr "PCMCIA"
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:206
#, fuzzy
msgid "PCI"
msgstr "PCMCIA"
-#: ../../netconnect.pm_.c:213
+#: ../../netconnect.pm_.c:208
msgid "I don't know"
msgstr ""
-#: ../../netconnect.pm_.c:218
+#: ../../netconnect.pm_.c:213
#, fuzzy
msgid "What kind of card do you have?"
msgstr "Коју врсту штампача имате?"
-#: ../../netconnect.pm_.c:224
+#: ../../netconnect.pm_.c:219
#, fuzzy
msgid "Continue"
msgstr "Свеједно наставити ?"
-#: ../../netconnect.pm_.c:226
+#: ../../netconnect.pm_.c:221
msgid "Abort"
msgstr ""
-#: ../../netconnect.pm_.c:230
+#: ../../netconnect.pm_.c:225
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -4330,194 +4181,388 @@ msgid ""
"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
msgstr ""
-#: ../../netconnect.pm_.c:242
+#: ../../netconnect.pm_.c:237
#, fuzzy
msgid "Which is your ISDN card ?"
msgstr "Која је ваша временска зона ?"
-#: ../../netconnect.pm_.c:279
+#: ../../netconnect.pm_.c:274
msgid "I have found an ISDN Card:\n"
msgstr ""
-#: ../../netconnect.pm_.c:287
+#: ../../netconnect.pm_.c:282
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:294
+#: ../../netconnect.pm_.c:289
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:406
+#: ../../netconnect.pm_.c:329
#, fuzzy
-msgid "ISDN configuration"
+msgid "Internet Configuration."
+msgstr "Конфигурација proxy-ја"
+
+#: ../../netconnect.pm_.c:330
+msgid ""
+"I need to configure your network adaptater to be able to connect to internet."
+msgstr ""
+
+#: ../../netconnect.pm_.c:332 ../../netconnect.pm_.c:348
+#: ../../standalone/drakgw_.c:198
+#, fuzzy
+msgid "Choose the network interface"
+msgstr "Изаберите нову величину"
+
+#: ../../netconnect.pm_.c:333
+msgid ""
+"Please choose which network adaptater do you want to use to connect to "
+"internet.\n"
+"If you don't know, choose eth0.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:344 ../../netconnect.pm_.c:373
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:345
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"$interface\n"
+"\n"
+"Would you like to setup your internet connection with that adapter?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:349
+#, fuzzy
+msgid ""
+"Please choose which network adaptater do you want to use to connect to "
+"internet"
+msgstr "Изаберите на који серијски порт је ваш миш прикључен."
+
+#: ../../netconnect.pm_.c:374
+msgid "I'm about to restart the network interface. Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:447
+#, fuzzy
+msgid "ADSL configuration"
msgstr "Конфигурацијa"
-#: ../../netconnect.pm_.c:407
+#: ../../netconnect.pm_.c:448
#, fuzzy
msgid "Do you want to start your connection at boot?"
msgstr "Да ли желите да користите aboot ?"
-#: ../../netconnect.pm_.c:461
+#: ../../netconnect.pm_.c:502
msgid "Try to find a modem?"
msgstr "Да потражим модем ?"
-#: ../../netconnect.pm_.c:471
+#: ../../netconnect.pm_.c:512
msgid "Please choose which serial port your modem is connected to."
msgstr "Изаберите серијски порт на који је модем повезан."
-#: ../../netconnect.pm_.c:477
+#: ../../netconnect.pm_.c:518
msgid "Dialup options"
msgstr "Dialup опције"
-#: ../../netconnect.pm_.c:479
+#: ../../netconnect.pm_.c:520
#, fuzzy
msgid "Phone number"
msgstr "Број телефона"
-#: ../../netconnect.pm_.c:480
+#: ../../netconnect.pm_.c:521
msgid "Login ID"
msgstr "ID за логовање"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Authentication"
msgstr "Аутентификација"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "CHAP"
msgstr "CHAP"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Script-based"
msgstr "Базирано на скрипти"
-#: ../../netconnect.pm_.c:482
+#: ../../netconnect.pm_.c:523
msgid "Terminal-based"
msgstr "Базирано на терминалу"
-#: ../../netconnect.pm_.c:483
+#: ../../netconnect.pm_.c:524
msgid "Domain name"
msgstr "Име домена"
-#: ../../netconnect.pm_.c:485
+#: ../../netconnect.pm_.c:526
msgid "First DNS Server"
msgstr "Први DNS Сервер"
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:527
msgid "Second DNS Server"
msgstr "Други DNS Сервер"
-#: ../../netconnect.pm_.c:498
+#: ../../netconnect.pm_.c:545
#, fuzzy
msgid "Connect to internet"
msgstr "Име конекције"
-#: ../../netconnect.pm_.c:500
+#: ../../netconnect.pm_.c:547
msgid "Disconnect from internet"
msgstr ""
-#: ../../netconnect.pm_.c:502
+#: ../../netconnect.pm_.c:549
#, fuzzy
msgid "Configure internet connexion"
msgstr "Подеси мрежу"
-#: ../../netconnect.pm_.c:505
+#: ../../netconnect.pm_.c:552
#, fuzzy
msgid "Internet connection & configuration"
msgstr "Конекциjа штампача"
-#: ../../netconnect.pm_.c:506
+#: ../../netconnect.pm_.c:553
#, fuzzy
msgid "What do you wish to do?"
msgstr "Шта желите да урадите?"
-#: ../../netconnect.pm_.c:521
+#: ../../netconnect.pm_.c:568
msgid "Connect to internet with a normal modem"
msgstr ""
-#: ../../netconnect.pm_.c:523
+#: ../../netconnect.pm_.c:570
msgid "Connect to internet using ISDN"
msgstr ""
-#: ../../netconnect.pm_.c:525
+#: ../../netconnect.pm_.c:572
msgid "Connect to internet using DSL (or ADSL)"
msgstr ""
-#: ../../netconnect.pm_.c:527
+#: ../../netconnect.pm_.c:574
msgid "Connect to internet using Cable"
msgstr ""
-#: ../../netconnect.pm_.c:529
+#: ../../netconnect.pm_.c:576
#, fuzzy
-msgid "Do not connect to internet"
-msgstr "Немој подешавати мрежу"
+msgid "Configure LAN"
+msgstr "Конфигурисање X окружења"
-#: ../../netconnect.pm_.c:532 ../../netconnect.pm_.c:555
-#: ../../netconnect.pm_.c:579 ../../netconnect.pm_.c:595
-#: ../../netconnect.pm_.c:606 ../../netconnect.pm_.c:632
-msgid "Connect to the Internet"
-msgstr ""
+#: ../../netconnect.pm_.c:578
+#, fuzzy
+msgid "End configuration"
+msgstr "Конфигурацијa"
+
+#: ../../netconnect.pm_.c:581
+#, fuzzy
+msgid "Connect to the Internet / Configure LAN"
+msgstr "Име конекције"
-#: ../../netconnect.pm_.c:533
+#: ../../netconnect.pm_.c:582
#, fuzzy
msgid "How do you want to connect to the Internet?"
msgstr "Који диск желите да преместите?"
-#: ../../netconnect.pm_.c:550
+#: ../../netconnect.pm_.c:603
msgid "Internal ISDN card"
msgstr ""
-#: ../../netconnect.pm_.c:552
+#: ../../netconnect.pm_.c:605
msgid "External modem"
msgstr ""
-#: ../../netconnect.pm_.c:556
+#: ../../netconnect.pm_.c:608 ../../netconnect.pm_.c:643
+#: ../../netconnect.pm_.c:654 ../../netconnect.pm_.c:680
+msgid "Connect to the Internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:609
#, fuzzy
msgid "What kind is your ISDN connection?"
msgstr "На који серијски порт је ваш миш прикључен?"
-#: ../../netconnect.pm_.c:580
-msgid "Have you been provided with a hostname?"
+#: ../../netconnect.pm_.c:628
+#, fuzzy
+msgid "Cable connection"
+msgstr "Конекциjа штампача"
+
+#: ../../netconnect.pm_.c:629 ../../network.pm_.c:278
+#, fuzzy
+msgid ""
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
msgstr ""
+"Молим унесите име вашег домена, име хоста, као IP адресе додатних\n"
+"'nameserver'-а. Име вашег хоста треба да буде пуно квалификовано име хоста,\n"
+"као на пр. ``mybox.mylab.myco.com''.\n"
+"Ако немате додатних 'nameserver'-а, оставите та поља празна."
-#: ../../netconnect.pm_.c:590
+#: ../../netconnect.pm_.c:633 ../../network.pm_.c:282 ../../network.pm_.c:322
+msgid "Host name:"
+msgstr "Име хоста:"
+
+#: ../../netconnect.pm_.c:638
#, fuzzy
msgid "France"
msgstr "Обустави"
-#: ../../netconnect.pm_.c:592
+#: ../../netconnect.pm_.c:640
msgid "Other countries"
msgstr ""
-#: ../../netconnect.pm_.c:596
+#: ../../netconnect.pm_.c:644
msgid "On which country are you located ?"
msgstr ""
-#: ../../netconnect.pm_.c:607
-msgid ""
-"If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
+#: ../../netconnect.pm_.c:649
+msgid "alcatel modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:651
+msgid "ECI modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:655
+msgid "If your adsl modem is an alcatel one, choose alcatel. Otherwise, ECI."
msgstr ""
-#: ../../netconnect.pm_.c:627
-msgid "using pppoe"
+#: ../../netconnect.pm_.c:675
+msgid "use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:629
-msgid "using dhcp"
+#: ../../netconnect.pm_.c:677
+msgid "don't use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:633
+#: ../../netconnect.pm_.c:681
msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"However, it exists some connexion that use dhcp. Dhcp usually doesn't "
-"require login/password, so it may be a hint to know what your connexion is."
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, it exists some connexion that only use dhcp. If you don't know, "
+"choose 'use pppoe'"
msgstr ""
+#: ../../network.pm_.c:242
+msgid "Keep the current IP configuration"
+msgstr "Сачувај текуће IP параметре"
+
+#: ../../network.pm_.c:243
+msgid "Reconfigure network now"
+msgstr "Реконфигуриши мрежу"
+
+#: ../../network.pm_.c:244
+#, fuzzy
+msgid "Do not set up networking"
+msgstr "Подеси мрежу"
+
+#: ../../network.pm_.c:247 ../../network.pm_.c:252
+msgid "Network Configuration"
+msgstr "Мрежно подешавање"
+
+#: ../../network.pm_.c:248
+msgid "Local networking has already been configured. Do you want to:"
+msgstr "Локални мрежа је већ подешена. Да ли желите да:"
+
+#: ../../network.pm_.c:253
+msgid "Do you want to configure a local network for your system?"
+msgstr "Да ли желите да подесите локалну мрежу за ваш систем?"
+
+#: ../../network.pm_.c:259
+msgid "no network card found"
+msgstr "Није пронађена мрежна картица"
+
+#: ../../network.pm_.c:277 ../../network.pm_.c:317
+msgid "Configuring network"
+msgstr "Подешавање мреже"
+
+#: ../../network.pm_.c:296
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Постинсталациона конфигурацијa"
+
+#: ../../network.pm_.c:297
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: ../../network.pm_.c:298
+msgid "FTP proxy"
+msgstr "FTP proxy"
+
+#: ../../network.pm_.c:304
+msgid "Proxy should be http://..."
+msgstr "Proxy треба да буде http://..."
+
+#: ../../network.pm_.c:305
+msgid "Proxy should be ftp://..."
+msgstr "Proxy треба да буде ftp://..."
+
+#: ../../network.pm_.c:318
+msgid ""
+"Please enter your host name.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''.\n"
+"You may also enter the IP address of the gateway if you have one"
+msgstr ""
+"Молим унесите име вашег домена, име хоста, као IP адресе додатних\n"
+"'nameserver'-а. Име вашег хоста треба да буде пуно квалификовано име хоста,\n"
+"као на пр. ``mybox.mylab.myco.com''.\n"
+"Ако немате додатних 'nameserver'-а, оставите та поља празна."
+
+#: ../../network.pm_.c:322
+msgid "DNS server:"
+msgstr "DNS сервер:"
+
+#: ../../network.pm_.c:322
+msgid "Gateway device:"
+msgstr "Gateway уређај:"
+
+#: ../../network.pm_.c:322
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../../network.pm_.c:356 ../../network.pm_.c:357
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Подешавање мрежног уређаја %s"
+
+#: ../../network.pm_.c:358
+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 ""
+"Молим унесите IP конфигурацију за ову машину.\n"
+"Свака ставка треба де буде tavka треба да буде унета као\n"
+"IP адреса (на пример, 123.45.67.89)."
+
+#: ../../network.pm_.c:361
+msgid "Automatic IP"
+msgstr "Аутоматски IP"
+
+#: ../../network.pm_.c:361
+msgid "IP address:"
+msgstr "IP адреса:"
+
+#: ../../network.pm_.c:361
+msgid "Netmask:"
+msgstr "Мрежна маска:"
+
+#: ../../network.pm_.c:362
+msgid "(bootp/dhcp)"
+msgstr "(bootp/dhcp)"
+
+#: ../../network.pm_.c:368 ../../printerdrake.pm_.c:107
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP адреса треба да буде у формату 1.2.3.4"
+
#: ../../partition_table.pm_.c:542
msgid "Extended partition not supported on this platform"
msgstr "Extended партициjа ниjе подржана на овоj платформи"
@@ -4580,15 +4625,15 @@ msgstr "интересантно"
msgid "maybe"
msgstr "мождa"
-#: ../../pkgs.pm_.c:33
+#: ../../pkgs.pm_.c:34
msgid "i18n (important)"
msgstr "i18n (вaжно)"
-#: ../../pkgs.pm_.c:34
+#: ../../pkgs.pm_.c:35
msgid "i18n (very nice)"
msgstr "i18n(веома лепо)"
-#: ../../pkgs.pm_.c:35
+#: ../../pkgs.pm_.c:36
msgid "i18n (nice)"
msgstr "i18n(лепо)"
@@ -4885,7 +4930,7 @@ msgstr "Штампач"
msgid "Would you like to configure a printer?"
msgstr "Да ли бисте да подесите штампач?"
-#: ../../printerdrake.pm_.c:335
+#: ../../printerdrake.pm_.c:334
msgid ""
"Here are the following print queues.\n"
"You can add some more or change the existing ones."
@@ -4893,20 +4938,20 @@ msgstr ""
"Ово су постављне опције.\n"
"Можете додати нове или изменити старе."
-#: ../../printerdrake.pm_.c:363 ../../printerdrake.pm_.c:370
-#: ../../printerdrake.pm_.c:382
+#: ../../printerdrake.pm_.c:362 ../../printerdrake.pm_.c:369
+#: ../../printerdrake.pm_.c:381
msgid "Select Printer Connection"
msgstr "Избор повезаности штампача"
-#: ../../printerdrake.pm_.c:364
+#: ../../printerdrake.pm_.c:363
msgid "How is the printer connected?"
msgstr "Како је штампач повезан?"
-#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:382
+#: ../../printerdrake.pm_.c:369 ../../printerdrake.pm_.c:381
msgid "Remove queue"
msgstr "Уклони queue"
-#: ../../printerdrake.pm_.c:371
+#: ../../printerdrake.pm_.c:370
#, fuzzy
msgid ""
"Every printer managed by CUPS need a name (for example lp).\n"
@@ -4919,26 +4964,26 @@ msgstr ""
"директоријум\n"
"да користим за овај ред за штампу и како jе штампач повезан?"
-#: ../../printerdrake.pm_.c:375
+#: ../../printerdrake.pm_.c:374
#, fuzzy
msgid "Name of printer"
msgstr "Локални штампач"
-#: ../../printerdrake.pm_.c:376
+#: ../../printerdrake.pm_.c:375
#, fuzzy
msgid "Description"
msgstr "Наведите опције"
-#: ../../printerdrake.pm_.c:377
+#: ../../printerdrake.pm_.c:376
#, fuzzy
msgid "Location"
msgstr "Информације"
-#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:388
+#: ../../printerdrake.pm_.c:377 ../../printerdrake.pm_.c:387
msgid "Printer Connection"
msgstr "Конекциjа штампача"
-#: ../../printerdrake.pm_.c:383
+#: ../../printerdrake.pm_.c:382
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"
@@ -4950,11 +4995,11 @@ msgstr ""
"директоријум\n"
"да користим за овај ред за штампу и како jе штампач повезан?"
-#: ../../printerdrake.pm_.c:386
+#: ../../printerdrake.pm_.c:385
msgid "Name of queue"
msgstr "Име queue-a "
-#: ../../printerdrake.pm_.c:387
+#: ../../printerdrake.pm_.c:386
msgid "Spool directory"
msgstr "'Spool директоријум"
@@ -5205,155 +5250,120 @@ msgstr ""
"Не могу прочитати табелу партиција, много је искварена за мене :(\n"
"Покушаћу даље заобилазећи лоше партиције"
-#: ../../standalone/drakboot_.c:24
+#: ../../standalone/drakboot_.c:25
msgid "Configure LILO/GRUB"
msgstr "Конфигурисање LILO/GRUB стартерa"
-#: ../../standalone/drakboot_.c:25
+#: ../../standalone/drakboot_.c:26
msgid "Create a boot floppy"
msgstr "Направи стартну дискету"
-#: ../../standalone/drakboot_.c:27
+#: ../../standalone/drakboot_.c:28
msgid "Format floppy"
msgstr "Форматирај дискету"
-#: ../../standalone/drakboot_.c:39
+#: ../../standalone/drakboot_.c:40
msgid "Choice"
msgstr "Избор"
-#: ../../standalone/drakboot_.c:58
+#: ../../standalone/drakboot_.c:59
msgid "Installation of LILO failed. The following error occured:"
msgstr "Инсталација LILO-а неуспела. Грешка је:"
-#: ../../standalone/drakgw_.c:84
+#: ../../standalone/drakgw_.c:86
msgid "Internet Connection Sharing currently enabled"
msgstr ""
-#: ../../standalone/drakgw_.c:85 ../../standalone/drakgw_.c:103
+#: ../../standalone/drakgw_.c:87 ../../standalone/drakgw_.c:105
msgid "The setup of Internet connection sharing has already been done.\n"
msgstr ""
-#: ../../standalone/drakgw_.c:102
+#: ../../standalone/drakgw_.c:104
msgid "Internet Connection Sharing currently disabled"
msgstr ""
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:122
msgid "Config file content could not be interpreted."
msgstr ""
-#: ../../standalone/drakgw_.c:130
+#: ../../standalone/drakgw_.c:132
#, fuzzy
msgid "Internet Connection Sharing"
msgstr "Конекциjа штампача"
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:133
msgid ""
"Your computer can be configured to share its Internet connection.\n"
"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:180
+#: ../../standalone/drakgw_.c:186
msgid "No network adapter on your system!"
msgstr ""
-#: ../../standalone/drakgw_.c:181
-msgid ""
-"No ethernet network adapter is currently configured on your system. Please "
-"run the hardware configuration tool."
-msgstr ""
-
#: ../../standalone/drakgw_.c:187
-msgid "Network interface"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:188
msgid ""
-"There is only one configured network adapter on your system:\n"
-"\n"
-"$interface\n"
-"\n"
-"Would you like to setup your Local Area Network with that adapter?"
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
msgstr ""
-#: ../../standalone/drakgw_.c:192
-#, fuzzy
-msgid "Choose the network interface"
-msgstr "Изаберите нову величину"
-
-#: ../../standalone/drakgw_.c:193
+#: ../../standalone/drakgw_.c:199
msgid ""
-"Please choose what network adapter will be connected\n"
-"to your Local Area Network."
-msgstr ""
-
-#: ../../standalone/drakgw_.c:205
-msgid "Local Area Network specification"
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
msgstr ""
-#: ../../standalone/drakgw_.c:206
-msgid "You may now decide which class C network to use.\n"
+#: ../../standalone/drakgw_.c:208
+msgid ""
+"Warning, the network adapter is already configured.\n"
+"Would you like to reconfigure?"
msgstr ""
-#: ../../standalone/drakgw_.c:207
-#, fuzzy
-msgid "Network:"
-msgstr "Мрежна маска:"
-
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:233
msgid "Potential LAN address conflict found in current config of $_!\n"
msgstr ""
-#: ../../standalone/drakgw_.c:233
-msgid "Internet Connection Sharing - setup of $device"
-msgstr ""
+#: ../../standalone/drakgw_.c:243
+#, fuzzy
+msgid "Firewalling configuration detected!"
+msgstr "Учитaвaње конфигурације"
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:244
msgid ""
-"The following interface is about to be configured:\n"
-"\n"
-"$interface\n"
-"\n"
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation. Proceed?"
msgstr ""
-#: ../../standalone/drakgw_.c:245
+#: ../../standalone/drakgw_.c:258
msgid "Configuring scripts, installing software, starting servers..."
msgstr ""
-#: ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:282
msgid "Could not install ipchains RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:395
+#: ../../standalone/drakgw_.c:432
msgid "Could not install dhcp RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:419
+#: ../../standalone/drakgw_.c:456
msgid "Could not install linuxconf RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:435
+#: ../../standalone/drakgw_.c:472
msgid "Could not install bind RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:439
+#: ../../standalone/drakgw_.c:476
msgid "Could not install caching-nameserver RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:451
-#, fuzzy
-msgid "Firewalling configuration detected.!"
-msgstr "Учитaвaње конфигурације"
-
-#: ../../standalone/drakgw_.c:452
-msgid "Warning! An existing firewalling configuration has been detected.\n"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:455
+#: ../../standalone/drakgw_.c:488
#, fuzzy
-msgid "Everything configured!"
-msgstr "Учитaвaње конфигурације"
+msgid "Congratulations!"
+msgstr "Конфигурацијa"
-#: ../../standalone/drakgw_.c:456
+#: ../../standalone/drakgw_.c:489
msgid "Everything has been configured.\n"
msgstr ""
@@ -5420,10 +5430,6 @@ msgstr "Подешавање сигурносног нивоа"
msgid "Choose the tool you want to use"
msgstr "Изаберите алат које желите да користите"
-#: ../../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
-msgstr "Коју врсту тастатуре имате?"
-
#: ../../standalone/mousedrake_.c:25
msgid "What is the type of your mouse?"
msgstr "Који тип миша имате?"
@@ -5649,6 +5655,45 @@ msgstr "Пронaђи остављенe"
msgid "Finding leaves takes some time"
msgstr "Пронaђи остављених трaжи мало временa"
+#~ msgid "curly"
+#~ msgstr "таласасто"
+
+#~ msgid "default"
+#~ msgstr "По default-y"
+
+#~ msgid "tie"
+#~ msgstr "краватa"
+
+#~ msgid "brunette"
+#~ msgstr "црнкa"
+
+#~ msgid "girl"
+#~ msgstr "девоjкa"
+
+#~ msgid "woman-blond"
+#~ msgstr "плавушa"
+
+#~ msgid "automagic"
+#~ msgstr "Аутомагија"
+
+#~ msgid "Upgrade"
+#~ msgstr "Ажурирање"
+
+#, fuzzy
+#~ msgid "Do not connect to internet"
+#~ msgstr "Немој подешавати мрежу"
+
+#, fuzzy
+#~ msgid "Network:"
+#~ msgstr "Мрежна маска:"
+
+#, fuzzy
+#~ msgid "Everything configured!"
+#~ msgstr "Учитaвaње конфигурације"
+
+#~ msgid "What is your keyboard layout?"
+#~ msgstr "Коју врсту тастатуре имате?"
+
#~ msgid "Normal"
#~ msgstr "Нормалнa"