summaryrefslogtreecommitdiffstats
path: root/perl-install/share/advertising
diff options
context:
space:
mode:
authorFunda Wang <fwang@mandriva.org>2005-09-07 17:03:06 +0000
committerFunda Wang <fwang@mandriva.org>2005-09-07 17:03:06 +0000
commitd44b7692bfa132a6b886b52af06714ae095c9e14 (patch)
tree377805e4935f8b16e6acd4ea16b98b069fa23189 /perl-install/share/advertising
parent2a4b4263b0ffbd79577607eddef3ceda0997c41d (diff)
downloaddrakx-d44b7692bfa132a6b886b52af06714ae095c9e14.tar
drakx-d44b7692bfa132a6b886b52af06714ae095c9e14.tar.gz
drakx-d44b7692bfa132a6b886b52af06714ae095c9e14.tar.bz2
drakx-d44b7692bfa132a6b886b52af06714ae095c9e14.tar.xz
drakx-d44b7692bfa132a6b886b52af06714ae095c9e14.zip
Updated POT.
Diffstat (limited to 'perl-install/share/advertising')
0 files changed, 0 insertions, 0 deletions
'diff'>
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 54948908c..dfb4426d8 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-09-19 22:33+0200\n"
+"POT-Creation-Date: 2000-09-21 15:04+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:348
#: ../../mouse.pm_.c:43
msgid "Generic"
msgstr ""
@@ -35,33 +35,33 @@ msgstr ""
msgid "X server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:213 ../../Xconfigurator.pm_.c:218
+#: ../../Xconfigurator.pm_.c:213 ../../Xconfigurator.pm_.c:219
#, c-format
msgid "XFree %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:215
+#: ../../Xconfigurator.pm_.c:216
msgid "Which configuration of XFree do you want to have?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:228
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
"Your card is supported by XFree %s which may have a better support in 2D."
msgstr ""
-#: ../../Xconfigurator.pm_.c:228 ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:230 ../../Xconfigurator.pm_.c:253
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr ""
-#: ../../Xconfigurator.pm_.c:230 ../../Xconfigurator.pm_.c:251
+#: ../../Xconfigurator.pm_.c:232 ../../Xconfigurator.pm_.c:255
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:238
+#: ../../Xconfigurator.pm_.c:241
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -69,39 +69,39 @@ msgid ""
"Your card is supported by XFree %s which may have a better support in 2D."
msgstr ""
-#: ../../Xconfigurator.pm_.c:241
+#: ../../Xconfigurator.pm_.c:244
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
msgstr ""
-#: ../../Xconfigurator.pm_.c:243
+#: ../../Xconfigurator.pm_.c:246
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:255
+#: ../../Xconfigurator.pm_.c:260
msgid "XFree configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:290
+#: ../../Xconfigurator.pm_.c:295
msgid "Select the memory size of your graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:332
+#: ../../Xconfigurator.pm_.c:337
msgid "Choose options for server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:348
msgid "Choose a monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:348
msgid "Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:346
+#: ../../Xconfigurator.pm_.c:351
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -115,207 +115,227 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:358
msgid "Horizontal refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:358
msgid "Vertical refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:397
msgid "Monitor not configured"
msgstr ""
-#: ../../Xconfigurator.pm_.c:395
+#: ../../Xconfigurator.pm_.c:400
msgid "Graphic card not configured yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:398
+#: ../../Xconfigurator.pm_.c:403
msgid "Resolutions not chosen yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:411
+#: ../../Xconfigurator.pm_.c:416
msgid "Do you want to test the configuration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:415
+#: ../../Xconfigurator.pm_.c:420
msgid "Warning: testing this graphic card may freeze your computer"
msgstr ""
-#: ../../Xconfigurator.pm_.c:418
+#: ../../Xconfigurator.pm_.c:423
msgid "Test of the configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:457
+#: ../../Xconfigurator.pm_.c:462
msgid ""
"\n"
"try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:457
+#: ../../Xconfigurator.pm_.c:462
msgid "An error has occurred:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:479
+#: ../../Xconfigurator.pm_.c:484
#, c-format
msgid "Leaving in %d seconds"
msgstr ""
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:494
msgid "Is this the correct setting?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:497
+#: ../../Xconfigurator.pm_.c:502
msgid "An error has occurred, try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:534 ../../printerdrake.pm_.c:275
+#: ../../Xconfigurator.pm_.c:539 ../../printerdrake.pm_.c:275
msgid "Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:569
+#: ../../Xconfigurator.pm_.c:574
msgid "Choose the resolution and the color depth"
msgstr ""
-#: ../../Xconfigurator.pm_.c:571
+#: ../../Xconfigurator.pm_.c:576
#, c-format
msgid "Graphic card: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:572
+#: ../../Xconfigurator.pm_.c:577
#, c-format
msgid "XFree86 server: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:581
+#: ../../Xconfigurator.pm_.c:586
msgid "Show all"
msgstr ""
-#: ../../Xconfigurator.pm_.c:605
+#: ../../Xconfigurator.pm_.c:610
msgid "Resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1002
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:998
+#: ../../Xconfigurator.pm_.c:1003
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:999
+#: ../../Xconfigurator.pm_.c:1004
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1000
+#: ../../Xconfigurator.pm_.c:1005
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1006
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1007
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1003
+#: ../../Xconfigurator.pm_.c:1008
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1009
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1011
+#, c-format
+msgid "Color depth: %s\n"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1012
+#, c-format
+msgid "Resolution: %s\n"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1014
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1020
-msgid "Preparing X-Window configuration"
+#: ../../Xconfigurator.pm_.c:1015
+#, c-format
+msgid "XFree86 driver: %s\n"
msgstr ""
#: ../../Xconfigurator.pm_.c:1034
+msgid "Preparing X-Window configuration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:1048
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1035
+#: ../../Xconfigurator.pm_.c:1049
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1036
+#: ../../Xconfigurator.pm_.c:1050
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1037
+#: ../../Xconfigurator.pm_.c:1051
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1038
+#: ../../Xconfigurator.pm_.c:1052
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1039
+#: ../../Xconfigurator.pm_.c:1053
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1040 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1054 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1044 ../../standalone/drakboot_.c:40
+#: ../../Xconfigurator.pm_.c:1058 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1051
-msgid "Forget the changes?"
+#: ../../Xconfigurator.pm_.c:1065
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1069
+#: ../../Xconfigurator.pm_.c:1086
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1087
+#: ../../Xconfigurator.pm_.c:1104
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1090
+#: ../../Xconfigurator.pm_.c:1107
msgid "X at startup"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1091
+#: ../../Xconfigurator.pm_.c:1108
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1111
+#: ../../Xconfigurator.pm_.c:1128
msgid "Autologin"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1129
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:1114
+#: ../../Xconfigurator.pm_.c:1131
msgid "Choose the default user:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1115
-msgid "Choose the window_manager to run:"
+#: ../../Xconfigurator.pm_.c:1132
+msgid "Choose the window manager to run:"
msgstr ""
#: ../../Xconfigurator_consts.pm_.c:6
@@ -471,7 +491,7 @@ msgid "Delay before booting default image"
msgstr ""
#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:681 ../../netconnect.pm_.c:490
+#: ../../install_steps_interactive.pm_.c:681 ../../netconnect.pm_.c:492
#: ../../printerdrake.pm_.c:93 ../../printerdrake.pm_.c:127
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
@@ -524,7 +544,7 @@ msgid "Add"
msgstr ""
#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:675 ../../netconnect.pm_.c:679
+#: ../../install_steps_interactive.pm_.c:675 ../../netconnect.pm_.c:682
#: ../../printerdrake.pm_.c:351 ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr ""
@@ -618,13 +638,13 @@ msgid "Do you have any %s interfaces?"
msgstr ""
#: ../../any.pm_.c:448 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:486
-#: ../../netconnect.pm_.c:84 ../../netconnect.pm_.c:390
+#: ../../netconnect.pm_.c:84 ../../netconnect.pm_.c:392
#: ../../printerdrake.pm_.c:232
msgid "No"
msgstr ""
#: ../../any.pm_.c:448 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:486
-#: ../../netconnect.pm_.c:82 ../../netconnect.pm_.c:388
+#: ../../netconnect.pm_.c:82 ../../netconnect.pm_.c:390
msgid "Yes"
msgstr ""
@@ -733,11 +753,11 @@ 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:681
+#: ../../bootloader.pm_.c:694
msgid "Desktop"
msgstr ""
-#: ../../bootloader.pm_.c:681
+#: ../../bootloader.pm_.c:694
msgid "Start Menu"
msgstr ""
@@ -2000,7 +2020,7 @@ msgstr ""
msgid "Exit install"
msgstr ""
-#: ../../install_any.pm_.c:559
+#: ../../install_any.pm_.c:555
msgid "Error reading file $f"
msgstr ""
@@ -2199,12 +2219,12 @@ msgid ""
"Mandrake/RPMS/*.rpm\"\n"
msgstr ""
-#: ../../install_steps.pm_.c:440
+#: ../../install_steps.pm_.c:443
#, c-format
msgid "Welcome to %s"
msgstr ""
-#: ../../install_steps.pm_.c:652
+#: ../../install_steps.pm_.c:655
msgid "No floppy drive available"
msgstr ""
@@ -2523,11 +2543,11 @@ msgstr ""
msgid "What is your system used for?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:158
+#: ../../install_steps_interactive.pm_.c:158 ../../standalone/mousedrake_.c:24
msgid "Please, choose the type of your mouse."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:40
msgid "Mouse Port"
msgstr ""
@@ -3406,141 +3426,141 @@ msgstr ""
msgid "Do you want to try to connect to the internet now?"
msgstr ""
-#: ../../netconnect.pm_.c:123 ../../netconnect.pm_.c:196
-#: ../../netconnect.pm_.c:215 ../../netconnect.pm_.c:227
-#: ../../netconnect.pm_.c:239
+#: ../../netconnect.pm_.c:125 ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:217 ../../netconnect.pm_.c:229
+#: ../../netconnect.pm_.c:241
msgid "ISDN Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:123
+#: ../../netconnect.pm_.c:125
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
msgstr ""
-#: ../../netconnect.pm_.c:139
+#: ../../netconnect.pm_.c:141
msgid "Connection Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:140
+#: ../../netconnect.pm_.c:142
msgid "Please fill or check the field below"
msgstr ""
-#: ../../netconnect.pm_.c:142
+#: ../../netconnect.pm_.c:144
msgid "Card IRQ"
msgstr ""
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:145
msgid "Card mem (DMA)"
msgstr ""
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:146
msgid "Card IO"
msgstr ""
-#: ../../netconnect.pm_.c:145
+#: ../../netconnect.pm_.c:147
msgid "Card IO_0"
msgstr ""
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:148
msgid "Card IO_1"
msgstr ""
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:149
msgid "Your personnal phone number"
msgstr ""
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:151
msgid "Provider name (ex provider.net)"
msgstr ""
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:152
msgid "Provider phone number"
msgstr ""
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:153
msgid "Provider dns 1"
msgstr ""
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:154
msgid "Provider dns 2"
msgstr ""
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:155
msgid "Dialing mode"
msgstr ""
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:156
msgid ""
"Time (secs) of inactivity after which\n"
"it hangs up. (leave blank to disable it)"
msgstr ""
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:157
msgid "Account Login (user name)"
msgstr ""
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:158
msgid "Account Password"
msgstr ""
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:159
msgid "Confirm Password"
msgstr ""
-#: ../../netconnect.pm_.c:189
+#: ../../netconnect.pm_.c:191
msgid "Germany"
msgstr ""
-#: ../../netconnect.pm_.c:189
+#: ../../netconnect.pm_.c:191
msgid "Germany (1TR6)"
msgstr ""
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:193
msgid "Europe"
msgstr ""
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:193
msgid "Europe (EDSS1)"
msgstr ""
-#: ../../netconnect.pm_.c:193
+#: ../../netconnect.pm_.c:195
msgid "Rest of the world"
msgstr ""
-#: ../../netconnect.pm_.c:193
+#: ../../netconnect.pm_.c:195
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr ""
-#: ../../netconnect.pm_.c:197
+#: ../../netconnect.pm_.c:199
msgid "Which protocol do you want to use ?"
msgstr ""
-#: ../../netconnect.pm_.c:207
+#: ../../netconnect.pm_.c:209
msgid "ISA / PCMCIA"
msgstr ""
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:211
msgid "PCI"
msgstr ""
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:213
msgid "I don't know"
msgstr ""
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:218
msgid "What kind of card do you have?"
msgstr ""
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:224
msgid "Continue"
msgstr ""
-#: ../../netconnect.pm_.c:224
+#: ../../netconnect.pm_.c:226
msgid "Abort"
msgstr ""
-#: ../../netconnect.pm_.c:228
+#: ../../netconnect.pm_.c:230
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -3548,239 +3568,223 @@ msgid ""
"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
msgstr ""
-#: ../../netconnect.pm_.c:240
+#: ../../netconnect.pm_.c:242
msgid "Which is your ISDN card ?"
msgstr ""
-#: ../../netconnect.pm_.c:265
+#: ../../netconnect.pm_.c:267
msgid "I have found an ISDN Card:\n"
msgstr ""
-#: ../../netconnect.pm_.c:273
+#: ../../netconnect.pm_.c:275
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:280
+#: ../../netconnect.pm_.c:282
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:318 ../../standalone/drakgw_.c:211
+#: ../../netconnect.pm_.c:320 ../../standalone/drakgw_.c:215
msgid "Choose the network interface"
msgstr ""
-#: ../../netconnect.pm_.c:319
+#: ../../netconnect.pm_.c:321
msgid ""
-"Please choose which network adapter do you want to use to connect to internet"
+"Please choose which network adapter you want to use to connect to internet"
msgstr ""
-#: ../../netconnect.pm_.c:334
+#: ../../netconnect.pm_.c:336
msgid "Network interface"
msgstr ""
-#: ../../netconnect.pm_.c:335
+#: ../../netconnect.pm_.c:337
msgid "I'm about to restart the network interface. Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:393
+#: ../../netconnect.pm_.c:395
msgid "ADSL configuration"
msgstr ""
-#: ../../netconnect.pm_.c:394
+#: ../../netconnect.pm_.c:396
msgid "Do you want to start your connection at boot?"
msgstr ""
-#: ../../netconnect.pm_.c:471
+#: ../../netconnect.pm_.c:473
msgid "Try to find a modem?"
msgstr ""
-#: ../../netconnect.pm_.c:481
+#: ../../netconnect.pm_.c:483
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:488
msgid "Dialup options"
msgstr ""
-#: ../../netconnect.pm_.c:487
+#: ../../netconnect.pm_.c:489
msgid "Connection name"
msgstr ""
-#: ../../netconnect.pm_.c:488
+#: ../../netconnect.pm_.c:490
msgid "Phone number"
msgstr ""
-#: ../../netconnect.pm_.c:489
+#: ../../netconnect.pm_.c:491
msgid "Login ID"
msgstr ""
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Authentication"
msgstr ""
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "PAP"
msgstr ""
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Script-based"
msgstr ""
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Terminal-based"
msgstr ""
-#: ../../netconnect.pm_.c:492
+#: ../../netconnect.pm_.c:494
msgid "Domain name"
msgstr ""
-#: ../../netconnect.pm_.c:494
+#: ../../netconnect.pm_.c:496
msgid "First DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:495
+#: ../../netconnect.pm_.c:497
msgid "Second DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:510
+#: ../../netconnect.pm_.c:512
msgid "Connect to internet"
msgstr ""
-#: ../../netconnect.pm_.c:512
+#: ../../netconnect.pm_.c:514
msgid "Disconnect from internet"
msgstr ""
-#: ../../netconnect.pm_.c:514
+#: ../../netconnect.pm_.c:516
msgid "Configure internet connection"
msgstr ""
-#: ../../netconnect.pm_.c:517
+#: ../../netconnect.pm_.c:519
msgid "Internet connection & configuration"
msgstr ""
-#: ../../netconnect.pm_.c:518
+#: ../../netconnect.pm_.c:520
msgid "What do you wish to do?"
msgstr ""
-#: ../../netconnect.pm_.c:536
+#: ../../netconnect.pm_.c:538
msgid "Connect to internet with a normal modem"
msgstr ""
-#: ../../netconnect.pm_.c:542
+#: ../../netconnect.pm_.c:544
msgid "Connect to internet using ISDN"
msgstr ""
-#: ../../netconnect.pm_.c:546
+#: ../../netconnect.pm_.c:548
msgid "Internal ISDN card"
msgstr ""
-#: ../../netconnect.pm_.c:548
+#: ../../netconnect.pm_.c:550
msgid "External modem"
msgstr ""
-#: ../../netconnect.pm_.c:551 ../../netconnect.pm_.c:578
-#: ../../netconnect.pm_.c:589 ../../netconnect.pm_.c:613
-#: ../../netconnect.pm_.c:653
+#: ../../netconnect.pm_.c:553 ../../netconnect.pm_.c:580
+#: ../../netconnect.pm_.c:591 ../../netconnect.pm_.c:615
+#: ../../netconnect.pm_.c:655
msgid "Connect to the Internet"
msgstr ""
-#: ../../netconnect.pm_.c:552
+#: ../../netconnect.pm_.c:554
msgid "What kind is your ISDN connection?"
msgstr ""
-#: ../../netconnect.pm_.c:570
+#: ../../netconnect.pm_.c:572
msgid "Connect to internet using DSL (or ADSL)"
msgstr ""
-#: ../../netconnect.pm_.c:573
+#: ../../netconnect.pm_.c:575
msgid "France"
msgstr ""
-#: ../../netconnect.pm_.c:575
+#: ../../netconnect.pm_.c:577
msgid "Other countries"
msgstr ""
-#: ../../netconnect.pm_.c:579
+#: ../../netconnect.pm_.c:581
msgid "In which country are you located ?"
msgstr ""
-#: ../../netconnect.pm_.c:584
+#: ../../netconnect.pm_.c:586
msgid "Alcatel modem"
msgstr ""
-#: ../../netconnect.pm_.c:586
+#: ../../netconnect.pm_.c:588
msgid "ECI modem"
msgstr ""
-#: ../../netconnect.pm_.c:590
+#: ../../netconnect.pm_.c:592
msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
msgstr ""
-#: ../../netconnect.pm_.c:608
+#: ../../netconnect.pm_.c:610
msgid "use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:610
+#: ../../netconnect.pm_.c:612
msgid "don't use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:614
+#: ../../netconnect.pm_.c:616
msgid ""
"The most common way to connect with adsl is dhcp + pppoe.\n"
"However, it exists some connection that only use dhcp.\n"
"If you don't know, choose 'use pppoe'"
msgstr ""
-#: ../../netconnect.pm_.c:631
+#: ../../netconnect.pm_.c:633
msgid "Connect to internet using Cable"
msgstr ""
-#: ../../netconnect.pm_.c:635
-msgid "Cable connection"
-msgstr ""
-
-#: ../../netconnect.pm_.c:636 ../../network.pm_.c:267
-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:640
-msgid "Host name:"
-msgstr ""
-
-#: ../../netconnect.pm_.c:654
+#: ../../netconnect.pm_.c:656
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
msgstr ""
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:670
msgid "Configure local network"
msgstr ""
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:670
msgid "Reconfigure local network"
msgstr ""
-#: ../../netconnect.pm_.c:673
+#: ../../netconnect.pm_.c:676
msgid "Disable networking"
msgstr ""
-#: ../../netconnect.pm_.c:683
+#: ../../netconnect.pm_.c:686
msgid "Connect to the Internet / Configure local Network"
msgstr ""
-#: ../../netconnect.pm_.c:684
+#: ../../netconnect.pm_.c:687
msgid ""
"Local networking has already been configured.\n"
"Do you want to:"
msgstr ""
-#: ../../netconnect.pm_.c:685
+#: ../../netconnect.pm_.c:688
msgid "How do you want to connect to the Internet?"
msgstr ""
@@ -3792,6 +3796,14 @@ msgstr ""
msgid "Configuring network"
msgstr ""
+#: ../../network.pm_.c:267
+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 ""
+
#: ../../network.pm_.c:271 ../../network.pm_.c:321
msgid "Host name"
msgstr ""
@@ -4476,97 +4488,97 @@ msgstr ""
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../../standalone/drakgw_.c:99
+#: ../../standalone/drakgw_.c:100
msgid "Internet Connection Sharing currently enabled"
msgstr ""
-#: ../../standalone/drakgw_.c:100 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:101 ../../standalone/drakgw_.c:119
msgid "The setup of Internet connection sharing has already been done.\n"
msgstr ""
-#: ../../standalone/drakgw_.c:117
+#: ../../standalone/drakgw_.c:118
msgid "Internet Connection Sharing currently disabled"
msgstr ""
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:136
msgid "Config file content could not be interpreted."
msgstr ""
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:146
msgid "Internet Connection Sharing"
msgstr ""
-#: ../../standalone/drakgw_.c:146
+#: ../../standalone/drakgw_.c:147
msgid ""
"Your computer can be configured to share its Internet connection.\n"
"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:199
+#: ../../standalone/drakgw_.c:203
msgid "No network adapter on your system!"
msgstr ""
-#: ../../standalone/drakgw_.c:200
+#: ../../standalone/drakgw_.c:204
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
msgstr ""
-#: ../../standalone/drakgw_.c:212
+#: ../../standalone/drakgw_.c:216
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr ""
-#: ../../standalone/drakgw_.c:221
+#: ../../standalone/drakgw_.c:225
msgid ""
"Warning, the network adapter is already configured.\n"
"Would you like to reconfigure?"
msgstr ""
-#: ../../standalone/drakgw_.c:246
+#: ../../standalone/drakgw_.c:250
msgid "Potential LAN address conflict found in current config of $_!\n"
msgstr ""
-#: ../../standalone/drakgw_.c:256
+#: ../../standalone/drakgw_.c:260
msgid "Firewalling configuration detected!"
msgstr ""
-#: ../../standalone/drakgw_.c:257
+#: ../../standalone/drakgw_.c:261
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation. Proceed?"
msgstr ""
-#: ../../standalone/drakgw_.c:271
+#: ../../standalone/drakgw_.c:274
msgid "Configuring scripts, installing software, starting servers..."
msgstr ""
-#: ../../standalone/drakgw_.c:295
+#: ../../standalone/drakgw_.c:298
msgid "Could not install ipchains RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:445
+#: ../../standalone/drakgw_.c:448
msgid "Could not install dhcp RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:469
+#: ../../standalone/drakgw_.c:472
msgid "Could not install linuxconf RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:485
+#: ../../standalone/drakgw_.c:488
msgid "Could not install bind RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:489
+#: ../../standalone/drakgw_.c:492
msgid "Could not install caching-nameserver RPM with urpmi."
msgstr ""
-#: ../../standalone/drakgw_.c:501
+#: ../../standalone/drakgw_.c:504
msgid "Congratulations!"
msgstr ""
-#: ../../standalone/drakgw_.c:502
+#: ../../standalone/drakgw_.c:505
msgid "Everything has been configured.\n"
msgstr ""
@@ -4617,19 +4629,15 @@ msgstr ""
msgid "Choose the tool you want to use"
msgstr ""
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr ""
-
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
msgid "no serial_usb found\n"
msgstr ""
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
msgid "Emulate third button?"
msgstr ""
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
msgid "Which serial port is your mouse connected to?"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index cd9c9e402..0d0b41f61 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-09-19 22:33+0200\n"
+"POT-Creation-Date: 2000-09-21 15:04+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:348
#: ../../mouse.pm_.c:43
msgid "Generic"
msgstr "Generisk"
@@ -35,16 +35,16 @@ msgstr "Velg en X-tjener"
msgid "X server"
msgstr "X-tjener"
-#: ../../Xconfigurator.pm_.c:213 ../../Xconfigurator.pm_.c:218
+#: ../../Xconfigurator.pm_.c:213 ../../Xconfigurator.pm_.c:219
#, c-format
msgid "XFree %s"
msgstr "XFree %s"
-#: ../../Xconfigurator.pm_.c:215
+#: ../../Xconfigurator.pm_.c:216
msgid "Which configuration of XFree do you want to have?"
msgstr "Hvilken konfigurasjon av XFree vil du ha?"
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:228
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -54,17 +54,17 @@ msgstr ""
"%s.\n"
"Kortet ditt er stјttet av XFree %s som kan ha bedre stјtte i 2D."
-#: ../../Xconfigurator.pm_.c:228 ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:230 ../../Xconfigurator.pm_.c:253
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr "Kortet ditt kan ha stјtte for maskinvare 3D akselerasjon med XFree %s."
-#: ../../Xconfigurator.pm_.c:230 ../../Xconfigurator.pm_.c:251
+#: ../../Xconfigurator.pm_.c:232 ../../Xconfigurator.pm_.c:255
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr "XFree %s med maskinvare 3D akselerasjon"
-#: ../../Xconfigurator.pm_.c:238
+#: ../../Xconfigurator.pm_.c:241
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -76,7 +76,7 @@ msgstr ""
"MERK AT DETTE ER EKSPERIMENTEL STиTTE OG KAN 'FRYSE' MASKINEN DIN.\n"
"Kortet ditt er stјttet av XFree %s som kan ha bedre stјtte i 2D."
-#: ../../Xconfigurator.pm_.c:241
+#: ../../Xconfigurator.pm_.c:244
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -85,32 +85,32 @@ msgstr ""
"Kortet ditt kan ha stјtte for maskinvare 3D akselerasjon med XFree %s,\n"
"MERK AT DETTE ER EKSPERIMENTEL STиTTE OG KAN 'FRYSE' MASKINEN DIN."
-#: ../../Xconfigurator.pm_.c:243
+#: ../../Xconfigurator.pm_.c:246
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "XFree %s med EKSPERIMENTEL maskinvare 3D akselerasjon"
-#: ../../Xconfigurator.pm_.c:255
+#: ../../Xconfigurator.pm_.c:260
msgid "XFree configuration"
msgstr "XFree konfigurasjon"
-#: ../../Xconfigurator.pm_.c:290
+#: ../../Xconfigurator.pm_.c:295
msgid "Select the memory size of your graphic card"
msgstr "Velg minnestјrrelsen til grafikk-kortet ditt"
-#: ../../Xconfigurator.pm_.c:332
+#: ../../Xconfigurator.pm_.c:337
msgid "Choose options for server"
msgstr "Velg opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:348
msgid "Choose a monitor"
msgstr "Velg en monitor"
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:348
msgid "Monitor"
msgstr "Monitor"
-#: ../../Xconfigurator.pm_.c:346
+#: ../../Xconfigurator.pm_.c:351
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -134,39 +134,39 @@ msgstr ""
"skjermen din.\n"
"Hvis du er usikker, velg en konservativ innstilling."
-#: ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:358
msgid "Horizontal refresh rate"
msgstr "Horisontal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:358
msgid "Vertical refresh rate"
msgstr "Vertikal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:397
msgid "Monitor not configured"
msgstr "Monitor er ikke konfigurert"
-#: ../../Xconfigurator.pm_.c:395
+#: ../../Xconfigurator.pm_.c:400
msgid "Graphic card not configured yet"
msgstr "Grafikk-kort er ikke konfigurert ennх"
-#: ../../Xconfigurator.pm_.c:398
+#: ../../Xconfigurator.pm_.c:403
msgid "Resolutions not chosen yet"
msgstr "Opplјsninger er ikke valgt ennх"
-#: ../../Xconfigurator.pm_.c:411
+#: ../../Xconfigurator.pm_.c:416
msgid "Do you want to test the configuration?"
msgstr "Vil du teste konfigurasjonen?"
-#: ../../Xconfigurator.pm_.c:415
+#: ../../Xconfigurator.pm_.c:420
msgid "Warning: testing this graphic card may freeze your computer"
msgstr "Advarsel: testing av dette grafikk-kortet kan `fryse' maskinen din"
-#: ../../Xconfigurator.pm_.c:418
+#: ../../Xconfigurator.pm_.c:423
msgid "Test of the configuration"
msgstr "Test konfigurasjon"
-#: ../../Xconfigurator.pm_.c:457
+#: ../../Xconfigurator.pm_.c:462
msgid ""
"\n"
"try to change some parameters"
@@ -174,148 +174,168 @@ msgstr ""
"\n"
"prјv х endre noen parametere"
-#: ../../Xconfigurator.pm_.c:457
+#: ../../Xconfigurator.pm_.c:462
msgid "An error has occurred:"
msgstr "En feil oppsto:"
-#: ../../Xconfigurator.pm_.c:479
+#: ../../Xconfigurator.pm_.c:484
#, c-format
msgid "Leaving in %d seconds"
msgstr "Slutter om %d sekunder"
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:494
msgid "Is this the correct setting?"
msgstr "Er dette den riktige innstillingen?"
-#: ../../Xconfigurator.pm_.c:497
+#: ../../Xconfigurator.pm_.c:502
msgid "An error has occurred, try to change some parameters"
msgstr "En feil oppsto, prјv х endre noen parametere"
-#: ../../Xconfigurator.pm_.c:534 ../../printerdrake.pm_.c:275
+#: ../../Xconfigurator.pm_.c:539 ../../printerdrake.pm_.c:275
msgid "Resolution"
msgstr "Opplјsning"
-#: ../../Xconfigurator.pm_.c:569
+#: ../../Xconfigurator.pm_.c:574
msgid "Choose the resolution and the color depth"
msgstr "Velg opplјsning og fargedybde"
-#: ../../Xconfigurator.pm_.c:571
+#: ../../Xconfigurator.pm_.c:576
#, c-format
msgid "Graphic card: %s"
msgstr "Grafikk-kort: %s"
-#: ../../Xconfigurator.pm_.c:572
+#: ../../Xconfigurator.pm_.c:577
#, c-format
msgid "XFree86 server: %s"
msgstr "XFree86-tjener: %s"
-#: ../../Xconfigurator.pm_.c:581
+#: ../../Xconfigurator.pm_.c:586
msgid "Show all"
msgstr "Vis alle"
-#: ../../Xconfigurator.pm_.c:605
+#: ../../Xconfigurator.pm_.c:610
msgid "Resolutions"
msgstr "Opplјsninger"
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1002
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../../Xconfigurator.pm_.c:998
+#: ../../Xconfigurator.pm_.c:1003
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../../Xconfigurator.pm_.c:999
+#: ../../Xconfigurator.pm_.c:1004
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../../Xconfigurator.pm_.c:1000
+#: ../../Xconfigurator.pm_.c:1005
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1006
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1007
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../../Xconfigurator.pm_.c:1003
+#: ../../Xconfigurator.pm_.c:1008
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1009
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1011
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Opsjoner fargedybde"
+
+#: ../../Xconfigurator.pm_.c:1012
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Opplјsninger"
+
+#: ../../Xconfigurator.pm_.c:1014
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../../Xconfigurator.pm_.c:1020
+#: ../../Xconfigurator.pm_.c:1015
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86-tjener: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1034
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../../Xconfigurator.pm_.c:1034
+#: ../../Xconfigurator.pm_.c:1048
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../../Xconfigurator.pm_.c:1035
+#: ../../Xconfigurator.pm_.c:1049
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../../Xconfigurator.pm_.c:1036
+#: ../../Xconfigurator.pm_.c:1050
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:1037
+#: ../../Xconfigurator.pm_.c:1051
msgid "Change Resolution"
msgstr "Endre opplјsning"
-#: ../../Xconfigurator.pm_.c:1038
+#: ../../Xconfigurator.pm_.c:1052
msgid "Show information"
msgstr "Vis informasjon"
-#: ../../Xconfigurator.pm_.c:1039
+#: ../../Xconfigurator.pm_.c:1053
msgid "Test again"
msgstr "Test igjen"
-#: ../../Xconfigurator.pm_.c:1040 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1054 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:1044 ../../standalone/drakboot_.c:40
+#: ../../Xconfigurator.pm_.c:1058 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr "Hva јnsker du х gjјre?"
-#: ../../Xconfigurator.pm_.c:1051
-msgid "Forget the changes?"
-msgstr "Glem endringene?"
+#: ../../Xconfigurator.pm_.c:1065
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Behold nхvцrende IP-konfigurasjon"
-#: ../../Xconfigurator.pm_.c:1069
+#: ../../Xconfigurator.pm_.c:1086
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Vennligst logg inn i %s pх nytt for х aktivere endringene"
-#: ../../Xconfigurator.pm_.c:1087
+#: ../../Xconfigurator.pm_.c:1104
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk sх Ctrl-Alt-BackSpace"
-#: ../../Xconfigurator.pm_.c:1090
+#: ../../Xconfigurator.pm_.c:1107
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../../Xconfigurator.pm_.c:1091
+#: ../../Xconfigurator.pm_.c:1108
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -323,11 +343,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:1111
+#: ../../Xconfigurator.pm_.c:1128
msgid "Autologin"
msgstr "Autoinnlogg"
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1129
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."
@@ -335,12 +355,13 @@ msgstr ""
"Jeg kan sette opp maskinen din til х automatisk logge pх en bruker.\n"
"иnsker du х bruke denne funksjonen?"
-#: ../../Xconfigurator.pm_.c:1114
+#: ../../Xconfigurator.pm_.c:1131
msgid "Choose the default user:"
msgstr "Velg standard bruker:"
-#: ../../Xconfigurator.pm_.c:1115
-msgid "Choose the window_manager to run:"
+#: ../../Xconfigurator.pm_.c:1132
+#, fuzzy
+msgid "Choose the window manager to run:"
msgstr "Velg vinduhхndtereren du јnsker х kjјre:"
#: ../../Xconfigurator_consts.pm_.c:6
@@ -496,7 +517,7 @@ msgid "Delay before booting default image"
msgstr "Forsinkelse fјr oppstart av standard bilde"
#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:681 ../../netconnect.pm_.c:490
+#: ../../install_steps_interactive.pm_.c:681 ../../netconnect.pm_.c:492
#: ../../printerdrake.pm_.c:93 ../../printerdrake.pm_.c:127
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
@@ -552,7 +573,7 @@ msgid "Add"
msgstr "Legg til"
#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:675 ../../netconnect.pm_.c:679
+#: ../../install_steps_interactive.pm_.c:675 ../../netconnect.pm_.c:682
#: ../../printerdrake.pm_.c:351 ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Ferdig"
@@ -646,13 +667,13 @@ msgid "Do you have any %s interfaces?"
msgstr "Har du noen %s grensesnitt?"
#: ../../any.pm_.c:448 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:486
-#: ../../netconnect.pm_.c:84 ../../netconnect.pm_.c:390
+#: ../../netconnect.pm_.c:84 ../../netconnect.pm_.c:392
#: ../../printerdrake.pm_.c:232
msgid "No"
msgstr "Nei"
#: ../../any.pm_.c:448 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:486
-#: ../../netconnect.pm_.c:82 ../../netconnect.pm_.c:388
+#: ../../netconnect.pm_.c:82 ../../netconnect.pm_.c:390
msgid "Yes"
msgstr "Ja"
@@ -825,11 +846,11 @@ 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:681
+#: ../../bootloader.pm_.c:694
msgid "Desktop"
msgstr "Skrivebord"
-#: ../../bootloader.pm_.c:681
+#: ../../bootloader.pm_.c:694
msgid "Start Menu"
msgstr "Startmeny"
@@ -2512,7 +2533,7 @@ msgstr "Diskett autoinstallering"
msgid "Exit install"
msgstr "Avslutt installering"
-#: ../../install_any.pm_.c:559
+#: ../../install_any.pm_.c:555
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
@@ -2742,12 +2763,12 @@ msgstr ""
"Sjekk cd-platen pх en installert maskin med \"rpm -qpl "
"Mandrake/RPMS/*.rpm\"\n"
-#: ../../install_steps.pm_.c:440
+#: ../../install_steps.pm_.c:443
#, c-format
msgid "Welcome to %s"
msgstr "Velkommen til %s"
-#: ../../install_steps.pm_.c:652
+#: ../../install_steps.pm_.c:655
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
@@ -3092,11 +3113,11 @@ msgstr "Tjener"
msgid "What is your system used for?"
msgstr "Hva er systemet ditt brukt til?"
-#: ../../install_steps_interactive.pm_.c:158
+#: ../../install_steps_interactive.pm_.c:158 ../../standalone/mousedrake_.c:24
msgid "Please, choose the type of your mouse."
msgstr "Vennligst velg din musetype."
-#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:40
msgid "Mouse Port"
msgstr "Museport"
@@ -4065,13 +4086,13 @@ msgstr "Internett-konfigurasjon"
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:196
-#: ../../netconnect.pm_.c:215 ../../netconnect.pm_.c:227
-#: ../../netconnect.pm_.c:239
+#: ../../netconnect.pm_.c:125 ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:217 ../../netconnect.pm_.c:229
+#: ../../netconnect.pm_.c:241
msgid "ISDN Configuration"
msgstr "ISDN-konfigurasjon"
-#: ../../netconnect.pm_.c:123
+#: ../../netconnect.pm_.c:125
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
@@ -4079,59 +4100,59 @@ msgstr ""
"Velg din tilbyder.\n"
" Hvis den ikke er i listen, velg ikke i listen"
-#: ../../netconnect.pm_.c:139
+#: ../../netconnect.pm_.c:141
msgid "Connection Configuration"
msgstr "Konfigurasjon tilknytning."
-#: ../../netconnect.pm_.c:140
+#: ../../netconnect.pm_.c:142
msgid "Please fill or check the field below"
msgstr "Vennnligst fyll eller merk feltet under"
-#: ../../netconnect.pm_.c:142
+#: ../../netconnect.pm_.c:144
msgid "Card IRQ"
msgstr "Kort IRQ"
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:145
msgid "Card mem (DMA)"
msgstr "Kort mem (DMA)"
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:146
msgid "Card IO"
msgstr "Kort IO"
-#: ../../netconnect.pm_.c:145
+#: ../../netconnect.pm_.c:147
msgid "Card IO_0"
msgstr "Kort IO_0"
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:148
msgid "Card IO_1"
msgstr "Kort IO_1"
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:149
msgid "Your personnal phone number"
msgstr "Ditt telefonnummer"
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:151
msgid "Provider name (ex provider.net)"
msgstr "Navn tilbyder (f.eks. tilbyder.net)"
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:152
msgid "Provider phone number"
msgstr "Telefonnummer tilbyder"
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:153
msgid "Provider dns 1"
msgstr "Tilbyder dns 1"
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:154
msgid "Provider dns 2"
msgstr "Tilbyder dns 2"
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:155
msgid "Dialing mode"
msgstr "Oppringningsmodus"
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:156
msgid ""
"Time (secs) of inactivity after which\n"
"it hangs up. (leave blank to disable it)"
@@ -4139,71 +4160,71 @@ msgstr ""
"Tid (sek) uten aktivitet fјr\n"
"nedkobling. (la vцre tom for х ikke bruke denne)"
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:157
msgid "Account Login (user name)"
msgstr "Logg inn (brukernavn)"
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:158
msgid "Account Password"
msgstr "Passord"
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:159
msgid "Confirm Password"
msgstr "Bekreft passord"
-#: ../../netconnect.pm_.c:189
+#: ../../netconnect.pm_.c:191
msgid "Germany"
msgstr "Tyskland"
-#: ../../netconnect.pm_.c:189
+#: ../../netconnect.pm_.c:191
msgid "Germany (1TR6)"
msgstr "Tyskland (1TR6)"
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:193
msgid "Europe"
msgstr "Europa"
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:193
msgid "Europe (EDSS1)"
msgstr "Europa (EDSS1)"
-#: ../../netconnect.pm_.c:193
+#: ../../netconnect.pm_.c:195
msgid "Rest of the world"
msgstr "Resten av verden"
-#: ../../netconnect.pm_.c:193
+#: ../../netconnect.pm_.c:195
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr "Resten av verden - ingen D-kanal (leid linje)"
-#: ../../netconnect.pm_.c:197
+#: ../../netconnect.pm_.c:199
msgid "Which protocol do you want to use ?"
msgstr "Hvilken protokoll јnsker du х bruke?"
-#: ../../netconnect.pm_.c:207
+#: ../../netconnect.pm_.c:209
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:211
msgid "PCI"
msgstr "PCI"
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:213
msgid "I don't know"
msgstr "Jeg vet ikke"
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:218
msgid "What kind of card do you have?"
msgstr "Hva slags kort har du?"
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:224
msgid "Continue"
msgstr "Fortsett"
-#: ../../netconnect.pm_.c:224
+#: ../../netconnect.pm_.c:226
msgid "Abort"
msgstr "Avbryt"
-#: ../../netconnect.pm_.c:228
+#: ../../netconnect.pm_.c:230
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -4215,15 +4236,15 @@ msgstr ""
"\n"
"Hvis du har et PCMCIA kort mх du vite irq og io for kortet.\n"
-#: ../../netconnect.pm_.c:240
+#: ../../netconnect.pm_.c:242
msgid "Which is your ISDN card ?"
msgstr "Hvilket er ditt ISDN-kort?"
-#: ../../netconnect.pm_.c:265
+#: ../../netconnect.pm_.c:267
msgid "I have found an ISDN Card:\n"
msgstr "Jeg har funnet et ISDN-kort:\n"
-#: ../../netconnect.pm_.c:273
+#: ../../netconnect.pm_.c:275
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
@@ -4231,172 +4252,173 @@ 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:280
+#: ../../netconnect.pm_.c:282
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:318 ../../standalone/drakgw_.c:211
+#: ../../netconnect.pm_.c:320 ../../standalone/drakgw_.c:215
msgid "Choose the network interface"
msgstr "Velg nettverksgrensesnitt"
-#: ../../netconnect.pm_.c:319
+#: ../../netconnect.pm_.c:321
+#, fuzzy
msgid ""
-"Please choose which network adapter do you want to use to connect to internet"
+"Please choose which network adapter you want to use to connect to internet"
msgstr ""
"Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp "
"mot Internett"
-#: ../../netconnect.pm_.c:334
+#: ../../netconnect.pm_.c:336
msgid "Network interface"
msgstr "Nettverksgrensesnitt"
-#: ../../netconnect.pm_.c:335
+#: ../../netconnect.pm_.c:337
msgid "I'm about to restart the network interface. Do you agree?"
msgstr "Jeg er i ferd med х starte nettverksgrensesnittet pх nytt. Er du enig?"
-#: ../../netconnect.pm_.c:393
+#: ../../netconnect.pm_.c:395
msgid "ADSL configuration"
msgstr "ADSL-konfigurasjon"
-#: ../../netconnect.pm_.c:394
+#: ../../netconnect.pm_.c:396
msgid "Do you want to start your connection at boot?"
msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
-#: ../../netconnect.pm_.c:471
+#: ../../netconnect.pm_.c:473
msgid "Try to find a modem?"
msgstr "Prјve х finne et modem?"
-#: ../../netconnect.pm_.c:481
+#: ../../netconnect.pm_.c:483
msgid "Please choose which serial port your modem is connected to."
msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:488
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../../netconnect.pm_.c:487
+#: ../../netconnect.pm_.c:489
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../../netconnect.pm_.c:488
+#: ../../netconnect.pm_.c:490
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../../netconnect.pm_.c:489
+#: ../../netconnect.pm_.c:491
msgid "Login ID"
msgstr "Login ID"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../../netconnect.pm_.c:492
+#: ../../netconnect.pm_.c:494
msgid "Domain name"
msgstr "Domenenavn"
-#: ../../netconnect.pm_.c:494
+#: ../../netconnect.pm_.c:496
msgid "First DNS Server"
msgstr "Fјrste DNS-tjener"
-#: ../../netconnect.pm_.c:495
+#: ../../netconnect.pm_.c:497
msgid "Second DNS Server"
msgstr "Andre DNS-tjener"
-#: ../../netconnect.pm_.c:510
+#: ../../netconnect.pm_.c:512
msgid "Connect to internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:512
+#: ../../netconnect.pm_.c:514
msgid "Disconnect from internet"
msgstr "Koble ned fra Internett"
-#: ../../netconnect.pm_.c:514
+#: ../../netconnect.pm_.c:516
msgid "Configure internet connection"
msgstr "Konfigurer Internett-tilkobling"
-#: ../../netconnect.pm_.c:517
+#: ../../netconnect.pm_.c:519
msgid "Internet connection & configuration"
msgstr "Internett tilkobling & konfigurasjon"
-#: ../../netconnect.pm_.c:518
+#: ../../netconnect.pm_.c:520
msgid "What do you wish to do?"
msgstr "Hva јnsker du х gjјre?"
-#: ../../netconnect.pm_.c:536
+#: ../../netconnect.pm_.c:538
msgid "Connect to internet with a normal modem"
msgstr "Koble opp mot Internett med vanlig modem"
-#: ../../netconnect.pm_.c:542
+#: ../../netconnect.pm_.c:544
msgid "Connect to internet using ISDN"
msgstr "Koble opp mot Internett med ISDN"
-#: ../../netconnect.pm_.c:546
+#: ../../netconnect.pm_.c:548
msgid "Internal ISDN card"
msgstr "Internt ISDN-kort"
-#: ../../netconnect.pm_.c:548
+#: ../../netconnect.pm_.c:550
msgid "External modem"
msgstr "Eksternt modem"
-#: ../../netconnect.pm_.c:551 ../../netconnect.pm_.c:578
-#: ../../netconnect.pm_.c:589 ../../netconnect.pm_.c:613
-#: ../../netconnect.pm_.c:653
+#: ../../netconnect.pm_.c:553 ../../netconnect.pm_.c:580
+#: ../../netconnect.pm_.c:591 ../../netconnect.pm_.c:615
+#: ../../netconnect.pm_.c:655
msgid "Connect to the Internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:552
+#: ../../netconnect.pm_.c:554
msgid "What kind is your ISDN connection?"
msgstr "Hva slags type er ISDN-tilknytningen din?"
-#: ../../netconnect.pm_.c:570
+#: ../../netconnect.pm_.c:572
msgid "Connect to internet using DSL (or ADSL)"
msgstr "Koble opp mot Internett med DSL (eller ADSL)"
-#: ../../netconnect.pm_.c:573
+#: ../../netconnect.pm_.c:575
msgid "France"
msgstr "Frankrike"
-#: ../../netconnect.pm_.c:575
+#: ../../netconnect.pm_.c:577
msgid "Other countries"
msgstr "Andre land"
-#: ../../netconnect.pm_.c:579
+#: ../../netconnect.pm_.c:581
msgid "In which country are you located ?"
msgstr "I hvilket land er du ?"
-#: ../../netconnect.pm_.c:584
+#: ../../netconnect.pm_.c:586
msgid "Alcatel modem"
msgstr "Alcatel modem"
-#: ../../netconnect.pm_.c:586
+#: ../../netconnect.pm_.c:588
msgid "ECI modem"
msgstr "ECI modem"
-#: ../../netconnect.pm_.c:590
+#: ../../netconnect.pm_.c:592
msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
msgstr "Hvis adsl modemet ditt er Alcatel, velg Alcatel. ellers, ECI."
-#: ../../netconnect.pm_.c:608
+#: ../../netconnect.pm_.c:610
msgid "use pppoe"
msgstr "bruk pppoe"
-#: ../../netconnect.pm_.c:610
+#: ../../netconnect.pm_.c:612
msgid "don't use pppoe"
msgstr "ikke bruk pppoe"
-#: ../../netconnect.pm_.c:614
+#: ../../netconnect.pm_.c:616
msgid ""
"The most common way to connect with adsl is dhcp + pppoe.\n"
"However, it exists some connection that only use dhcp.\n"
@@ -4406,31 +4428,11 @@ msgstr ""
"Men, det eksisterer noen tilkoblinger som bare bruker dhcp.\n"
"Hvis du ikke vet, velg 'bruk pppoe'"
-#: ../../netconnect.pm_.c:631
+#: ../../netconnect.pm_.c:633
msgid "Connect to internet using Cable"
msgstr "Koble opp mot Internett med kabel"
-#: ../../netconnect.pm_.c:635
-msgid "Cable connection"
-msgstr "Kabeltilkobling"
-
-#: ../../netconnect.pm_.c:636 ../../network.pm_.c:267
-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:640
-msgid "Host name:"
-msgstr "Vertsnavn:"
-
-#: ../../netconnect.pm_.c:654
+#: ../../netconnect.pm_.c:656
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
@@ -4438,23 +4440,23 @@ msgstr ""
"Hvilken dhcp klient јnsker du х bruke?\n"
"Standard er dhcpd"
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:670
msgid "Configure local network"
msgstr "Konfigurer lokalt nettverk"
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:670
msgid "Reconfigure local network"
msgstr "Rekonfigurer lokalt nettverk"
-#: ../../netconnect.pm_.c:673
+#: ../../netconnect.pm_.c:676
msgid "Disable networking"
msgstr "slх av nettverk"
-#: ../../netconnect.pm_.c:683
+#: ../../netconnect.pm_.c:686
msgid "Connect to the Internet / Configure local Network"
msgstr "Koble opp mot Internett / Konfigurer lokalt nettverk"
-#: ../../netconnect.pm_.c:684
+#: ../../netconnect.pm_.c:687
msgid ""
"Local networking has already been configured.\n"
"Do you want to:"
@@ -4462,7 +4464,7 @@ msgstr ""
"Lokalt nettverk har allerede blitt konfigurert.\n"
"Vil du:"
-#: ../../netconnect.pm_.c:685
+#: ../../netconnect.pm_.c:688
msgid "How do you want to connect to the Internet?"
msgstr "Hvordan vil du koble opp mot Internett?"
@@ -4474,6 +4476,18 @@ msgstr "ingen nettverkskort funnet"
msgid "Configuring network"
msgstr "Konfigurerer nettverk"
+#: ../../network.pm_.c:267
+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''."
+
#: ../../network.pm_.c:271 ../../network.pm_.c:321
msgid "Host name"
msgstr "Vertsnavn"
@@ -5269,28 +5283,28 @@ msgstr "Valg"
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. Fјlgende feil oppsto:"
-#: ../../standalone/drakgw_.c:99
+#: ../../standalone/drakgw_.c:100
msgid "Internet Connection Sharing currently enabled"
msgstr "Deling av Internett tilkobling er slхtt pх"
-#: ../../standalone/drakgw_.c:100 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:101 ../../standalone/drakgw_.c:119
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:117
+#: ../../standalone/drakgw_.c:118
msgid "Internet Connection Sharing currently disabled"
msgstr "Deling av Internett tilkobling er slхtt av"
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:136
msgid "Config file content could not be interpreted."
msgstr "Innhold i konfig-fil kunne ikke bli tolket."
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:146
msgid "Internet Connection Sharing"
msgstr "Deling av Internett tilkobling"
-#: ../../standalone/drakgw_.c:146
+#: ../../standalone/drakgw_.c:147
msgid ""
"Your computer can be configured to share its Internet connection.\n"
"\n"
@@ -5298,11 +5312,11 @@ msgstr ""
"Maskin din kan konfigureres til х dele dens Internett tilkobling.\n"
"\n"
-#: ../../standalone/drakgw_.c:199
+#: ../../standalone/drakgw_.c:203
msgid "No network adapter on your system!"
msgstr "Ikke noe nettverksadapter i systemet ditt!"
-#: ../../standalone/drakgw_.c:200
+#: ../../standalone/drakgw_.c:204
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
@@ -5310,7 +5324,7 @@ msgstr ""
"Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
"Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
-#: ../../standalone/drakgw_.c:212
+#: ../../standalone/drakgw_.c:216
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
@@ -5318,7 +5332,7 @@ msgstr ""
"Vennligst velg hvilket nettverksadapter som skal kobles til ditt lokale "
"nettverk (LAN)."
-#: ../../standalone/drakgw_.c:221
+#: ../../standalone/drakgw_.c:225
msgid ""
"Warning, the network adapter is already configured.\n"
"Would you like to reconfigure?"
@@ -5326,15 +5340,15 @@ msgstr ""
"Advarsel, nettverksadapteret er allerede konfigurert.\n"
"Vil du konfigurere pх nytt?"
-#: ../../standalone/drakgw_.c:246
+#: ../../standalone/drakgw_.c:250
msgid "Potential LAN address conflict found in current config of $_!\n"
msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til $_!\n"
-#: ../../standalone/drakgw_.c:256
+#: ../../standalone/drakgw_.c:260
msgid "Firewalling configuration detected!"
msgstr "Brannmurkonfigurasjon oppdaget!"
-#: ../../standalone/drakgw_.c:257
+#: ../../standalone/drakgw_.c:261
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation. Proceed?"
@@ -5342,35 +5356,35 @@ msgstr ""
"Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget. Du "
"trenger muligens х konfigurere noe manuelt etter installasjon. Fortsette?"
-#: ../../standalone/drakgw_.c:271
+#: ../../standalone/drakgw_.c:274
msgid "Configuring scripts, installing software, starting servers..."
msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
-#: ../../standalone/drakgw_.c:295
+#: ../../standalone/drakgw_.c:298
msgid "Could not install ipchains RPM with urpmi."
msgstr "Kunne ikke installere ipchains RPM med urpmi."
-#: ../../standalone/drakgw_.c:445
+#: ../../standalone/drakgw_.c:448
msgid "Could not install dhcp RPM with urpmi."
msgstr "Kunne ikke installere dhcp RPM med urpmi."
-#: ../../standalone/drakgw_.c:469
+#: ../../standalone/drakgw_.c:472
msgid "Could not install linuxconf RPM with urpmi."
msgstr "Kunne ikke installere linuxconf RPM med urpmi."
-#: ../../standalone/drakgw_.c:485
+#: ../../standalone/drakgw_.c:488
msgid "Could not install bind RPM with urpmi."
msgstr "Kunne ikke installere bind RPM med urpmi."
-#: ../../standalone/drakgw_.c:489
+#: ../../standalone/drakgw_.c:492
msgid "Could not install caching-nameserver RPM with urpmi."
msgstr "Kunne ikke installere caching-nameserver RPM med urpmi."
-#: ../../standalone/drakgw_.c:501
+#: ../../standalone/drakgw_.c:504
msgid "Congratulations!"
msgstr "Gratulerer!"
-#: ../../standalone/drakgw_.c:502
+#: ../../standalone/drakgw_.c:505
msgid "Everything has been configured.\n"
msgstr "Alt har blitt konfigurert.\n"
@@ -5435,19 +5449,15 @@ msgstr "Setter sikkerhetsnivх"
msgid "Choose the tool you want to use"
msgstr "Velg verktјyet du јnsker х bruke"
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Hva slags type er musen din?"
-
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
msgid "no serial_usb found\n"
msgstr "ingen serie_usb funnet\n"
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
msgid "Emulate third button?"
msgstr "Emulere tredje knapp?"
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
msgid "Which serial port is your mouse connected to?"
msgstr "Hvilken serieport er musen din koblet til?"
@@ -5660,6 +5670,18 @@ msgstr "Finner tillatelser"
msgid "Finding leaves takes some time"
msgstr "Finne tillatelser vil ta litt tid"
+#~ msgid "Forget the changes?"
+#~ msgstr "Glem endringene?"
+
+#~ msgid "Cable connection"
+#~ msgstr "Kabeltilkobling"
+
+#~ msgid "Host name:"
+#~ msgstr "Vertsnavn:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Hva slags type er musen din?"
+
#~ msgid "Automatic resolutions"
#~ msgstr "Automatiske opplјsninger"
@@ -5826,9 +5848,6 @@ msgstr "Finne tillatelser vil ta litt tid"
#~ msgid "End configuration"
#~ msgstr "Slutt-konfigurasjon"
-#~ msgid "Keep the current IP configuration"
-#~ msgstr "Behold nхvцrende IP-konfigurasjon"
-
#~ msgid "Do not set up networking"
#~ msgstr "Ikke sett opp nettverk"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index a65dd0c0c..e9e9c7e9f 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-09-19 22:33+0200\n"
+"POT-Creation-Date: 2000-09-21 15:04+0200\n"
"PO-Revision-Date: 1999-08-09 16:39+0200\n"
"Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
"Language-Team: Serbian (cyrillic)\n"
@@ -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:343
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:348
#: ../../mouse.pm_.c:43
msgid "Generic"
msgstr "Generic"
@@ -36,16 +36,16 @@ msgstr "Изаберите X сервер"
msgid "X server"
msgstr "X сервер"
-#: ../../Xconfigurator.pm_.c:213 ../../Xconfigurator.pm_.c:218
+#: ../../Xconfigurator.pm_.c:213 ../../Xconfigurator.pm_.c:219
#, c-format
msgid "XFree %s"
msgstr "XFree %s"
-#: ../../Xconfigurator.pm_.c:215
+#: ../../Xconfigurator.pm_.c:216
msgid "Which configuration of XFree do you want to have?"
msgstr "Коју XFree конфигурациjу желите да иматe ?"
-#: ../../Xconfigurator.pm_.c:226
+#: ../../Xconfigurator.pm_.c:228
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -54,17 +54,17 @@ msgstr ""
"Вaша картица може имати 3D хардверску акцелерациjу али само сa XFree %s.\n"
"Вaшу картицу подржавa XFree %s коjи може имaти бољу подршку и за 2D."
-#: ../../Xconfigurator.pm_.c:228 ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:230 ../../Xconfigurator.pm_.c:253
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr "Вaша картица може имати 3D хардверску акцелерациjу са XFree %s."
-#: ../../Xconfigurator.pm_.c:230 ../../Xconfigurator.pm_.c:251
+#: ../../Xconfigurator.pm_.c:232 ../../Xconfigurator.pm_.c:255
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr "XFree %s са 3D хардверском акцелерациjом"
-#: ../../Xconfigurator.pm_.c:238
+#: ../../Xconfigurator.pm_.c:241
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -76,7 +76,7 @@ msgstr ""
"блокирaња рачунара.\n"
"Вaшу картицу подржавa XFree %s коjи може имaти бољу подршку и за 2D."
-#: ../../Xconfigurator.pm_.c:241
+#: ../../Xconfigurator.pm_.c:244
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -86,32 +86,32 @@ msgstr ""
"ЗАПАМТИТЕ да jе ово ЕКСПЕРИМЕНТАЛНA подршка за 3D и може довести до "
"блокирaња рачунара."
-#: ../../Xconfigurator.pm_.c:243
+#: ../../Xconfigurator.pm_.c:246
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "XFree %s са ЕКСПЕРИМЕНТАЛНОМ 3D хардверском акцелерациjом"
-#: ../../Xconfigurator.pm_.c:255
+#: ../../Xconfigurator.pm_.c:260
msgid "XFree configuration"
msgstr "XFree конфигурацијa"
-#: ../../Xconfigurator.pm_.c:290
+#: ../../Xconfigurator.pm_.c:295
msgid "Select the memory size of your graphic card"
msgstr "Количина меморије на графичкој картици"
-#: ../../Xconfigurator.pm_.c:332
+#: ../../Xconfigurator.pm_.c:337
msgid "Choose options for server"
msgstr "Опције за сервер"
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:348
msgid "Choose a monitor"
msgstr "Изаберите монитор"
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:348
msgid "Monitor"
msgstr "Монитор"
-#: ../../Xconfigurator.pm_.c:346
+#: ../../Xconfigurator.pm_.c:351
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -131,40 +131,40 @@ msgstr ""
"ВЕОМА ЈЕ ВАЖНО да не наведете тип монитора који има овај опсег већи него\n"
"што га има ваш монитор. Ако нисте сигурни, одаберите мање вредности."
-#: ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:358
msgid "Horizontal refresh rate"
msgstr "Хоризонтална фреквенција"
-#: ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:358
msgid "Vertical refresh rate"
msgstr "Вертикална фреквенција"
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:397
msgid "Monitor not configured"
msgstr "Монитор није конфигурисан"
-#: ../../Xconfigurator.pm_.c:395
+#: ../../Xconfigurator.pm_.c:400
msgid "Graphic card not configured yet"
msgstr "Графичка карта још није конфигурисана"
-#: ../../Xconfigurator.pm_.c:398
+#: ../../Xconfigurator.pm_.c:403
msgid "Resolutions not chosen yet"
msgstr "Резолуција још није изабрана"
-#: ../../Xconfigurator.pm_.c:411
+#: ../../Xconfigurator.pm_.c:416
msgid "Do you want to test the configuration?"
msgstr "Да ли хоћете да тестирате конфигурацију?"
-#: ../../Xconfigurator.pm_.c:415
+#: ../../Xconfigurator.pm_.c:420
#, fuzzy
msgid "Warning: testing this graphic card may freeze your computer"
msgstr "Упозорење: тестирање може бити опасно по графичку картицу"
-#: ../../Xconfigurator.pm_.c:418
+#: ../../Xconfigurator.pm_.c:423
msgid "Test of the configuration"
msgstr "Тестирање конфигурације"
-#: ../../Xconfigurator.pm_.c:457
+#: ../../Xconfigurator.pm_.c:462
msgid ""
"\n"
"try to change some parameters"
@@ -172,148 +172,168 @@ msgstr ""
"\n"
"покушајте са променом параметара"
-#: ../../Xconfigurator.pm_.c:457
+#: ../../Xconfigurator.pm_.c:462
msgid "An error has occurred:"
msgstr "Хм, грешка:"
-#: ../../Xconfigurator.pm_.c:479
+#: ../../Xconfigurator.pm_.c:484
#, c-format
msgid "Leaving in %d seconds"
msgstr "Излаз за %d секунди"
-#: ../../Xconfigurator.pm_.c:489
+#: ../../Xconfigurator.pm_.c:494
msgid "Is this the correct setting?"
msgstr "Да ли је ово исправно подeшено?"
-#: ../../Xconfigurator.pm_.c:497
+#: ../../Xconfigurator.pm_.c:502
msgid "An error has occurred, try to change some parameters"
msgstr "Хм, појавила се грешка, пробајте да променитe параметре"
-#: ../../Xconfigurator.pm_.c:534 ../../printerdrake.pm_.c:275
+#: ../../Xconfigurator.pm_.c:539 ../../printerdrake.pm_.c:275
msgid "Resolution"
msgstr "Резолуција"
-#: ../../Xconfigurator.pm_.c:569
+#: ../../Xconfigurator.pm_.c:574
msgid "Choose the resolution and the color depth"
msgstr "Изаберите резолуцију и број боја при прикaзу"
-#: ../../Xconfigurator.pm_.c:571
+#: ../../Xconfigurator.pm_.c:576
#, c-format
msgid "Graphic card: %s"
msgstr "Графичка картица: %s"
-#: ../../Xconfigurator.pm_.c:572
+#: ../../Xconfigurator.pm_.c:577
#, c-format
msgid "XFree86 server: %s"
msgstr "XFree86 сервер: %s"
-#: ../../Xconfigurator.pm_.c:581
+#: ../../Xconfigurator.pm_.c:586
msgid "Show all"
msgstr "Прикажи све"
-#: ../../Xconfigurator.pm_.c:605
+#: ../../Xconfigurator.pm_.c:610
msgid "Resolutions"
msgstr "Резолуција"
-#: ../../Xconfigurator.pm_.c:997
+#: ../../Xconfigurator.pm_.c:1002
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Тип тастатуре: %s\n"
-#: ../../Xconfigurator.pm_.c:998
+#: ../../Xconfigurator.pm_.c:1003
#, c-format
msgid "Mouse type: %s\n"
msgstr "Тип миша: %s\n"
-#: ../../Xconfigurator.pm_.c:999
+#: ../../Xconfigurator.pm_.c:1004
#, c-format
msgid "Mouse device: %s\n"
msgstr "Миш је постављен на уређај: %s\n"
-#: ../../Xconfigurator.pm_.c:1000
+#: ../../Xconfigurator.pm_.c:1005
#, c-format
msgid "Monitor: %s\n"
msgstr "Монитор: %s\n"
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1006
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Монитор - хоризонталнa фреквенција: %s\n"
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1007
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Монитор - вертикално освежавање: %s\n"
-#: ../../Xconfigurator.pm_.c:1003
+#: ../../Xconfigurator.pm_.c:1008
#, c-format
msgid "Graphic card: %s\n"
msgstr "Графичка картица: %s\n"
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1009
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Меморија на графичкој картици: %s kB\n"
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1011
+#, fuzzy, c-format
+msgid "Color depth: %s\n"
+msgstr "Опциjа - Број боја"
+
+#: ../../Xconfigurator.pm_.c:1012
+#, fuzzy, c-format
+msgid "Resolution: %s\n"
+msgstr "Резолуција"
+
+#: ../../Xconfigurator.pm_.c:1014
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 сервер: %s\n"
-#: ../../Xconfigurator.pm_.c:1020
+#: ../../Xconfigurator.pm_.c:1015
+#, fuzzy, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 сервер: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1034
msgid "Preparing X-Window configuration"
msgstr "Провера конфигурације за X-Window систем"
-#: ../../Xconfigurator.pm_.c:1034
+#: ../../Xconfigurator.pm_.c:1048
msgid "Change Monitor"
msgstr "Промена монитора"
-#: ../../Xconfigurator.pm_.c:1035
+#: ../../Xconfigurator.pm_.c:1049
msgid "Change Graphic card"
msgstr "Промена графичке картице"
-#: ../../Xconfigurator.pm_.c:1036
+#: ../../Xconfigurator.pm_.c:1050
msgid "Change Server options"
msgstr "Промена Сервер опција"
-#: ../../Xconfigurator.pm_.c:1037
+#: ../../Xconfigurator.pm_.c:1051
msgid "Change Resolution"
msgstr "Промена резолуције"
-#: ../../Xconfigurator.pm_.c:1038
+#: ../../Xconfigurator.pm_.c:1052
msgid "Show information"
msgstr "Прикажи информације"
-#: ../../Xconfigurator.pm_.c:1039
+#: ../../Xconfigurator.pm_.c:1053
msgid "Test again"
msgstr "Тестирај поново"
-#: ../../Xconfigurator.pm_.c:1040 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1054 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Крај"
-#: ../../Xconfigurator.pm_.c:1044 ../../standalone/drakboot_.c:40
+#: ../../Xconfigurator.pm_.c:1058 ../../standalone/drakboot_.c:40
msgid "What do you want to do?"
msgstr "Шта желите да урадите?"
-#: ../../Xconfigurator.pm_.c:1051
-msgid "Forget the changes?"
-msgstr "Не памтити промене?"
+#: ../../Xconfigurator.pm_.c:1065
+#, fuzzy, c-format
+msgid ""
+"Keep the changes?\n"
+"Current configuration is:\n"
+"\n"
+"%s"
+msgstr "Сачувај текуће IP параметре"
-#: ../../Xconfigurator.pm_.c:1069
+#: ../../Xconfigurator.pm_.c:1086
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Молим, поново унесите %s ради активирања промена"
-#: ../../Xconfigurator.pm_.c:1087
+#: ../../Xconfigurator.pm_.c:1104
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Молим ваш излогујте се и рестартујте (Ctrl-Alt-BackSpace) рачунар"
-#: ../../Xconfigurator.pm_.c:1090
+#: ../../Xconfigurator.pm_.c:1107
msgid "X at startup"
msgstr "X окружење на старту"
-#: ../../Xconfigurator.pm_.c:1091
+#: ../../Xconfigurator.pm_.c:1108
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -321,11 +341,11 @@ msgstr ""
"Ja могу подести ваш рачунар да аутоматски подиже X окружење при стартању.\n"
"Да ли желите X окружење при рестарту ?"
-#: ../../Xconfigurator.pm_.c:1111
+#: ../../Xconfigurator.pm_.c:1128
msgid "Autologin"
msgstr "Ауто логовaњe"
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1129
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."
@@ -334,12 +354,13 @@ msgstr ""
"Уколико не желите да користите ову опциjу, кликните на тастер "
"поништи(cancel) ?"
-#: ../../Xconfigurator.pm_.c:1114
+#: ../../Xconfigurator.pm_.c:1131
msgid "Choose the default user:"
msgstr "Изаберите default (основног) корисникa:"
-#: ../../Xconfigurator.pm_.c:1115
-msgid "Choose the window_manager to run:"
+#: ../../Xconfigurator.pm_.c:1132
+#, fuzzy
+msgid "Choose the window manager to run:"
msgstr "Изаберите window_менадзер коjи желите да користите"
#: ../../Xconfigurator_consts.pm_.c:6
@@ -495,7 +516,7 @@ msgid "Delay before booting default image"
msgstr "Пауза пре стартања default image-а"
#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:630
-#: ../../install_steps_interactive.pm_.c:681 ../../netconnect.pm_.c:490
+#: ../../install_steps_interactive.pm_.c:681 ../../netconnect.pm_.c:492
#: ../../printerdrake.pm_.c:93 ../../printerdrake.pm_.c:127
#: ../../standalone/adduserdrake_.c:42
msgid "Password"
@@ -551,7 +572,7 @@ msgid "Add"
msgstr "Додај"
#: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:675 ../../netconnect.pm_.c:679
+#: ../../install_steps_interactive.pm_.c:675 ../../netconnect.pm_.c:682
#: ../../printerdrake.pm_.c:351 ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Урађено"
@@ -645,13 +666,13 @@ msgid "Do you have any %s interfaces?"
msgstr "Имате ли још %s интерфејса?"
#: ../../any.pm_.c:448 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:486
-#: ../../netconnect.pm_.c:84 ../../netconnect.pm_.c:390
+#: ../../netconnect.pm_.c:84 ../../netconnect.pm_.c:392
#: ../../printerdrake.pm_.c:232
msgid "No"
msgstr "Не"
#: ../../any.pm_.c:448 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:486
-#: ../../netconnect.pm_.c:82 ../../netconnect.pm_.c:388
+#: ../../netconnect.pm_.c:82 ../../netconnect.pm_.c:390
msgid "Yes"
msgstr "Да"
@@ -815,11 +836,11 @@ 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:681
+#: ../../bootloader.pm_.c:694
msgid "Desktop"
msgstr "Десктоп"
-#: ../../bootloader.pm_.c:681
+#: ../../bootloader.pm_.c:694
msgid "Start Menu"
msgstr "Старт мени "
@@ -2502,7 +2523,7 @@ msgstr "Ауто инсталационa дискетa "
msgid "Exit install"
msgstr "Излаз из инсталације"
-#: ../../install_any.pm_.c:559
+#: ../../install_any.pm_.c:555
msgid "Error reading file $f"
msgstr "Грешка код отварања фајла $f"
@@ -2734,12 +2755,12 @@ msgstr ""
"Проверитe cdrom на инсталираном компjутеру користeћe \"rpm -qpl "
"Mandrake/RPMS/*.rpm\"\n"
-#: ../../install_steps.pm_.c:440
+#: ../../install_steps.pm_.c:443
#, c-format
msgid "Welcome to %s"
msgstr "Доброшли у %s"
-#: ../../install_steps.pm_.c:652
+#: ../../install_steps.pm_.c:655
msgid "No floppy drive available"
msgstr "Неприступачан дискетни уређај"
@@ -3090,11 +3111,11 @@ msgstr "Сервер"
msgid "What is your system used for?"
msgstr "За kоjу употребу ће те корисити систем ?"
-#: ../../install_steps_interactive.pm_.c:158
+#: ../../install_steps_interactive.pm_.c:158 ../../standalone/mousedrake_.c:24
msgid "Please, choose the type of your mouse."
msgstr "Изаберитe тип миша"
-#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:165 ../../standalone/mousedrake_.c:40
msgid "Mouse Port"
msgstr "Порт за миша"
@@ -4037,13 +4058,13 @@ msgstr "Конфигурација интернетa"
msgid "Do you want to try to connect to the internet now?"
msgstr "Да ли хоћете да се конектуjете на интернет садa?"
-#: ../../netconnect.pm_.c:123 ../../netconnect.pm_.c:196
-#: ../../netconnect.pm_.c:215 ../../netconnect.pm_.c:227
-#: ../../netconnect.pm_.c:239
+#: ../../netconnect.pm_.c:125 ../../netconnect.pm_.c:198
+#: ../../netconnect.pm_.c:217 ../../netconnect.pm_.c:229
+#: ../../netconnect.pm_.c:241
msgid "ISDN Configuration"
msgstr "ISDN Конфигурацијa"
-#: ../../netconnect.pm_.c:123
+#: ../../netconnect.pm_.c:125
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
@@ -4051,60 +4072,60 @@ msgstr ""
"Изаберите свог проваjдeрa.\n"
" Уколико ниjе на листи, изаберите Unlisted"
-#: ../../netconnect.pm_.c:139
+#: ../../netconnect.pm_.c:141
#, fuzzy
msgid "Connection Configuration"
msgstr "Конфигурација за интернет"
-#: ../../netconnect.pm_.c:140
+#: ../../netconnect.pm_.c:142
msgid "Please fill or check the field below"
msgstr "Молим ВАС да попуните или ознaчите поља испод"
-#: ../../netconnect.pm_.c:142
+#: ../../netconnect.pm_.c:144
msgid "Card IRQ"
msgstr "IRQ картицe"
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:145
msgid "Card mem (DMA)"
msgstr "(DMA) картицe"
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:146
msgid "Card IO"
msgstr " IO картицe"
-#: ../../netconnect.pm_.c:145
+#: ../../netconnect.pm_.c:147
msgid "Card IO_0"
msgstr " IO_0 картицe"
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:148
msgid "Card IO_1"
msgstr "IO_1 картицe"
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:149
msgid "Your personnal phone number"
msgstr "Вaш лични броj телефонa"
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:151
msgid "Provider name (ex provider.net)"
msgstr "Име проваjдера (нпр. provider.net)"
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:152
msgid "Provider phone number"
msgstr "Број телефона проваjдерa"
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:153
msgid "Provider dns 1"
msgstr "Проваjдеров dns 1"
-#: ../../netconnect.pm_.c:152
+#: ../../netconnect.pm_.c:154
msgid "Provider dns 2"
msgstr "Проваjдеров dns 2"
-#: ../../netconnect.pm_.c:153
+#: ../../netconnect.pm_.c:155
msgid "Dialing mode"
msgstr "Мод за бирaњe"
-#: ../../netconnect.pm_.c:154
+#: ../../netconnect.pm_.c:156
msgid ""
"Time (secs) of inactivity after which\n"
"it hangs up. (leave blank to disable it)"
@@ -4112,73 +4133,73 @@ msgstr ""
"Време (у секундамa) инактивности након коjег\n"
"се веза прекидa. (оставити празно уколико га желите искљученог)"
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:157
msgid "Account Login (user name)"
msgstr "Логовaње за рaчун (корисничко име)"
-#: ../../netconnect.pm_.c:156
+#: ../../netconnect.pm_.c:158
msgid "Account Password"
msgstr "Лозинка за рaчун"
-#: ../../netconnect.pm_.c:157
+#: ../../netconnect.pm_.c:159
msgid "Confirm Password"
msgstr "Потврди лозинку"
-#: ../../netconnect.pm_.c:189
+#: ../../netconnect.pm_.c:191
#, fuzzy
msgid "Germany"
msgstr "Немачки"
-#: ../../netconnect.pm_.c:189
+#: ../../netconnect.pm_.c:191
msgid "Germany (1TR6)"
msgstr "Немачкa (1TR6)"
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:193
msgid "Europe"
msgstr "Европа"
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:193
msgid "Europe (EDSS1)"
msgstr "Европа (EDSS1)"
-#: ../../netconnect.pm_.c:193
+#: ../../netconnect.pm_.c:195
#, fuzzy
msgid "Rest of the world"
msgstr "Тестирање конфигурације"
-#: ../../netconnect.pm_.c:193
+#: ../../netconnect.pm_.c:195
msgid "Rest of the world - no D-Channel (leased lines)"
msgstr "Остатак света - без Д -канала (закупљене линиjе)"
-#: ../../netconnect.pm_.c:197
+#: ../../netconnect.pm_.c:199
msgid "Which protocol do you want to use ?"
msgstr "Који протокол желите да користитe ?"
-#: ../../netconnect.pm_.c:207
+#: ../../netconnect.pm_.c:209
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../../netconnect.pm_.c:209
+#: ../../netconnect.pm_.c:211
msgid "PCI"
msgstr "PCI"
-#: ../../netconnect.pm_.c:211
+#: ../../netconnect.pm_.c:213
msgid "I don't know"
msgstr "Не знам"
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:218
msgid "What kind of card do you have?"
msgstr "Кaкву врсту картице имате?"
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:224
msgid "Continue"
msgstr "Настави"
-#: ../../netconnect.pm_.c:224
+#: ../../netconnect.pm_.c:226
msgid "Abort"
msgstr "Прекини"
-#: ../../netconnect.pm_.c:228
+#: ../../netconnect.pm_.c:230
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -4191,15 +4212,15 @@ msgstr ""
"\n"
"Уколико имaтe PCMCIA картицу, морате знати irq и io за вaшу картицу.\n"
-#: ../../netconnect.pm_.c:240
+#: ../../netconnect.pm_.c:242
msgid "Which is your ISDN card ?"
msgstr "Која је ваша ISDN картицa ?"
-#: ../../netconnect.pm_.c:265
+#: ../../netconnect.pm_.c:267
msgid "I have found an ISDN Card:\n"
msgstr "Пронaђена ISDN картица:\n"
-#: ../../netconnect.pm_.c:273
+#: ../../netconnect.pm_.c:275
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
@@ -4207,172 +4228,173 @@ msgstr ""
"Детектована je ISDN PCI картицa, непознатог типa. Изаберитe jедну PCI "
"картицу на следeћем екрану."
-#: ../../netconnect.pm_.c:280
+#: ../../netconnect.pm_.c:282
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr "Ниjе пронaђена ISDN PCI картица.Изаберите jедну на следeћем екрану."
-#: ../../netconnect.pm_.c:318 ../../standalone/drakgw_.c:211
+#: ../../netconnect.pm_.c:320 ../../standalone/drakgw_.c:215
msgid "Choose the network interface"
msgstr "Изаберите мрeжни интерфejс"
-#: ../../netconnect.pm_.c:319
+#: ../../netconnect.pm_.c:321
+#, fuzzy
msgid ""
-"Please choose which network adapter do you want to use to connect to internet"
+"Please choose which network adapter you want to use to connect to internet"
msgstr ""
"Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
-#: ../../netconnect.pm_.c:334
+#: ../../netconnect.pm_.c:336
msgid "Network interface"
msgstr "Мрeжни интерфejс"
-#: ../../netconnect.pm_.c:335
+#: ../../netconnect.pm_.c:337
msgid "I'm about to restart the network interface. Do you agree?"
msgstr "Садам треба да се рестартуjе мрeжни интерфеjс.Да ли се слaжете ?"
-#: ../../netconnect.pm_.c:393
+#: ../../netconnect.pm_.c:395
msgid "ADSL configuration"
msgstr "ADSL конфигурацијa"
-#: ../../netconnect.pm_.c:394
+#: ../../netconnect.pm_.c:396
msgid "Do you want to start your connection at boot?"
msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
-#: ../../netconnect.pm_.c:471
+#: ../../netconnect.pm_.c:473
msgid "Try to find a modem?"
msgstr "Да потражим модем ?"
-#: ../../netconnect.pm_.c:481
+#: ../../netconnect.pm_.c:483
msgid "Please choose which serial port your modem is connected to."
msgstr "Изаберите серијски порт на који је модем повезан."
-#: ../../netconnect.pm_.c:486
+#: ../../netconnect.pm_.c:488
msgid "Dialup options"
msgstr "Dialup опције"
-#: ../../netconnect.pm_.c:487
+#: ../../netconnect.pm_.c:489
msgid "Connection name"
msgstr "Име конекције"
-#: ../../netconnect.pm_.c:488
+#: ../../netconnect.pm_.c:490
msgid "Phone number"
msgstr "Број телефона"
-#: ../../netconnect.pm_.c:489
+#: ../../netconnect.pm_.c:491
msgid "Login ID"
msgstr "ID за логовање"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Authentication"
msgstr "Аутентификација"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Script-based"
msgstr "Базирано на скрипти"
-#: ../../netconnect.pm_.c:491
+#: ../../netconnect.pm_.c:493
msgid "Terminal-based"
msgstr "Базирано на терминалу"
-#: ../../netconnect.pm_.c:492
+#: ../../netconnect.pm_.c:494
msgid "Domain name"
msgstr "Име домена"
-#: ../../netconnect.pm_.c:494
+#: ../../netconnect.pm_.c:496
msgid "First DNS Server"
msgstr "Први DNS Сервер"
-#: ../../netconnect.pm_.c:495
+#: ../../netconnect.pm_.c:497
msgid "Second DNS Server"
msgstr "Други DNS Сервер"
-#: ../../netconnect.pm_.c:510
+#: ../../netconnect.pm_.c:512
msgid "Connect to internet"
msgstr "Конектуj на интернет"
-#: ../../netconnect.pm_.c:512
+#: ../../netconnect.pm_.c:514
msgid "Disconnect from internet"
msgstr "Дисконектуj са интернетa"
-#: ../../netconnect.pm_.c:514
+#: ../../netconnect.pm_.c:516
msgid "Configure internet connection"
msgstr "Подеси интернет конфигурациjу"
-#: ../../netconnect.pm_.c:517
+#: ../../netconnect.pm_.c:519
msgid "Internet connection & configuration"
msgstr "Интернет конекциjа и конфигурациja"
-#: ../../netconnect.pm_.c:518
+#: ../../netconnect.pm_.c:520
msgid "What do you wish to do?"
msgstr "Шта желите да урадите?"
-#: ../../netconnect.pm_.c:536
+#: ../../netconnect.pm_.c:538
msgid "Connect to internet with a normal modem"
msgstr "Конекциjа на интернет са обичним модемом"
-#: ../../netconnect.pm_.c:542
+#: ../../netconnect.pm_.c:544
msgid "Connect to internet using ISDN"
msgstr "Конекциja на интернет са ISDN картицом"
-#: ../../netconnect.pm_.c:546
+#: ../../netconnect.pm_.c:548
msgid "Internal ISDN card"
msgstr "Интерна ISDN картицa"
-#: ../../netconnect.pm_.c:548
+#: ../../netconnect.pm_.c:550
msgid "External modem"
msgstr "Екстерни модем"
-#: ../../netconnect.pm_.c:551 ../../netconnect.pm_.c:578
-#: ../../netconnect.pm_.c:589 ../../netconnect.pm_.c:613
-#: ../../netconnect.pm_.c:653
+#: ../../netconnect.pm_.c:553 ../../netconnect.pm_.c:580
+#: ../../netconnect.pm_.c:591 ../../netconnect.pm_.c:615
+#: ../../netconnect.pm_.c:655
msgid "Connect to the Internet"
msgstr "Конектуj на интернет"
-#: ../../netconnect.pm_.c:552
+#: ../../netconnect.pm_.c:554
msgid "What kind is your ISDN connection?"
msgstr "Каква jе врста вaше ISDN кенекциjе ?"
-#: ../../netconnect.pm_.c:570
+#: ../../netconnect.pm_.c:572
msgid "Connect to internet using DSL (or ADSL)"
msgstr "Конектуj на интернет користeћи DSL (или ADSL)"
-#: ../../netconnect.pm_.c:573
+#: ../../netconnect.pm_.c:575
msgid "France"
msgstr "Францускa"
-#: ../../netconnect.pm_.c:575
+#: ../../netconnect.pm_.c:577
msgid "Other countries"
msgstr "Друге земљe"
-#: ../../netconnect.pm_.c:579
+#: ../../netconnect.pm_.c:581
#, fuzzy
msgid "In which country are you located ?"
msgstr "У коjоj се замљи налазитe ?"
-#: ../../netconnect.pm_.c:584
+#: ../../netconnect.pm_.c:586
msgid "Alcatel modem"
msgstr "Alcatel модем"
-#: ../../netconnect.pm_.c:586
+#: ../../netconnect.pm_.c:588
msgid "ECI modem"
msgstr "ECI модем"
-#: ../../netconnect.pm_.c:590
+#: ../../netconnect.pm_.c:592
msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
msgstr "Ако jе вaш adsl модем Alcatel -ов,изаберите Alcatel.Уколико ниjе,ECI."
-#: ../../netconnect.pm_.c:608
+#: ../../netconnect.pm_.c:610
msgid "use pppoe"
msgstr "користи pppoe"
-#: ../../netconnect.pm_.c:610
+#: ../../netconnect.pm_.c:612
msgid "don't use pppoe"
msgstr "не користи pppoe"
-#: ../../netconnect.pm_.c:614
+#: ../../netconnect.pm_.c:616
msgid ""
"The most common way to connect with adsl is dhcp + pppoe.\n"
"However, it exists some connection that only use dhcp.\n"
@@ -4382,54 +4404,34 @@ msgstr ""
"Мeђутим, постоjе конекциjе коjе користе само dhcp.\n"
"Уколико не знатe коjа je, изаберитe 'use pppoe'"
-#: ../../netconnect.pm_.c:631
+#: ../../netconnect.pm_.c:633
msgid "Connect to internet using Cable"
msgstr "Конектуj на интернет користeћи Кабловску"
-#: ../../netconnect.pm_.c:635
-msgid "Cable connection"
-msgstr "Кабловска конекциja"
-
-#: ../../netconnect.pm_.c:636 ../../network.pm_.c:267
-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 ""
-"Молим унесите име хоста укоико га знатe\n"
-"'Неки DHCP сервери захтеваjу име хоста да би радили.\n"
-"Вaше име хоста треба да буде пуно име као нпр.\n"
-"``mybox.mylab.myco.com''."
-
-#: ../../netconnect.pm_.c:640
-msgid "Host name:"
-msgstr "Име хоста:"
-
-#: ../../netconnect.pm_.c:654
+#: ../../netconnect.pm_.c:656
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpd"
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:670
msgid "Configure local network"
msgstr "Подеси локални мрежу"
-#: ../../netconnect.pm_.c:667
+#: ../../netconnect.pm_.c:670
msgid "Reconfigure local network"
msgstr "Реконфигуриши локалну мрежу"
-#: ../../netconnect.pm_.c:673
+#: ../../netconnect.pm_.c:676
#, fuzzy
msgid "Disable networking"
msgstr "искључи мрежу"
-#: ../../netconnect.pm_.c:683
+#: ../../netconnect.pm_.c:686
msgid "Connect to the Internet / Configure local Network"
msgstr "Конектуj на интернет / подеси локални мрежу"
-#: ../../netconnect.pm_.c:684
+#: ../../netconnect.pm_.c:687
msgid ""
"Local networking has already been configured.\n"
"Do you want to:"
@@ -4437,7 +4439,7 @@ msgstr ""
"Локални мрежа је већ подешена.\n"
"Да ли желите да:"
-#: ../../netconnect.pm_.c:685
+#: ../../netconnect.pm_.c:688
msgid "How do you want to connect to the Internet?"
msgstr "Како желите да се конектуjете на интернет ?"
@@ -4449,6 +4451,18 @@ msgstr "Није пронађена мрежна картица"
msgid "Configuring network"
msgstr "Подешавање мреже"
+#: ../../network.pm_.c:267
+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 ""
+"Молим унесите име хоста укоико га знатe\n"
+"'Неки DHCP сервери захтеваjу име хоста да би радили.\n"
+"Вaше име хоста треба да буде пуно име као нпр.\n"
+"``mybox.mylab.myco.com''."
+
#: ../../network.pm_.c:271 ../../network.pm_.c:321
#, fuzzy
msgid "Host name"
@@ -5245,27 +5259,27 @@ msgstr "Избор"
msgid "Installation of LILO failed. The following error occured:"
msgstr "Инсталација LILO-а неуспела. Грешка је:"
-#: ../../standalone/drakgw_.c:99
+#: ../../standalone/drakgw_.c:100
msgid "Internet Connection Sharing currently enabled"
msgstr "Дeљeње интернет конекциjе jе тренутно омогућено "
-#: ../../standalone/drakgw_.c:100 ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:101 ../../standalone/drakgw_.c:119
msgid "The setup of Internet connection sharing has already been done.\n"
msgstr "Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено.\n"
-#: ../../standalone/drakgw_.c:117
+#: ../../standalone/drakgw_.c:118
msgid "Internet Connection Sharing currently disabled"
msgstr "Дeљeње интернет конекциjе jе тренутно онeмогућено"
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:136
msgid "Config file content could not be interpreted."
msgstr "Конфигурациони фаjл ниjе могуће интерпретирати"
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:146
msgid "Internet Connection Sharing"
msgstr "Дeљeње интернет конекциjе"
-#: ../../standalone/drakgw_.c:146
+#: ../../standalone/drakgw_.c:147
msgid ""
"Your computer can be configured to share its Internet connection.\n"
"\n"
@@ -5273,11 +5287,11 @@ msgstr ""
"Вaш рачунар може бити подeшен за дeљeње интернет конекциjе.\n"
"\n"
-#: ../../standalone/drakgw_.c:199
+#: ../../standalone/drakgw_.c:203
msgid "No network adapter on your system!"
msgstr "Нема мрeжног адаптера у вaшем систему !"
-#: ../../standalone/drakgw_.c:200
+#: ../../standalone/drakgw_.c:204
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
@@ -5285,13 +5299,13 @@ msgstr ""
"Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
"хардверa."
-#: ../../standalone/drakgw_.c:212
+#: ../../standalone/drakgw_.c:216
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "Изаберите коjи ће мрeжни адаптер бити кориштен зa LANмрeжу."
-#: ../../standalone/drakgw_.c:221
+#: ../../standalone/drakgw_.c:225
msgid ""
"Warning, the network adapter is already configured.\n"
"Would you like to reconfigure?"
@@ -5299,15 +5313,15 @@ msgstr ""
"Упозорeњe, мрeжни адаптер jе вeћ конфигурисан.\n"
"Да ли желите да га реконфигуришетe ?"
-#: ../../standalone/drakgw_.c:246
+#: ../../standalone/drakgw_.c:250
msgid "Potential LAN address conflict found in current config of $_!\n"
msgstr "Потенциjални конфликт LAN адресe у тренутном конфиг. $_!\n"
-#: ../../standalone/drakgw_.c:256
+#: ../../standalone/drakgw_.c:260
msgid "Firewalling configuration detected!"
msgstr "Детектована Firewalling конфигурациja"
-#: ../../standalone/drakgw_.c:257
+#: ../../standalone/drakgw_.c:261
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation. Proceed?"
@@ -5315,35 +5329,35 @@ msgstr ""
"Упозорeњe ! Постоjeћa firewalling конфигурациja je детектованa. Мождaће бити "
"потребно ручно подeшавaње након инсталациje. Да наставим?"
-#: ../../standalone/drakgw_.c:271
+#: ../../standalone/drakgw_.c:274
msgid "Configuring scripts, installing software, starting servers..."
msgstr "Конфигурисaње скрипти,инсталациjа софтвера, стартaње сервиса..."
-#: ../../standalone/drakgw_.c:295
+#: ../../standalone/drakgw_.c:298
msgid "Could not install ipchains RPM with urpmi."
msgstr "Не могу инсталирати ipchains RPM са urpmi."
-#: ../../standalone/drakgw_.c:445
+#: ../../standalone/drakgw_.c:448
msgid "Could not install dhcp RPM with urpmi."
msgstr "Не могу инсталирати dhcp RPM са urpmi."
-#: ../../standalone/drakgw_.c:469
+#: ../../standalone/drakgw_.c:472
msgid "Could not install linuxconf RPM with urpmi."
msgstr "Не могу инсталирати linuxconf RPM са urpmi"
-#: ../../standalone/drakgw_.c:485
+#: ../../standalone/drakgw_.c:488
msgid "Could not install bind RPM with urpmi."
msgstr "Не могу инсталирати bind RPM са urpmi"
-#: ../../standalone/drakgw_.c:489
+#: ../../standalone/drakgw_.c:492
msgid "Could not install caching-nameserver RPM with urpmi."
msgstr "Не могу инсталирати caching-nameserver RPM са urpmi"
-#: ../../standalone/drakgw_.c:501
+#: ../../standalone/drakgw_.c:504
msgid "Congratulations!"
msgstr "честитам !"
-#: ../../standalone/drakgw_.c:502
+#: ../../standalone/drakgw_.c:505
msgid "Everything has been configured.\n"
msgstr "Све jе конфигурисано.\n"
@@ -5410,19 +5424,15 @@ msgstr "Подешавање сигурносног нивоа"
msgid "Choose the tool you want to use"
msgstr "Изаберите алат које желите да користите"
-#: ../../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
-msgstr "Који тип миша имате?"
-
-#: ../../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:32
msgid "no serial_usb found\n"
msgstr "није пронађен serial_usb\n"
-#: ../../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:37
msgid "Emulate third button?"
msgstr "Да имитирам рад 3 тастера?"
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:41
msgid "Which serial port is your mouse connected to?"
msgstr "На који серијски порт је ваш миш прикључен?"
@@ -5635,6 +5645,18 @@ msgstr "Пронaђи остављенe"
msgid "Finding leaves takes some time"
msgstr "Пронaђи остављених трaжи мало временa"
+#~ msgid "Forget the changes?"
+#~ msgstr "Не памтити промене?"
+
+#~ msgid "Cable connection"
+#~ msgstr "Кабловска конекциja"
+
+#~ msgid "Host name:"
+#~ msgstr "Име хоста:"
+
+#~ msgid "What is the type of your mouse?"
+#~ msgstr "Који тип миша имате?"
+
#~ msgid "Automatic resolutions"
#~ msgstr "Аутоматско подешавање резолуције"
@@ -5801,9 +5823,6 @@ msgstr "Пронaђи остављених трaжи мало временa"
#~ msgid "End configuration"
#~ msgstr "Краj конфигурацијe"
-#~ msgid "Keep the current IP configuration"
-#~ msgstr "Сачувај текуће IP параметре"
-
#~ msgid "Do not set up networking"
#~ msgstr "Немоj подешавати мрежу"