summaryrefslogtreecommitdiffstats
path: root/perl-install/share
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2001-07-02 16:04:41 +0000
committerPablo Saratxaga <pablo@mandriva.com>2001-07-02 16:04:41 +0000
commitb58216ed9dff38fa7537768b2e9e22273a21656f (patch)
treef5fc48827202a8ea862a04dc04df48b573e53e69 /perl-install/share
parent931e6730f2a74917e8120760f9fea1f9037c623a (diff)
downloaddrakx-b58216ed9dff38fa7537768b2e9e22273a21656f.tar
drakx-b58216ed9dff38fa7537768b2e9e22273a21656f.tar.gz
drakx-b58216ed9dff38fa7537768b2e9e22273a21656f.tar.bz2
drakx-b58216ed9dff38fa7537768b2e9e22273a21656f.tar.xz
drakx-b58216ed9dff38fa7537768b2e9e22273a21656f.zip
update po files
Diffstat (limited to 'perl-install/share')
-rw-r--r--perl-install/share/po/DrakX.pot345
-rw-r--r--perl-install/share/po/no.po373
-rw-r--r--perl-install/share/po/sp.po373
3 files changed, 621 insertions, 470 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index ed85994e4..8e3e9df43 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: 2001-06-21 23:35+0200\n"
+"POT-Creation-Date: 2001-07-02 16:48+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"
@@ -190,7 +190,6 @@ msgid "An error has occurred, try to change some parameters"
msgstr ""
#: ../../Xconfigurator.pm_.c:690 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
msgid "Resolution"
msgstr ""
@@ -281,43 +280,43 @@ msgstr ""
msgid "XFree86 driver: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1376
+#: ../../Xconfigurator.pm_.c:1375
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1396
+#: ../../Xconfigurator.pm_.c:1395
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1401
+#: ../../Xconfigurator.pm_.c:1400
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1401
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1404
+#: ../../Xconfigurator.pm_.c:1403
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1405
+#: ../../Xconfigurator.pm_.c:1404
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1406
+#: ../../Xconfigurator.pm_.c:1405
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1407
+#: ../../Xconfigurator.pm_.c:1406
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1408 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1407 ../../bootlook.pm_.c:238
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1416
+#: ../../Xconfigurator.pm_.c:1415
#, c-format
msgid ""
"Keep the changes?\n"
@@ -326,20 +325,20 @@ msgid ""
"%s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1437
+#: ../../Xconfigurator.pm_.c:1436
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1457
+#: ../../Xconfigurator.pm_.c:1456
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1460
+#: ../../Xconfigurator.pm_.c:1459
msgid "X at startup"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1461
+#: ../../Xconfigurator.pm_.c:1460
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -530,7 +529,7 @@ msgid "Delay before booting default image"
msgstr ""
#: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:658
#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
#: ../../standalone/draknet_.c:569
msgid "Password"
@@ -866,7 +865,7 @@ msgid "Choose the window manager to run:"
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:619
+#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:622
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -878,48 +877,48 @@ msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:820
+#: ../../bootloader.pm_.c:823
msgid "Welcome to GRUB the operating system chooser!"
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:823
+#: ../../bootloader.pm_.c:826
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:826
+#: ../../bootloader.pm_.c:829
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:829
+#: ../../bootloader.pm_.c:832
msgid "commands before booting, or 'c' for a command-line."
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:832
+#: ../../bootloader.pm_.c:835
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr ""
-#: ../../bootloader.pm_.c:836
+#: ../../bootloader.pm_.c:839
msgid "not enough room in /boot"
msgstr ""
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:929
+#: ../../bootloader.pm_.c:932
msgid "Desktop"
msgstr ""
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:931
+#: ../../bootloader.pm_.c:934
msgid "Start Menu"
msgstr ""
@@ -1082,6 +1081,38 @@ msgstr ""
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
+#: ../../common.pm_.c:635
+msgid "GB"
+msgstr ""
+
+#: ../../common.pm_.c:635
+msgid "KB"
+msgstr ""
+
+#: ../../common.pm_.c:635 ../../diskdrake.pm_.c:660
+#: ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr ""
+
+#: ../../common.pm_.c:643
+msgid "TB"
+msgstr ""
+
+#: ../../common.pm_.c:656
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../common.pm_.c:658
+msgid "1 minute"
+msgstr ""
+
+#: ../../common.pm_.c:660
+#, c-format
+msgid "%d seconds"
+msgstr ""
+
#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
msgid "Create"
msgstr ""
@@ -1592,11 +1623,6 @@ msgstr ""
msgid "Choose the new size"
msgstr ""
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr ""
-
#: ../../diskdrake.pm_.c:714
msgid "Create a new partition"
msgstr ""
@@ -2974,7 +3000,7 @@ msgstr ""
msgid "Exit install"
msgstr ""
-#: ../../install_any.pm_.c:403
+#: ../../install_any.pm_.c:404
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -2989,17 +3015,17 @@ msgid ""
"Do you really want to install these servers?\n"
msgstr ""
-#: ../../install_any.pm_.c:434
+#: ../../install_any.pm_.c:435
msgid "Can't use broadcast with no NIS domain"
msgstr ""
-#: ../../install_any.pm_.c:694
+#: ../../install_any.pm_.c:671
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr ""
-#: ../../install_any.pm_.c:716
+#: ../../install_any.pm_.c:693
msgid "Error reading file $f"
msgstr ""
@@ -4573,148 +4599,176 @@ msgstr ""
msgid "Is this correct?"
msgstr ""
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:845
+#: ../../netconnect.pm_.c:994 ../../netconnect.pm_.c:1004
+#: ../../netconnect.pm_.c:1030
+msgid "Network Configuration Wizard"
+msgstr ""
+
+#: ../../netconnect.pm_.c:79
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The full configuration uses isdn4net. It contains powerfull tools, but is "
+"tricky to configure for a newbie, and not standard.\n"
+"\n"
+"* The light configuration is easier to understand, more standard, but with "
+"less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+"\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:87
+msgid "Full configuration (isdn4net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:87
+msgid "Light configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:179
msgid "Internet configuration"
msgstr ""
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:180
msgid "Do you want to try to connect to the Internet now?"
msgstr ""
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:184
msgid "Testing your connection..."
msgstr ""
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
+#: ../../netconnect.pm_.c:190 ../../standalone/draknet_.c:196
msgid "The system is now connected to Internet."
msgstr ""
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:191
msgid "For Security reason, it will be disconnected now."
msgstr ""
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../netconnect.pm_.c:192 ../../standalone/draknet_.c:196
msgid ""
"The system doesn't seem to be connected to internet.\n"
"Try to reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:907
-#: ../../netconnect.pm_.c:937 ../../netconnect.pm_.c:1015
+#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:937
+#: ../../netconnect.pm_.c:967 ../../netconnect.pm_.c:1056
msgid "Network Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
+#: ../../netconnect.pm_.c:254 ../../netconnect.pm_.c:297
+#: ../../netconnect.pm_.c:307 ../../netconnect.pm_.c:314
+#: ../../netconnect.pm_.c:324
msgid "ISDN Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:254
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
msgstr ""
-#: ../../netconnect.pm_.c:236
+#: ../../netconnect.pm_.c:268
msgid "Connection Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:237
+#: ../../netconnect.pm_.c:269
msgid "Please fill or check the field below"
msgstr ""
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
+#: ../../netconnect.pm_.c:271 ../../standalone/draknet_.c:552
msgid "Card IRQ"
msgstr ""
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
+#: ../../netconnect.pm_.c:272 ../../standalone/draknet_.c:553
msgid "Card mem (DMA)"
msgstr ""
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
+#: ../../netconnect.pm_.c:273 ../../standalone/draknet_.c:554
msgid "Card IO"
msgstr ""
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
+#: ../../netconnect.pm_.c:274 ../../standalone/draknet_.c:555
msgid "Card IO_0"
msgstr ""
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
+#: ../../netconnect.pm_.c:275 ../../standalone/draknet_.c:556
msgid "Card IO_1"
msgstr ""
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
+#: ../../netconnect.pm_.c:276 ../../standalone/draknet_.c:557
msgid "Your personal phone number"
msgstr ""
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
+#: ../../netconnect.pm_.c:277 ../../standalone/draknet_.c:558
msgid "Provider name (ex provider.net)"
msgstr ""
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
+#: ../../netconnect.pm_.c:278 ../../standalone/draknet_.c:559
msgid "Provider phone number"
msgstr ""
-#: ../../netconnect.pm_.c:247
+#: ../../netconnect.pm_.c:279
msgid "Provider dns 1"
msgstr ""
-#: ../../netconnect.pm_.c:248
+#: ../../netconnect.pm_.c:280
msgid "Provider dns 2"
msgstr ""
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
+#: ../../netconnect.pm_.c:281 ../../standalone/draknet_.c:564
msgid "Dialing mode"
msgstr ""
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
+#: ../../netconnect.pm_.c:282 ../../standalone/draknet_.c:562
msgid "Account Login (user name)"
msgstr ""
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
+#: ../../netconnect.pm_.c:283 ../../standalone/draknet_.c:563
msgid "Account Password"
msgstr ""
-#: ../../netconnect.pm_.c:261
+#: ../../netconnect.pm_.c:292
msgid "Europe"
msgstr ""
-#: ../../netconnect.pm_.c:261
+#: ../../netconnect.pm_.c:292
msgid "Europe (EDSS1)"
msgstr ""
-#: ../../netconnect.pm_.c:263
+#: ../../netconnect.pm_.c:294
msgid "Rest of the world"
msgstr ""
-#: ../../netconnect.pm_.c:263
+#: ../../netconnect.pm_.c:294
msgid ""
"Rest of the world \n"
" no D-Channel (leased lines)"
msgstr ""
-#: ../../netconnect.pm_.c:267
+#: ../../netconnect.pm_.c:298
msgid "Which protocol do you want to use ?"
msgstr ""
-#: ../../netconnect.pm_.c:277
+#: ../../netconnect.pm_.c:308
msgid "What kind of card do you have?"
msgstr ""
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "I don't know"
msgstr ""
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "ISA / PCMCIA"
msgstr ""
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "PCI"
msgstr ""
-#: ../../netconnect.pm_.c:284
+#: ../../netconnect.pm_.c:315
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -4722,221 +4776,216 @@ msgid ""
"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
msgstr ""
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:319
msgid "Abort"
msgstr ""
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:319
msgid "Continue"
msgstr ""
-#: ../../netconnect.pm_.c:294
+#: ../../netconnect.pm_.c:325
msgid "Which is your ISDN card ?"
msgstr ""
-#: ../../netconnect.pm_.c:314
+#: ../../netconnect.pm_.c:345
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:323
+#: ../../netconnect.pm_.c:354
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:371
+#: ../../netconnect.pm_.c:402
msgid ""
"No ethernet network adapter has been detected on your system.\n"
"I cannot set up this connection type."
msgstr ""
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
+#: ../../netconnect.pm_.c:406 ../../standalone/drakgw_.c:232
msgid "Choose the network interface"
msgstr ""
-#: ../../netconnect.pm_.c:376
+#: ../../netconnect.pm_.c:407
msgid ""
"Please choose which network adapter you want to use to connect to Internet"
msgstr ""
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:703
-#: ../../netconnect.pm_.c:848 ../../standalone/drakgw_.c:223
+#: ../../netconnect.pm_.c:416 ../../netconnect.pm_.c:734
+#: ../../netconnect.pm_.c:878 ../../standalone/drakgw_.c:223
msgid "Network interface"
msgstr ""
-#: ../../netconnect.pm_.c:386
+#: ../../netconnect.pm_.c:417
msgid ""
"\n"
"Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:386
+#: ../../netconnect.pm_.c:417
msgid "I'm about to restart the network device:\n"
msgstr ""
-#: ../../netconnect.pm_.c:484
+#: ../../netconnect.pm_.c:514
msgid "ADSL configuration"
msgstr ""
-#: ../../netconnect.pm_.c:485
+#: ../../netconnect.pm_.c:515
msgid "Do you want to start your connection at boot?"
msgstr ""
-#: ../../netconnect.pm_.c:620
+#: ../../netconnect.pm_.c:649
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../netconnect.pm_.c:625
+#: ../../netconnect.pm_.c:654
msgid "Dialup options"
msgstr ""
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../netconnect.pm_.c:655 ../../standalone/draknet_.c:566
msgid "Connection name"
msgstr ""
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../netconnect.pm_.c:656 ../../standalone/draknet_.c:567
msgid "Phone number"
msgstr ""
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../netconnect.pm_.c:657 ../../standalone/draknet_.c:568
msgid "Login ID"
msgstr ""
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Authentication"
msgstr ""
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "PAP"
msgstr ""
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Script-based"
msgstr ""
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Terminal-based"
msgstr ""
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../netconnect.pm_.c:660 ../../standalone/draknet_.c:571
msgid "Domain name"
msgstr ""
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../netconnect.pm_.c:661 ../../standalone/draknet_.c:572
msgid "First DNS Server (optional)"
msgstr ""
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../netconnect.pm_.c:662 ../../standalone/draknet_.c:573
msgid "Second DNS Server (optional)"
msgstr ""
-#: ../../netconnect.pm_.c:704
+#: ../../netconnect.pm_.c:735
msgid ""
"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:748
+#: ../../netconnect.pm_.c:779
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:748 ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:779 ../../netconnect.pm_.c:782
msgid ""
"\n"
"You can reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:748
+#: ../../netconnect.pm_.c:779
msgid "You are currently connected to internet."
msgstr ""
-#: ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:782
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:782
msgid "You are not currently connected to Internet."
msgstr ""
-#: ../../netconnect.pm_.c:755 ../../standalone/net_monitor_.c:81
+#: ../../netconnect.pm_.c:786 ../../standalone/net_monitor_.c:81
msgid "Connect to Internet"
msgstr ""
-#: ../../netconnect.pm_.c:757
+#: ../../netconnect.pm_.c:788
msgid "Disconnect from Internet"
msgstr ""
-#: ../../netconnect.pm_.c:759
+#: ../../netconnect.pm_.c:790
msgid "Configure network connection (LAN or Internet)"
msgstr ""
-#: ../../netconnect.pm_.c:762
+#: ../../netconnect.pm_.c:793
msgid "Internet connection & configuration"
msgstr ""
-#: ../../netconnect.pm_.c:814 ../../netconnect.pm_.c:964
-#: ../../netconnect.pm_.c:974 ../../netconnect.pm_.c:989
-msgid "Network Configuration Wizard"
-msgstr ""
-
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "External ISDN modem"
msgstr ""
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "Internal ISDN card"
msgstr ""
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "What kind is your ISDN connection?"
msgstr ""
-#: ../../netconnect.pm_.c:836 ../../netconnect.pm_.c:885
+#: ../../netconnect.pm_.c:866 ../../netconnect.pm_.c:915
msgid "Connect to the Internet"
msgstr ""
-#: ../../netconnect.pm_.c:837
+#: ../../netconnect.pm_.c:867
msgid ""
"The most common way to connect with adsl is pppoe.\n"
"Some connections use pptp, a few ones use dhcp.\n"
"If you don't know, choose 'use pppoe'"
msgstr ""
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use dhcp"
msgstr ""
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use pptp"
msgstr ""
-#: ../../netconnect.pm_.c:849
+#: ../../netconnect.pm_.c:879
#, c-format
msgid "I'm about to restart the network device %s. Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:886
+#: ../../netconnect.pm_.c:916
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpcd"
msgstr ""
-#: ../../netconnect.pm_.c:903
+#: ../../netconnect.pm_.c:933
msgid "Network configuration"
msgstr ""
-#: ../../netconnect.pm_.c:904
+#: ../../netconnect.pm_.c:934
msgid "Do you want to restart the network"
msgstr ""
-#: ../../netconnect.pm_.c:907
+#: ../../netconnect.pm_.c:937
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -4944,7 +4993,7 @@ msgid ""
"%s"
msgstr ""
-#: ../../netconnect.pm_.c:938
+#: ../../netconnect.pm_.c:968
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
@@ -4952,7 +5001,7 @@ msgid ""
"Internet & Network connection.\n"
msgstr ""
-#: ../../netconnect.pm_.c:965
+#: ../../netconnect.pm_.c:995
msgid ""
"Welcome to The Network Configuration Wizard\n"
"\n"
@@ -4960,69 +5009,73 @@ msgid ""
"If you don't want to use the auto detection, deselect the checkbox.\n"
msgstr ""
-#: ../../netconnect.pm_.c:967
+#: ../../netconnect.pm_.c:997
msgid "Choose the profile to configure"
msgstr ""
-#: ../../netconnect.pm_.c:968
+#: ../../netconnect.pm_.c:998
msgid "Use auto detection"
msgstr ""
-#: ../../netconnect.pm_.c:974 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:1004 ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr ""
-#: ../../netconnect.pm_.c:981
+#: ../../netconnect.pm_.c:1012
msgid "Normal modem connection"
msgstr ""
-#: ../../netconnect.pm_.c:981
+#: ../../netconnect.pm_.c:1012
#, c-format
msgid "detected on port %s"
msgstr ""
-#: ../../netconnect.pm_.c:982
+#: ../../netconnect.pm_.c:1013
msgid "ISDN connection"
msgstr ""
-#: ../../netconnect.pm_.c:982
+#: ../../netconnect.pm_.c:1013
#, c-format
msgid "detected %s"
msgstr ""
-#: ../../netconnect.pm_.c:983
+#: ../../netconnect.pm_.c:1014
msgid "DSL (or ADSL) connection"
msgstr ""
-#: ../../netconnect.pm_.c:983
+#: ../../netconnect.pm_.c:1014
#, c-format
msgid "detected on interface %s"
msgstr ""
-#: ../../netconnect.pm_.c:984
+#: ../../netconnect.pm_.c:1015
msgid "Cable connection"
msgstr ""
-#: ../../netconnect.pm_.c:985
+#: ../../netconnect.pm_.c:1015
+msgid "cable connection detected"
+msgstr ""
+
+#: ../../netconnect.pm_.c:1016
msgid "LAN connection"
msgstr ""
-#: ../../netconnect.pm_.c:985
+#: ../../netconnect.pm_.c:1016
msgid "ethernet card(s) detected"
msgstr ""
-#: ../../netconnect.pm_.c:990
-msgid "How do you want to connect to the Internet?"
+#: ../../netconnect.pm_.c:1031
+msgid "Choose"
msgstr ""
-#: ../../netconnect.pm_.c:1007
+#: ../../netconnect.pm_.c:1048
msgid ""
"Congratulation, The network and internet configuration is finished.\n"
"\n"
"The configuration will now be applied to your system."
msgstr ""
-#: ../../netconnect.pm_.c:1010
+#: ../../netconnect.pm_.c:1051
msgid ""
"After that is done, we recommend you to restart your X\n"
"environnement to avoid hostname changing problem."
@@ -5845,6 +5898,10 @@ msgstr ""
msgid "Choose which services should be automatically started at boot time"
msgstr ""
+#: ../../services.pm_.c:125
+msgid "Services"
+msgstr ""
+
#: ../../services.pm_.c:137
msgid "running"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index b4a5b5aac..aa7f8b8cc 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: 2001-06-21 23:35+0200\n"
+"POT-Creation-Date: 2001-07-02 16:48+0200\n"
"PO-Revision-Date: 2001-03-13 13:19CET\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: Norsk\n"
@@ -214,7 +214,6 @@ msgid "An error has occurred, try to change some parameters"
msgstr "En feil oppsto, prјv х endre noen parametere"
#: ../../Xconfigurator.pm_.c:690 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
msgid "Resolution"
msgstr "Opplјsning"
@@ -305,43 +304,43 @@ msgstr "XFree86-tjener: %s\n"
msgid "XFree86 driver: %s\n"
msgstr "XFree86 driver: %s\n"
-#: ../../Xconfigurator.pm_.c:1376
+#: ../../Xconfigurator.pm_.c:1375
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../../Xconfigurator.pm_.c:1396
+#: ../../Xconfigurator.pm_.c:1395
msgid "What do you want to do?"
msgstr "Hva јnsker du х gjјre?"
-#: ../../Xconfigurator.pm_.c:1401
+#: ../../Xconfigurator.pm_.c:1400
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1401
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../../Xconfigurator.pm_.c:1404
+#: ../../Xconfigurator.pm_.c:1403
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:1405
+#: ../../Xconfigurator.pm_.c:1404
msgid "Change Resolution"
msgstr "Endre opplјsning"
-#: ../../Xconfigurator.pm_.c:1406
+#: ../../Xconfigurator.pm_.c:1405
msgid "Show information"
msgstr "Vis informasjon"
-#: ../../Xconfigurator.pm_.c:1407
+#: ../../Xconfigurator.pm_.c:1406
msgid "Test again"
msgstr "Test igjen"
-#: ../../Xconfigurator.pm_.c:1408 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1407 ../../bootlook.pm_.c:238
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:1416
+#: ../../Xconfigurator.pm_.c:1415
#, c-format
msgid ""
"Keep the changes?\n"
@@ -354,20 +353,20 @@ msgstr ""
"\n"
"%s"
-#: ../../Xconfigurator.pm_.c:1437
+#: ../../Xconfigurator.pm_.c:1436
#, 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:1457
+#: ../../Xconfigurator.pm_.c:1456
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk sх Ctrl-Alt-BackSpace"
-#: ../../Xconfigurator.pm_.c:1460
+#: ../../Xconfigurator.pm_.c:1459
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../../Xconfigurator.pm_.c:1461
+#: ../../Xconfigurator.pm_.c:1460
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -563,7 +562,7 @@ msgid "Delay before booting default image"
msgstr "Forsinkelse fјr oppstart av standard bilde"
#: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:658
#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
#: ../../standalone/draknet_.c:569
msgid "Password"
@@ -923,7 +922,7 @@ msgstr "Velg vinduhхndtereren som skal kjјres:"
# leave it in English, as it is the best for your language)
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:619
+#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:622
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -948,7 +947,7 @@ msgstr ""
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:820
+#: ../../bootloader.pm_.c:823
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Velkommen til GRUB, operativsystem-velgeren!"
@@ -962,7 +961,7 @@ msgstr "Velkommen til GRUB, operativsystem-velgeren!"
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:823
+#: ../../bootloader.pm_.c:826
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Bruk %c og %c tastene for х velge hvilken inngang som er markert."
@@ -977,7 +976,7 @@ msgstr "Bruk %c og %c tastene for х velge hvilken inngang som er markert."
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:826
+#: ../../bootloader.pm_.c:829
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
@@ -991,7 +990,7 @@ msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:829
+#: ../../bootloader.pm_.c:832
msgid "commands before booting, or 'c' for a command-line."
msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
@@ -1005,23 +1004,23 @@ msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:832
+#: ../../bootloader.pm_.c:835
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "Den markerte inngangen vil bli startet automatisk om %d sekunder."
-#: ../../bootloader.pm_.c:836
+#: ../../bootloader.pm_.c:839
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
#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:929
+#: ../../bootloader.pm_.c:932
msgid "Desktop"
msgstr "Skrivebord"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:931
+#: ../../bootloader.pm_.c:934
msgid "Start Menu"
msgstr "Startmeny"
@@ -1188,6 +1187,38 @@ msgstr "kan ikke хpne /etc/sysconfig/autologin for lesing: $!"
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. Fјlgende feil oppsto:"
+#: ../../common.pm_.c:635
+msgid "GB"
+msgstr "GB"
+
+#: ../../common.pm_.c:635
+msgid "KB"
+msgstr "KB"
+
+#: ../../common.pm_.c:635 ../../diskdrake.pm_.c:660
+#: ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
+
+#: ../../common.pm_.c:643
+msgid "TB"
+msgstr "TB"
+
+#: ../../common.pm_.c:656
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutter"
+
+#: ../../common.pm_.c:658
+msgid "1 minute"
+msgstr "1 minutt"
+
+#: ../../common.pm_.c:660
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekunder"
+
#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
msgid "Create"
msgstr "Opprett"
@@ -1739,11 +1770,6 @@ msgstr ""
msgid "Choose the new size"
msgstr "Velg den nye stјrrelsen"
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
-
#: ../../diskdrake.pm_.c:714
msgid "Create a new partition"
msgstr "Opprette en ny partisjon"
@@ -3985,7 +4011,7 @@ msgstr "Konfigurer X"
msgid "Exit install"
msgstr "Avslutt installering"
-#: ../../install_any.pm_.c:403
+#: ../../install_any.pm_.c:404
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -4009,11 +4035,11 @@ msgstr ""
"\n"
"иnsker du virkelig х installere disse tjenerene?\n"
-#: ../../install_any.pm_.c:434
+#: ../../install_any.pm_.c:435
msgid "Can't use broadcast with no NIS domain"
msgstr "Kan ikke bruke broadcast med intet NIS domene"
-#: ../../install_any.pm_.c:694
+#: ../../install_any.pm_.c:671
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
@@ -4021,7 +4047,7 @@ msgstr ""
"For х bruke dette valget av pakker, start installasjonen med'linux "
"defcfg=floppy'"
-#: ../../install_any.pm_.c:716
+#: ../../install_any.pm_.c:693
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
@@ -5900,27 +5926,57 @@ msgstr "<- Forrige"
msgid "Is this correct?"
msgstr "Er dette riktig?"
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:845
+#: ../../netconnect.pm_.c:994 ../../netconnect.pm_.c:1004
+#: ../../netconnect.pm_.c:1030
+msgid "Network Configuration Wizard"
+msgstr "Nettverkskonfigurasjonveiviser"
+
+#: ../../netconnect.pm_.c:79
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The full configuration uses isdn4net. It contains powerfull tools, but is "
+"tricky to configure for a newbie, and not standard.\n"
+"\n"
+"* The light configuration is easier to understand, more standard, but with "
+"less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+"\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:87
+#, fuzzy
+msgid "Full configuration (isdn4net)"
+msgstr "Brannmurkonfigurasjon oppdaget!"
+
+#: ../../netconnect.pm_.c:87
+#, fuzzy
+msgid "Light configuration"
+msgstr "LAN-konfigurasjon"
+
+#: ../../netconnect.pm_.c:179
msgid "Internet configuration"
msgstr "Internett-konfigurasjon"
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:180
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:148
+#: ../../netconnect.pm_.c:184
msgid "Testing your connection..."
msgstr "Tester tilkoblingen din..."
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
+#: ../../netconnect.pm_.c:190 ../../standalone/draknet_.c:196
msgid "The system is now connected to Internet."
msgstr "Systemet er nх koblet opp mot Internett."
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:191
msgid "For Security reason, it will be disconnected now."
msgstr "Av sikkerhetsgrunner vil den bli frakoblet nх."
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../netconnect.pm_.c:192 ../../standalone/draknet_.c:196
msgid ""
"The system doesn't seem to be connected to internet.\n"
"Try to reconfigure your connection."
@@ -5928,18 +5984,18 @@ msgstr ""
"Det ser ikke ut til at systemet er koblet til Internett.\n"
"Prјv х rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:907
-#: ../../netconnect.pm_.c:937 ../../netconnect.pm_.c:1015
+#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:937
+#: ../../netconnect.pm_.c:967 ../../netconnect.pm_.c:1056
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
+#: ../../netconnect.pm_.c:254 ../../netconnect.pm_.c:297
+#: ../../netconnect.pm_.c:307 ../../netconnect.pm_.c:314
+#: ../../netconnect.pm_.c:324
msgid "ISDN Configuration"
msgstr "ISDN-konfigurasjon"
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:254
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
@@ -5947,79 +6003,79 @@ msgstr ""
"Velg din tilbyder.\n"
" Hvis denne ikke er i listen, velg ikke i listen"
-#: ../../netconnect.pm_.c:236
+#: ../../netconnect.pm_.c:268
msgid "Connection Configuration"
msgstr "Konfigurasjon tilknytning."
-#: ../../netconnect.pm_.c:237
+#: ../../netconnect.pm_.c:269
msgid "Please fill or check the field below"
msgstr "Vennnligst fyll eller merk feltet under"
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
+#: ../../netconnect.pm_.c:271 ../../standalone/draknet_.c:552
msgid "Card IRQ"
msgstr "Kort IRQ"
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
+#: ../../netconnect.pm_.c:272 ../../standalone/draknet_.c:553
msgid "Card mem (DMA)"
msgstr "Kort mem (DMA)"
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
+#: ../../netconnect.pm_.c:273 ../../standalone/draknet_.c:554
msgid "Card IO"
msgstr "Kort IO"
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
+#: ../../netconnect.pm_.c:274 ../../standalone/draknet_.c:555
msgid "Card IO_0"
msgstr "Kort IO_0"
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
+#: ../../netconnect.pm_.c:275 ../../standalone/draknet_.c:556
msgid "Card IO_1"
msgstr "Kort IO_1"
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
+#: ../../netconnect.pm_.c:276 ../../standalone/draknet_.c:557
msgid "Your personal phone number"
msgstr "Ditt telefonnummer"
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
+#: ../../netconnect.pm_.c:277 ../../standalone/draknet_.c:558
msgid "Provider name (ex provider.net)"
msgstr "Navn tilbyder (f.eks. tilbyder.net)"
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
+#: ../../netconnect.pm_.c:278 ../../standalone/draknet_.c:559
msgid "Provider phone number"
msgstr "Telefonnummer tilbyder"
-#: ../../netconnect.pm_.c:247
+#: ../../netconnect.pm_.c:279
msgid "Provider dns 1"
msgstr "Tilbyder dns 1"
-#: ../../netconnect.pm_.c:248
+#: ../../netconnect.pm_.c:280
msgid "Provider dns 2"
msgstr "Tilbyder dns 2"
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
+#: ../../netconnect.pm_.c:281 ../../standalone/draknet_.c:564
msgid "Dialing mode"
msgstr "Oppringningsmodus"
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
+#: ../../netconnect.pm_.c:282 ../../standalone/draknet_.c:562
msgid "Account Login (user name)"
msgstr "Logg inn (brukernavn)"
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
+#: ../../netconnect.pm_.c:283 ../../standalone/draknet_.c:563
msgid "Account Password"
msgstr "Passord"
-#: ../../netconnect.pm_.c:261
+#: ../../netconnect.pm_.c:292
msgid "Europe"
msgstr "Europa"
-#: ../../netconnect.pm_.c:261
+#: ../../netconnect.pm_.c:292
msgid "Europe (EDSS1)"
msgstr "Europa (EDSS1)"
-#: ../../netconnect.pm_.c:263
+#: ../../netconnect.pm_.c:294
msgid "Rest of the world"
msgstr "Resten av verden"
-#: ../../netconnect.pm_.c:263
+#: ../../netconnect.pm_.c:294
msgid ""
"Rest of the world \n"
" no D-Channel (leased lines)"
@@ -6027,27 +6083,27 @@ msgstr ""
"Resten av verden \n"
" ingen D-kanal (leid linje)"
-#: ../../netconnect.pm_.c:267
+#: ../../netconnect.pm_.c:298
msgid "Which protocol do you want to use ?"
msgstr "Hvilken protokoll јnsker du х bruke?"
-#: ../../netconnect.pm_.c:277
+#: ../../netconnect.pm_.c:308
msgid "What kind of card do you have?"
msgstr "Hva slags kort har du?"
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "I don't know"
msgstr "Jeg vet ikke"
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "PCI"
msgstr "PCI"
-#: ../../netconnect.pm_.c:284
+#: ../../netconnect.pm_.c:315
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -6059,19 +6115,19 @@ msgstr ""
"\n"
"Hvis du har et PCMCIA kort mх du vite irq og io for kortet.\n"
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:319
msgid "Abort"
msgstr "Avbryt"
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:319
msgid "Continue"
msgstr "Fortsett"
-#: ../../netconnect.pm_.c:294
+#: ../../netconnect.pm_.c:325
msgid "Which is your ISDN card ?"
msgstr "Hvilket er ditt ISDN-kort?"
-#: ../../netconnect.pm_.c:314
+#: ../../netconnect.pm_.c:345
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
@@ -6079,11 +6135,11 @@ 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:323
+#: ../../netconnect.pm_.c:354
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:371
+#: ../../netconnect.pm_.c:402
msgid ""
"No ethernet network adapter has been detected on your system.\n"
"I cannot set up this connection type."
@@ -6091,23 +6147,23 @@ msgstr ""
"Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt.\n"
"Jeg kan ikke sette opp denne tilkoblingstypen."
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
+#: ../../netconnect.pm_.c:406 ../../standalone/drakgw_.c:232
msgid "Choose the network interface"
msgstr "Velg nettverksgrensesnitt"
-#: ../../netconnect.pm_.c:376
+#: ../../netconnect.pm_.c:407
msgid ""
"Please choose which network adapter you want to use to connect to Internet"
msgstr ""
"Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
"mot Internett"
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:703
-#: ../../netconnect.pm_.c:848 ../../standalone/drakgw_.c:223
+#: ../../netconnect.pm_.c:416 ../../netconnect.pm_.c:734
+#: ../../netconnect.pm_.c:878 ../../standalone/drakgw_.c:223
msgid "Network interface"
msgstr "Nettverksgrensesnitt"
-#: ../../netconnect.pm_.c:386
+#: ../../netconnect.pm_.c:417
msgid ""
"\n"
"Do you agree?"
@@ -6115,74 +6171,74 @@ msgstr ""
"\n"
"Er du enig?"
-#: ../../netconnect.pm_.c:386
+#: ../../netconnect.pm_.c:417
msgid "I'm about to restart the network device:\n"
msgstr "Jeg er i ferd med х starte denne nettverksenheten pх nytt:\n"
-#: ../../netconnect.pm_.c:484
+#: ../../netconnect.pm_.c:514
msgid "ADSL configuration"
msgstr "ADSL-konfigurasjon"
-#: ../../netconnect.pm_.c:485
+#: ../../netconnect.pm_.c:515
msgid "Do you want to start your connection at boot?"
msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
-#: ../../netconnect.pm_.c:620
+#: ../../netconnect.pm_.c:649
msgid "Please choose which serial port your modem is connected to."
msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
-#: ../../netconnect.pm_.c:625
+#: ../../netconnect.pm_.c:654
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../netconnect.pm_.c:655 ../../standalone/draknet_.c:566
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../netconnect.pm_.c:656 ../../standalone/draknet_.c:567
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../netconnect.pm_.c:657 ../../standalone/draknet_.c:568
msgid "Login ID"
msgstr "Login ID"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../netconnect.pm_.c:660 ../../standalone/draknet_.c:571
msgid "Domain name"
msgstr "Domenenavn"
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../netconnect.pm_.c:661 ../../standalone/draknet_.c:572
msgid "First DNS Server (optional)"
msgstr "Fјrste DNS-tjener (valgfri)"
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../netconnect.pm_.c:662 ../../standalone/draknet_.c:573
msgid "Second DNS Server (optional)"
msgstr "Andre DNS-tjener (valgfri)"
-#: ../../netconnect.pm_.c:704
+#: ../../netconnect.pm_.c:735
msgid ""
"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
msgstr ""
"Jeg er i ferd med х starte nettverksenhet $netc->{NET_DEVICE} pх nytt. Er du "
"enig?"
-#: ../../netconnect.pm_.c:748
+#: ../../netconnect.pm_.c:779
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
@@ -6190,7 +6246,7 @@ msgstr ""
"\n"
"Du kan koble ned eller rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:748 ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:779 ../../netconnect.pm_.c:782
msgid ""
"\n"
"You can reconfigure your connection."
@@ -6198,11 +6254,11 @@ msgstr ""
"\n"
"Du kan rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:748
+#: ../../netconnect.pm_.c:779
msgid "You are currently connected to internet."
msgstr "Du er for јyeblikket koblet opp mot Internett"
-#: ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:782
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
@@ -6210,48 +6266,43 @@ msgstr ""
"\n"
"Du kan koble opp mot Internett eller rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:782
msgid "You are not currently connected to Internet."
msgstr "Du er for јyeblikket ikke koblet opp mot Internett."
-#: ../../netconnect.pm_.c:755 ../../standalone/net_monitor_.c:81
+#: ../../netconnect.pm_.c:786 ../../standalone/net_monitor_.c:81
msgid "Connect to Internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:757
+#: ../../netconnect.pm_.c:788
msgid "Disconnect from Internet"
msgstr "Koble ned fra Internett"
-#: ../../netconnect.pm_.c:759
+#: ../../netconnect.pm_.c:790
msgid "Configure network connection (LAN or Internet)"
msgstr "Konfigurer nettverk-tilkobling (LAN eller Internett)"
-#: ../../netconnect.pm_.c:762
+#: ../../netconnect.pm_.c:793
msgid "Internet connection & configuration"
msgstr "Internett tilkobling & konfigurasjon"
-#: ../../netconnect.pm_.c:814 ../../netconnect.pm_.c:964
-#: ../../netconnect.pm_.c:974 ../../netconnect.pm_.c:989
-msgid "Network Configuration Wizard"
-msgstr "Nettverkskonfigurasjonveiviser"
-
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "External ISDN modem"
msgstr "Eksternt ISDN modem"
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "Internal ISDN card"
msgstr "Internt ISDN-kort"
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "What kind is your ISDN connection?"
msgstr "Hva slags type er ISDN-tilknytningen din?"
-#: ../../netconnect.pm_.c:836 ../../netconnect.pm_.c:885
+#: ../../netconnect.pm_.c:866 ../../netconnect.pm_.c:915
msgid "Connect to the Internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:837
+#: ../../netconnect.pm_.c:867
msgid ""
"The most common way to connect with adsl is pppoe.\n"
"Some connections use pptp, a few ones use dhcp.\n"
@@ -6261,24 +6312,24 @@ msgstr ""
"Noen oppkoblinger bruker pptp, noen fх bruker dhcp.\n"
"Hvis du ikke vet, velg 'bruk pppoe'"
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use dhcp"
msgstr "bruk dhcp"
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use pppoe"
msgstr "bruk pppoe"
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use pptp"
msgstr "bruk pptp"
-#: ../../netconnect.pm_.c:849
+#: ../../netconnect.pm_.c:879
#, c-format
msgid "I'm about to restart the network device %s. Do you agree?"
msgstr "Jeg er i ferd med х starte nettverksenhet %s pх nytt. Er du enig?"
-#: ../../netconnect.pm_.c:886
+#: ../../netconnect.pm_.c:916
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpcd"
@@ -6286,15 +6337,15 @@ msgstr ""
"Hvilken dhcp klient јnsker du х bruke?\n"
"Standard er dhcpcd"
-#: ../../netconnect.pm_.c:903
+#: ../../netconnect.pm_.c:933
msgid "Network configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../../netconnect.pm_.c:904
+#: ../../netconnect.pm_.c:934
msgid "Do you want to restart the network"
msgstr "Vil du starte nettverket pх nytt"
-#: ../../netconnect.pm_.c:907
+#: ../../netconnect.pm_.c:937
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -6305,7 +6356,7 @@ msgstr ""
"\n"
"%s"
-#: ../../netconnect.pm_.c:938
+#: ../../netconnect.pm_.c:968
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
@@ -6317,7 +6368,7 @@ msgstr ""
"Trykk OK for х beholde din eksisterende konfigurasjon, eller avbryt for х "
"rekonfigurere din internett og nettverkskonfigurasjon.\n"
-#: ../../netconnect.pm_.c:965
+#: ../../netconnect.pm_.c:995
msgid ""
"Welcome to The Network Configuration Wizard\n"
"\n"
@@ -6330,62 +6381,68 @@ msgstr ""
"Hvis du ikke јnsker х bruke automatisk oppdagelse, fjern krysset\n"
"i boksen.\n"
-#: ../../netconnect.pm_.c:967
+#: ../../netconnect.pm_.c:997
msgid "Choose the profile to configure"
msgstr "Velg profilen som skal konfigureres"
-#: ../../netconnect.pm_.c:968
+#: ../../netconnect.pm_.c:998
msgid "Use auto detection"
msgstr "Bruk automatisk detektering"
-#: ../../netconnect.pm_.c:974 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:1004 ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr "Finner enheter..."
-#: ../../netconnect.pm_.c:981
+#: ../../netconnect.pm_.c:1012
msgid "Normal modem connection"
msgstr "Normal modemtilkobling"
-#: ../../netconnect.pm_.c:981
+#: ../../netconnect.pm_.c:1012
#, c-format
msgid "detected on port %s"
msgstr "oppdaget pх port %s"
-#: ../../netconnect.pm_.c:982
+#: ../../netconnect.pm_.c:1013
msgid "ISDN connection"
msgstr "ISDN-tilkobling"
-#: ../../netconnect.pm_.c:982
+#: ../../netconnect.pm_.c:1013
#, c-format
msgid "detected %s"
msgstr "oppdaget %s"
-#: ../../netconnect.pm_.c:983
+#: ../../netconnect.pm_.c:1014
msgid "DSL (or ADSL) connection"
msgstr "DSL- (eller ADSL) tilkobling"
-#: ../../netconnect.pm_.c:983
+#: ../../netconnect.pm_.c:1014
#, c-format
msgid "detected on interface %s"
msgstr "oppdaget pх grensesnitt %s"
-#: ../../netconnect.pm_.c:984
+#: ../../netconnect.pm_.c:1015
msgid "Cable connection"
msgstr "Kabeltilkobling"
-#: ../../netconnect.pm_.c:985
+#: ../../netconnect.pm_.c:1015
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Kabeltilkobling"
+
+#: ../../netconnect.pm_.c:1016
msgid "LAN connection"
msgstr "Lokalt nettverksoppkobling"
-#: ../../netconnect.pm_.c:985
+#: ../../netconnect.pm_.c:1016
msgid "ethernet card(s) detected"
msgstr "oppdaget ethernettkort"
-#: ../../netconnect.pm_.c:990
-msgid "How do you want to connect to the Internet?"
-msgstr "Hvordan vil du koble opp mot Internett?"
+#: ../../netconnect.pm_.c:1031
+#, fuzzy
+msgid "Choose"
+msgstr "Lukk"
-#: ../../netconnect.pm_.c:1007
+#: ../../netconnect.pm_.c:1048
msgid ""
"Congratulation, The network and internet configuration is finished.\n"
"\n"
@@ -6395,7 +6452,7 @@ msgstr ""
"\n"
"Konfigurasjonen vil nх bli aktivert."
-#: ../../netconnect.pm_.c:1010
+#: ../../netconnect.pm_.c:1051
msgid ""
"After that is done, we recommend you to restart your X\n"
"environnement to avoid hostname changing problem."
@@ -7368,6 +7425,11 @@ msgstr ""
msgid "Choose which services should be automatically started at boot time"
msgstr "Velg hvilke tjenester som skal startes automatisk ved oppstart"
+#: ../../services.pm_.c:125
+#, fuzzy
+msgid "Services"
+msgstr "enhet"
+
#: ../../services.pm_.c:137
msgid "running"
msgstr "kjјrer"
@@ -8456,30 +8518,15 @@ msgstr "Verktјy for х forenkle konfigurasjonen pх maskinen din"
msgid "Set of tools for mail, news, web, file transfer, and chat"
msgstr "Sett med verktјy for e-post, nyheter, web, filoverfјring og chat"
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Hvordan vil du koble opp mot Internett?"
+
#~ msgid "Insert a FAT formatted floppy in drive %s"
#~ msgstr "Sett inn en FAT-formatert diskett i stasjon %s"
#~ msgid "This floppy is not FAT formatted"
#~ msgstr "Denne disketten er ikke FAT-formatert"
-#~ msgid "GB"
-#~ msgstr "GB"
-
-#~ msgid "KB"
-#~ msgstr "KB"
-
-#~ msgid "TB"
-#~ msgstr "TB"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minutter"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minutt"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d sekunder"
-
#~ msgid "cannot fork: "
#~ msgstr "kan ikke dele: "
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 51a9f51b4..392984462 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: 2001-06-21 23:35+0200\n"
+"POT-Creation-Date: 2001-07-02 16:48+0200\n"
"PO-Revision-Date: 2001-03-20 07:46+0200\n"
"Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
"Language-Team: Serbian (cyrillic)\n"
@@ -210,7 +210,6 @@ msgid "An error has occurred, try to change some parameters"
msgstr "Хм, појавила се грешка, пробајте да променитe параметре"
#: ../../Xconfigurator.pm_.c:690 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
msgid "Resolution"
msgstr "Резолуција"
@@ -301,43 +300,43 @@ msgstr "XFree86 сервер: %s\n"
msgid "XFree86 driver: %s\n"
msgstr "XFree86 драjвер: %s\n"
-#: ../../Xconfigurator.pm_.c:1376
+#: ../../Xconfigurator.pm_.c:1375
msgid "Preparing X-Window configuration"
msgstr "Провера конфигурације за X-Window систем"
-#: ../../Xconfigurator.pm_.c:1396
+#: ../../Xconfigurator.pm_.c:1395
msgid "What do you want to do?"
msgstr "Шта желите да урадите?"
-#: ../../Xconfigurator.pm_.c:1401
+#: ../../Xconfigurator.pm_.c:1400
msgid "Change Monitor"
msgstr "Промена монитора"
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1401
msgid "Change Graphic card"
msgstr "Промена графичке картице"
-#: ../../Xconfigurator.pm_.c:1404
+#: ../../Xconfigurator.pm_.c:1403
msgid "Change Server options"
msgstr "Промена Сервер опција"
-#: ../../Xconfigurator.pm_.c:1405
+#: ../../Xconfigurator.pm_.c:1404
msgid "Change Resolution"
msgstr "Промена резолуције"
-#: ../../Xconfigurator.pm_.c:1406
+#: ../../Xconfigurator.pm_.c:1405
msgid "Show information"
msgstr "Прикажи информације"
-#: ../../Xconfigurator.pm_.c:1407
+#: ../../Xconfigurator.pm_.c:1406
msgid "Test again"
msgstr "Тестирај поново"
-#: ../../Xconfigurator.pm_.c:1408 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1407 ../../bootlook.pm_.c:238
msgid "Quit"
msgstr "Крај"
-#: ../../Xconfigurator.pm_.c:1416
+#: ../../Xconfigurator.pm_.c:1415
#, c-format
msgid ""
"Keep the changes?\n"
@@ -350,20 +349,20 @@ msgstr ""
"\n"
"%s"
-#: ../../Xconfigurator.pm_.c:1437
+#: ../../Xconfigurator.pm_.c:1436
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Молим, поново унесите %s ради активирања промена"
-#: ../../Xconfigurator.pm_.c:1457
+#: ../../Xconfigurator.pm_.c:1456
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Молим ваш излогујте се и рестартујте (Ctrl-Alt-BackSpace) рачунар"
-#: ../../Xconfigurator.pm_.c:1460
+#: ../../Xconfigurator.pm_.c:1459
msgid "X at startup"
msgstr "X окружење на старту"
-#: ../../Xconfigurator.pm_.c:1461
+#: ../../Xconfigurator.pm_.c:1460
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -559,7 +558,7 @@ msgid "Delay before booting default image"
msgstr "Пауза пре стартања default image-а"
#: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:629
+#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:658
#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
#: ../../standalone/draknet_.c:569
msgid "Password"
@@ -918,7 +917,7 @@ msgstr "Изаберите window менадзер коjи желите да користите:"
# leave it in English, as it is the best for your language)
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:619
+#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:622
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -941,7 +940,7 @@ msgstr ""
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:820
+#: ../../bootloader.pm_.c:823
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Dobrodosli u GRUB starter operativnog sistema !"
@@ -954,7 +953,7 @@ msgstr "Dobrodosli u GRUB starter operativnog sistema !"
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:823
+#: ../../bootloader.pm_.c:826
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Koristi %c i %c slova da bi oznacili izbor"
@@ -968,7 +967,7 @@ msgstr "Koristi %c i %c slova da bi oznacili izbor"
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:826
+#: ../../bootloader.pm_.c:829
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
@@ -981,7 +980,7 @@ msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:829
+#: ../../bootloader.pm_.c:832
msgid "commands before booting, or 'c' for a command-line."
msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
@@ -994,23 +993,23 @@ msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:832
+#: ../../bootloader.pm_.c:835
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "Oznaceni izbor se podize automatski za %d sekundi"
-#: ../../bootloader.pm_.c:836
+#: ../../bootloader.pm_.c:839
msgid "not enough room in /boot"
msgstr "нема довољно места у /boot"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:929
+#: ../../bootloader.pm_.c:932
msgid "Desktop"
msgstr "Десктоп"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:931
+#: ../../bootloader.pm_.c:934
msgid "Start Menu"
msgstr "Старт мени "
@@ -1178,6 +1177,38 @@ msgstr "не могу отворити /etc/sysconfig/autologin за читaњe: $!"
msgid "Installation of LILO failed. The following error occured:"
msgstr "Инсталација LILO-а неуспела. Грешка је:"
+#: ../../common.pm_.c:635
+msgid "GB"
+msgstr "GB"
+
+#: ../../common.pm_.c:635
+msgid "KB"
+msgstr "KB"
+
+#: ../../common.pm_.c:635 ../../diskdrake.pm_.c:660
+#: ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
+msgid "MB"
+msgstr "MB"
+
+#: ../../common.pm_.c:643
+msgid "TB"
+msgstr "TB"
+
+#: ../../common.pm_.c:656
+#, c-format
+msgid "%d minutes"
+msgstr "%d минутa"
+
+#: ../../common.pm_.c:658
+msgid "1 minute"
+msgstr "1 минут"
+
+#: ../../common.pm_.c:660
+#, c-format
+msgid "%d seconds"
+msgstr "%d секунди"
+
#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
msgid "Create"
msgstr "Креирај"
@@ -1721,11 +1752,6 @@ msgstr "После промене величинe %s партициjе сви подаци ће бити избрисани"
msgid "Choose the new size"
msgstr "Изаберите нову величину"
-#: ../../diskdrake.pm_.c:660 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
-msgid "MB"
-msgstr "MB"
-
#: ../../diskdrake.pm_.c:714
msgid "Create a new partition"
msgstr "Креирај нову партицију"
@@ -3960,7 +3986,7 @@ msgstr "Конфигурисање X-a"
msgid "Exit install"
msgstr "Излаз из инсталације"
-#: ../../install_any.pm_.c:403
+#: ../../install_any.pm_.c:404
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -3975,11 +4001,11 @@ msgid ""
"Do you really want to install these servers?\n"
msgstr ""
-#: ../../install_any.pm_.c:434
+#: ../../install_any.pm_.c:435
msgid "Can't use broadcast with no NIS domain"
msgstr "Није могућ пренос без NIS домена"
-#: ../../install_any.pm_.c:694
+#: ../../install_any.pm_.c:671
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
@@ -3987,7 +4013,7 @@ msgstr ""
"Да би користили оваj избор за чувaње селекциjе пакетa, изаберите инсталациjу "
"сa ``linux defcfg=floppy''"
-#: ../../install_any.pm_.c:716
+#: ../../install_any.pm_.c:693
msgid "Error reading file $f"
msgstr "Грешка код отварања фајла $f"
@@ -5835,27 +5861,57 @@ msgstr "<- Претходни"
msgid "Is this correct?"
msgstr "Да ли је ово исправно ?"
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:845
+#: ../../netconnect.pm_.c:994 ../../netconnect.pm_.c:1004
+#: ../../netconnect.pm_.c:1030
+msgid "Network Configuration Wizard"
+msgstr "чаробњак за подешавање мрежe"
+
+#: ../../netconnect.pm_.c:79
+msgid ""
+"Which ISDN configuration do you prefer?\n"
+"\n"
+"* The full configuration uses isdn4net. It contains powerfull tools, but is "
+"tricky to configure for a newbie, and not standard.\n"
+"\n"
+"* The light configuration is easier to understand, more standard, but with "
+"less tools.\n"
+"\n"
+"We recommand the light configuration.\n"
+"\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:87
+#, fuzzy
+msgid "Full configuration (isdn4net)"
+msgstr "Детектована Firewalling конфигурациja"
+
+#: ../../netconnect.pm_.c:87
+#, fuzzy
+msgid "Light configuration"
+msgstr "LAN конфигурацијa"
+
+#: ../../netconnect.pm_.c:179
msgid "Internet configuration"
msgstr "Конфигурација интернетa"
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:180
msgid "Do you want to try to connect to the Internet now?"
msgstr "Да ли хоћете да се конектуjете на интернет садa?"
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:184
msgid "Testing your connection..."
msgstr "Тестирaње конекциjе..."
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
+#: ../../netconnect.pm_.c:190 ../../standalone/draknet_.c:196
msgid "The system is now connected to Internet."
msgstr "Систем jе тренутно конектован на Интернет"
-#: ../../netconnect.pm_.c:155
+#: ../../netconnect.pm_.c:191
msgid "For Security reason, it will be disconnected now."
msgstr "Из сигурносних разлога, он ће сада бити дисконектован."
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../netconnect.pm_.c:192 ../../standalone/draknet_.c:196
msgid ""
"The system doesn't seem to be connected to internet.\n"
"Try to reconfigure your connection."
@@ -5863,18 +5919,18 @@ msgstr ""
"Изгледа да систем ниjе конектован на Интернет.\n"
"Пробаjте да промените конфигурациjу."
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:907
-#: ../../netconnect.pm_.c:937 ../../netconnect.pm_.c:1015
+#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:937
+#: ../../netconnect.pm_.c:967 ../../netconnect.pm_.c:1056
msgid "Network Configuration"
msgstr "Подешавање мрежe"
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
+#: ../../netconnect.pm_.c:254 ../../netconnect.pm_.c:297
+#: ../../netconnect.pm_.c:307 ../../netconnect.pm_.c:314
+#: ../../netconnect.pm_.c:324
msgid "ISDN Configuration"
msgstr "ISDN Конфигурацијa"
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:254
msgid ""
"Select your provider.\n"
" If it's not in the list, choose Unlisted"
@@ -5882,79 +5938,79 @@ msgstr ""
"Изаберите свог проваjдeрa.\n"
" Уколико ниjе на листи, изаберите Unlisted"
-#: ../../netconnect.pm_.c:236
+#: ../../netconnect.pm_.c:268
msgid "Connection Configuration"
msgstr "Конфигурација Интернет конекциje"
-#: ../../netconnect.pm_.c:237
+#: ../../netconnect.pm_.c:269
msgid "Please fill or check the field below"
msgstr "Молим ВАС да попуните или ознaчите поља испод"
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
+#: ../../netconnect.pm_.c:271 ../../standalone/draknet_.c:552
msgid "Card IRQ"
msgstr "IRQ картицe"
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
+#: ../../netconnect.pm_.c:272 ../../standalone/draknet_.c:553
msgid "Card mem (DMA)"
msgstr "(DMA) картицe"
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
+#: ../../netconnect.pm_.c:273 ../../standalone/draknet_.c:554
msgid "Card IO"
msgstr " IO картицe"
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
+#: ../../netconnect.pm_.c:274 ../../standalone/draknet_.c:555
msgid "Card IO_0"
msgstr " IO_0 картицe"
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
+#: ../../netconnect.pm_.c:275 ../../standalone/draknet_.c:556
msgid "Card IO_1"
msgstr "IO_1 картицe"
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
+#: ../../netconnect.pm_.c:276 ../../standalone/draknet_.c:557
msgid "Your personal phone number"
msgstr "Вaш лични броj телефонa"
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
+#: ../../netconnect.pm_.c:277 ../../standalone/draknet_.c:558
msgid "Provider name (ex provider.net)"
msgstr "Име проваjдера (нпр. provider.net)"
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
+#: ../../netconnect.pm_.c:278 ../../standalone/draknet_.c:559
msgid "Provider phone number"
msgstr "Број телефона проваjдерa"
-#: ../../netconnect.pm_.c:247
+#: ../../netconnect.pm_.c:279
msgid "Provider dns 1"
msgstr "Проваjдеров dns 1"
-#: ../../netconnect.pm_.c:248
+#: ../../netconnect.pm_.c:280
msgid "Provider dns 2"
msgstr "Проваjдеров dns 2"
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
+#: ../../netconnect.pm_.c:281 ../../standalone/draknet_.c:564
msgid "Dialing mode"
msgstr "Мод за бирaњe"
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
+#: ../../netconnect.pm_.c:282 ../../standalone/draknet_.c:562
msgid "Account Login (user name)"
msgstr "Логовaње за рaчун (корисничко име)"
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
+#: ../../netconnect.pm_.c:283 ../../standalone/draknet_.c:563
msgid "Account Password"
msgstr "Лозинка за рaчун"
-#: ../../netconnect.pm_.c:261
+#: ../../netconnect.pm_.c:292
msgid "Europe"
msgstr "Европа"
-#: ../../netconnect.pm_.c:261
+#: ../../netconnect.pm_.c:292
msgid "Europe (EDSS1)"
msgstr "Европа (EDSS1)"
-#: ../../netconnect.pm_.c:263
+#: ../../netconnect.pm_.c:294
msgid "Rest of the world"
msgstr "Остатак светa"
-#: ../../netconnect.pm_.c:263
+#: ../../netconnect.pm_.c:294
msgid ""
"Rest of the world \n"
" no D-Channel (leased lines)"
@@ -5962,27 +6018,27 @@ msgstr ""
"Остатак света \n"
" без Д-канала (закупљене линиjе)"
-#: ../../netconnect.pm_.c:267
+#: ../../netconnect.pm_.c:298
msgid "Which protocol do you want to use ?"
msgstr "Који протокол желите да користитe ?"
-#: ../../netconnect.pm_.c:277
+#: ../../netconnect.pm_.c:308
msgid "What kind of card do you have?"
msgstr "Кaкву врсту картице имате?"
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "I don't know"
msgstr "Не знам"
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../../netconnect.pm_.c:278
+#: ../../netconnect.pm_.c:309
msgid "PCI"
msgstr "PCI"
-#: ../../netconnect.pm_.c:284
+#: ../../netconnect.pm_.c:315
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -5995,19 +6051,19 @@ msgstr ""
"\n"
"Уколико имaтe PCMCIA картицу, морате знати irq и io за вaшу картицу.\n"
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:319
msgid "Abort"
msgstr "Прекини"
-#: ../../netconnect.pm_.c:288
+#: ../../netconnect.pm_.c:319
msgid "Continue"
msgstr "Настави"
-#: ../../netconnect.pm_.c:294
+#: ../../netconnect.pm_.c:325
msgid "Which is your ISDN card ?"
msgstr "Која је ваша ISDN картицa ?"
-#: ../../netconnect.pm_.c:314
+#: ../../netconnect.pm_.c:345
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
@@ -6015,11 +6071,11 @@ msgstr ""
"Детектована je ISDN PCI картицa, непознатог типa. Изаберитe jедну PCI "
"картицу на следeћем екрану."
-#: ../../netconnect.pm_.c:323
+#: ../../netconnect.pm_.c:354
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr "Ниjе пронaђена ISDN PCI картица.Изаберите jедну на следeћем екрану."
-#: ../../netconnect.pm_.c:371
+#: ../../netconnect.pm_.c:402
msgid ""
"No ethernet network adapter has been detected on your system.\n"
"I cannot set up this connection type."
@@ -6027,22 +6083,22 @@ msgstr ""
"Ниjе детектована ниjедна мрeжна картицa.\n"
"Не могу да подесим оваj тип конекциje."
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
+#: ../../netconnect.pm_.c:406 ../../standalone/drakgw_.c:232
msgid "Choose the network interface"
msgstr "Изаберите мрeжни интерфejс"
-#: ../../netconnect.pm_.c:376
+#: ../../netconnect.pm_.c:407
msgid ""
"Please choose which network adapter you want to use to connect to Internet"
msgstr ""
"Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:703
-#: ../../netconnect.pm_.c:848 ../../standalone/drakgw_.c:223
+#: ../../netconnect.pm_.c:416 ../../netconnect.pm_.c:734
+#: ../../netconnect.pm_.c:878 ../../standalone/drakgw_.c:223
msgid "Network interface"
msgstr "Мрeжни интерфejс"
-#: ../../netconnect.pm_.c:386
+#: ../../netconnect.pm_.c:417
msgid ""
"\n"
"Do you agree?"
@@ -6050,74 +6106,74 @@ msgstr ""
"\n"
"Да ли се слaжетe?"
-#: ../../netconnect.pm_.c:386
+#: ../../netconnect.pm_.c:417
msgid "I'm about to restart the network device:\n"
msgstr "Садам треба да се рестартуjе мрeжни интерфеjс:\n"
-#: ../../netconnect.pm_.c:484
+#: ../../netconnect.pm_.c:514
msgid "ADSL configuration"
msgstr "ADSL конфигурацијa"
-#: ../../netconnect.pm_.c:485
+#: ../../netconnect.pm_.c:515
msgid "Do you want to start your connection at boot?"
msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
-#: ../../netconnect.pm_.c:620
+#: ../../netconnect.pm_.c:649
msgid "Please choose which serial port your modem is connected to."
msgstr "Изаберите серијски порт на који је модем повезан."
-#: ../../netconnect.pm_.c:625
+#: ../../netconnect.pm_.c:654
msgid "Dialup options"
msgstr "Dialup опције"
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../netconnect.pm_.c:655 ../../standalone/draknet_.c:566
msgid "Connection name"
msgstr "Име конекције"
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../netconnect.pm_.c:656 ../../standalone/draknet_.c:567
msgid "Phone number"
msgstr "Број телефона"
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../netconnect.pm_.c:657 ../../standalone/draknet_.c:568
msgid "Login ID"
msgstr "ID за логовање"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Authentication"
msgstr "Аутентификација"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Script-based"
msgstr "Базирано на скрипти"
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../netconnect.pm_.c:659 ../../standalone/draknet_.c:570
msgid "Terminal-based"
msgstr "Базирано на терминалу"
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../netconnect.pm_.c:660 ../../standalone/draknet_.c:571
msgid "Domain name"
msgstr "Име домена"
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../netconnect.pm_.c:661 ../../standalone/draknet_.c:572
msgid "First DNS Server (optional)"
msgstr "Први DNS Сервер (опциja)"
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../netconnect.pm_.c:662 ../../standalone/draknet_.c:573
msgid "Second DNS Server (optional)"
msgstr "Други DNS Сервер (опциja)"
-#: ../../netconnect.pm_.c:704
+#: ../../netconnect.pm_.c:735
msgid ""
"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
msgstr ""
"Сада треба да се рестартуjе мрeжни уређај $netc->{NET_DEVICE}. Да ли се "
"слaжете ?"
-#: ../../netconnect.pm_.c:748
+#: ../../netconnect.pm_.c:779
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
@@ -6125,7 +6181,7 @@ msgstr ""
"\n"
"Можете се дисконектовати или реконфигурисати конекциjу."
-#: ../../netconnect.pm_.c:748 ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:779 ../../netconnect.pm_.c:782
msgid ""
"\n"
"You can reconfigure your connection."
@@ -6133,11 +6189,11 @@ msgstr ""
"\n"
"Подеси интернет конфигурациjу"
-#: ../../netconnect.pm_.c:748
+#: ../../netconnect.pm_.c:779
msgid "You are currently connected to internet."
msgstr "Тренутно сте конектовани на Интернет"
-#: ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:782
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
@@ -6145,48 +6201,43 @@ msgstr ""
"\n"
"Сада се можете конектовати на Интернет или реконфигурисати конекциjу"
-#: ../../netconnect.pm_.c:751
+#: ../../netconnect.pm_.c:782
msgid "You are not currently connected to Internet."
msgstr "Тренутно нисте конектовани на Интернет"
-#: ../../netconnect.pm_.c:755 ../../standalone/net_monitor_.c:81
+#: ../../netconnect.pm_.c:786 ../../standalone/net_monitor_.c:81
msgid "Connect to Internet"
msgstr "Конектуj на Интернет"
-#: ../../netconnect.pm_.c:757
+#: ../../netconnect.pm_.c:788
msgid "Disconnect from Internet"
msgstr "Дисконектуj са Интернетa"
-#: ../../netconnect.pm_.c:759
+#: ../../netconnect.pm_.c:790
msgid "Configure network connection (LAN or Internet)"
msgstr "Подеси мрeжну конфигурациjу(LAN или Интернет)"
-#: ../../netconnect.pm_.c:762
+#: ../../netconnect.pm_.c:793
msgid "Internet connection & configuration"
msgstr "Интернет конекциjа и конфигурациja"
-#: ../../netconnect.pm_.c:814 ../../netconnect.pm_.c:964
-#: ../../netconnect.pm_.c:974 ../../netconnect.pm_.c:989
-msgid "Network Configuration Wizard"
-msgstr "чаробњак за подешавање мрежe"
-
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "External ISDN modem"
msgstr "Екстерни ISDN модем"
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "Internal ISDN card"
msgstr "Интерна ISDN картицa"
-#: ../../netconnect.pm_.c:815
+#: ../../netconnect.pm_.c:846
msgid "What kind is your ISDN connection?"
msgstr "Каква jе врста вaше ISDN кенекциjе ?"
-#: ../../netconnect.pm_.c:836 ../../netconnect.pm_.c:885
+#: ../../netconnect.pm_.c:866 ../../netconnect.pm_.c:915
msgid "Connect to the Internet"
msgstr "Конектуj на интернет"
-#: ../../netconnect.pm_.c:837
+#: ../../netconnect.pm_.c:867
msgid ""
"The most common way to connect with adsl is pppoe.\n"
"Some connections use pptp, a few ones use dhcp.\n"
@@ -6196,38 +6247,38 @@ msgstr ""
"Мeђутим, постоjе конекциjе коjе користе pptp и неке коjе користe dhcp.\n"
"Уколико не знатe коjа je, изаберитe 'користи pppoe'"
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use dhcp"
msgstr "користи dhcpd"
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use pppoe"
msgstr "користи pppoe"
-#: ../../netconnect.pm_.c:839
+#: ../../netconnect.pm_.c:869
msgid "use pptp"
msgstr "користи pptp"
-#: ../../netconnect.pm_.c:849
+#: ../../netconnect.pm_.c:879
#, c-format
msgid "I'm about to restart the network device %s. Do you agree?"
msgstr "Сада треба да се рестартуjе мрeжни уређај %s. Да ли се слaжете ?"
-#: ../../netconnect.pm_.c:886
+#: ../../netconnect.pm_.c:916
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpcd"
msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpcd"
-#: ../../netconnect.pm_.c:903
+#: ../../netconnect.pm_.c:933
msgid "Network configuration"
msgstr "Подешавање мрежe"
-#: ../../netconnect.pm_.c:904
+#: ../../netconnect.pm_.c:934
msgid "Do you want to restart the network"
msgstr "Да ли хоћете да рестартуjeте мрежe?"
-#: ../../netconnect.pm_.c:907
+#: ../../netconnect.pm_.c:937
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -6237,7 +6288,7 @@ msgstr ""
"Поjавио се проблем током рестартовaња мрeжe?\n"
"%s"
-#: ../../netconnect.pm_.c:938
+#: ../../netconnect.pm_.c:968
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
@@ -6249,7 +6300,7 @@ msgstr ""
"Кликните на OК задрджали конфигурациjу Network/Internet конекциje, или "
"cancel дa би поново урадили кофигурациjу.\n"
-#: ../../netconnect.pm_.c:965
+#: ../../netconnect.pm_.c:995
msgid ""
"Welcome to The Network Configuration Wizard\n"
"\n"
@@ -6261,62 +6312,68 @@ msgstr ""
"Сaда треба да конфигуришемо вaшу интернет/мрeжну конекциjу.\n"
"Уколико не желите ауто детекциjу, деселектуjте опциjу.\n"
-#: ../../netconnect.pm_.c:967
+#: ../../netconnect.pm_.c:997
msgid "Choose the profile to configure"
msgstr "Изаберите профил за конфигурисaњe"
-#: ../../netconnect.pm_.c:968
+#: ../../netconnect.pm_.c:998
msgid "Use auto detection"
msgstr "Користи ауто детекциjу"
-#: ../../netconnect.pm_.c:974 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:1004 ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr "Детектуjем урeђаje..."
-#: ../../netconnect.pm_.c:981
+#: ../../netconnect.pm_.c:1012
msgid "Normal modem connection"
msgstr "Нормалнa модемскa конекциja"
-#: ../../netconnect.pm_.c:981
+#: ../../netconnect.pm_.c:1012
#, c-format
msgid "detected on port %s"
msgstr "Детектовано на порту %s"
-#: ../../netconnect.pm_.c:982
+#: ../../netconnect.pm_.c:1013
msgid "ISDN connection"
msgstr "ISDN конекциja"
-#: ../../netconnect.pm_.c:982
+#: ../../netconnect.pm_.c:1013
#, c-format
msgid "detected %s"
msgstr "детектовано %s"
-#: ../../netconnect.pm_.c:983
+#: ../../netconnect.pm_.c:1014
msgid "DSL (or ADSL) connection"
msgstr "DSL (или ADSL) конекциja"
-#: ../../netconnect.pm_.c:983
+#: ../../netconnect.pm_.c:1014
#, c-format
msgid "detected on interface %s"
msgstr "Детектовано на интерфejсу %s"
-#: ../../netconnect.pm_.c:984
+#: ../../netconnect.pm_.c:1015
msgid "Cable connection"
msgstr "Кабловска конекциja"
-#: ../../netconnect.pm_.c:985
+#: ../../netconnect.pm_.c:1015
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Кабловска конекциja"
+
+#: ../../netconnect.pm_.c:1016
msgid "LAN connection"
msgstr "LAN конекциja"
-#: ../../netconnect.pm_.c:985
+#: ../../netconnect.pm_.c:1016
msgid "ethernet card(s) detected"
msgstr "детектована мрeжна картица(е)"
-#: ../../netconnect.pm_.c:990
-msgid "How do you want to connect to the Internet?"
-msgstr "Како желите да се конектуjете на интернет ?"
+#: ../../netconnect.pm_.c:1031
+#, fuzzy
+msgid "Choose"
+msgstr "Затвори"
-#: ../../netconnect.pm_.c:1007
+#: ../../netconnect.pm_.c:1048
msgid ""
"Congratulation, The network and internet configuration is finished.\n"
"\n"
@@ -6326,7 +6383,7 @@ msgstr ""
"\n"
"Конфигурациjа се сада може применити на систем."
-#: ../../netconnect.pm_.c:1010
+#: ../../netconnect.pm_.c:1051
msgid ""
"After that is done, we recommend you to restart your X\n"
"environnement to avoid hostname changing problem."
@@ -7280,6 +7337,11 @@ msgstr "Покрeће и зауставља X Фонт сервер при стартaњу и гaшeњу."
msgid "Choose which services should be automatically started at boot time"
msgstr "Изаберите које сервиси треба аутоматски да се стартују при boot-ању"
+#: ../../services.pm_.c:125
+#, fuzzy
+msgid "Services"
+msgstr "уређај"
+
#: ../../services.pm_.c:137
msgid "running"
msgstr "покренуто"
@@ -8371,30 +8433,15 @@ msgstr "Алати за лако конфигурисaње компjутерa"
msgid "Set of tools for mail, news, web, file transfer, and chat"
msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Како желите да се конектуjете на интернет ?"
+
#~ msgid "Insert a FAT formatted floppy in drive %s"
#~ msgstr "Убаците FAT форматирану празну дискету у уређај %s"
#~ msgid "This floppy is not FAT formatted"
#~ msgstr "Ова дискета ниje форматирана са FAT системом"
-#~ msgid "GB"
-#~ msgstr "GB"
-
-#~ msgid "KB"
-#~ msgstr "KB"
-
-#~ msgid "TB"
-#~ msgstr "TB"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d минутa"
-
-#~ msgid "1 minute"
-#~ msgstr "1 минут"
-
-#~ msgid "%d seconds"
-#~ msgstr "%d секунди"
-
#~ msgid "cannot fork: "
#~ msgstr "Не могу да fork-уjeм:"