summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2001-03-06 13:10:57 +0000
committerPablo Saratxaga <pablo@mandriva.com>2001-03-06 13:10:57 +0000
commit033aafb6b8debf84f4413b9ee70c9a90987b520c (patch)
treeb8f588cd5b8089678c8749fcb4a1f6bbe000275e
parentabd87d725e72364a1e78c7a6da7adfe8f9e43cb3 (diff)
downloaddrakx-033aafb6b8debf84f4413b9ee70c9a90987b520c.tar
drakx-033aafb6b8debf84f4413b9ee70c9a90987b520c.tar.gz
drakx-033aafb6b8debf84f4413b9ee70c9a90987b520c.tar.bz2
drakx-033aafb6b8debf84f4413b9ee70c9a90987b520c.tar.xz
drakx-033aafb6b8debf84f4413b9ee70c9a90987b520c.zip
corrected some typos, Updated Japanese file
-rw-r--r--perl-install/help.pm4
-rw-r--r--perl-install/share/po/DrakX.pot295
-rw-r--r--perl-install/share/po/no.po302
-rw-r--r--perl-install/share/po/sp.po302
-rwxr-xr-xperl-install/standalone/draknet8
5 files changed, 470 insertions, 441 deletions
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 04eb86cd4..b0f235e6f 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -37,12 +37,12 @@ Please choose \"Update\" if you wish to update an already installed version of L
Depend of your knowledge in GNU/Linux, you can choose one of the following levels to install or update your
Linux-Mandrake operating system:
- * Recommanded: if you have never installed a GNU/Linux operating system choose this. Installation will be
+ * Recommended: if you have never installed a GNU/Linux operating system choose this. Installation will be
be very easy and you will be asked only on few questions.
* Customized: if you are familiar enough with GNU/Linux, you may choose the primary usage (workstation, server,
- development) of your sytem. You will need to answer to more questions than in \"Recommanded\" installation
+ development) of your system. You will need to answer to more questions than in \"Recommended\" installation
class, so you need to know how GNU/Linux works to choose this installation class.
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index f0318f875..1d7b2e256 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-03-06 01:04+0100\n"
+"POT-Creation-Date: 2001-03-06 12:44+0100\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"
@@ -191,107 +191,107 @@ msgstr ""
msgid "Show all"
msgstr ""
-#: ../../Xconfigurator.pm_.c:674
+#: ../../Xconfigurator.pm_.c:675
msgid "Resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1072
+#: ../../Xconfigurator.pm_.c:1073
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1073
+#: ../../Xconfigurator.pm_.c:1074
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1074
+#: ../../Xconfigurator.pm_.c:1075
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1075
+#: ../../Xconfigurator.pm_.c:1076
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1076
+#: ../../Xconfigurator.pm_.c:1077
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1077
+#: ../../Xconfigurator.pm_.c:1078
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1078
+#: ../../Xconfigurator.pm_.c:1079
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1079
+#: ../../Xconfigurator.pm_.c:1080
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1081
+#: ../../Xconfigurator.pm_.c:1082
#, c-format
msgid "Color depth: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1082
+#: ../../Xconfigurator.pm_.c:1083
#, c-format
msgid "Resolution: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1084
+#: ../../Xconfigurator.pm_.c:1085
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1085
+#: ../../Xconfigurator.pm_.c:1086
#, c-format
msgid "XFree86 driver: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1104
+#: ../../Xconfigurator.pm_.c:1105
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1124 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1125 ../../standalone/drakboot_.c:45
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1129
+#: ../../Xconfigurator.pm_.c:1130
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1130
+#: ../../Xconfigurator.pm_.c:1131
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1132
+#: ../../Xconfigurator.pm_.c:1133
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1133
+#: ../../Xconfigurator.pm_.c:1134
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1134
+#: ../../Xconfigurator.pm_.c:1135
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1135
+#: ../../Xconfigurator.pm_.c:1136
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1136
+#: ../../Xconfigurator.pm_.c:1137
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1144
+#: ../../Xconfigurator.pm_.c:1145
#, c-format
msgid ""
"Keep the changes?\n"
@@ -300,20 +300,20 @@ msgid ""
"%s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1165
+#: ../../Xconfigurator.pm_.c:1166
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1185
+#: ../../Xconfigurator.pm_.c:1186
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1188
+#: ../../Xconfigurator.pm_.c:1189
msgid "X at startup"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1189
+#: ../../Xconfigurator.pm_.c:1190
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -498,7 +498,7 @@ msgstr ""
#: ../../any.pm_.c:160 ../../any.pm_.c:735
#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:610
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
-#: ../../standalone/draknet_.c:508
+#: ../../standalone/draknet_.c:512
msgid "Password"
msgstr ""
@@ -828,7 +828,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:266
+#: ../../bootloader.pm_.c:267
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -839,38 +839,38 @@ msgid ""
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:743
+#: ../../bootloader.pm_.c:744
msgid "Welcome to GRUB the operating system chooser!"
msgstr ""
-#: ../../bootloader.pm_.c:744
+#: ../../bootloader.pm_.c:745
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr ""
-#: ../../bootloader.pm_.c:745
+#: ../../bootloader.pm_.c:746
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr ""
-#: ../../bootloader.pm_.c:746
+#: ../../bootloader.pm_.c:747
msgid "commands before booting, or 'c' for a command-line."
msgstr ""
-#: ../../bootloader.pm_.c:747
+#: ../../bootloader.pm_.c:748
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr ""
-#: ../../bootloader.pm_.c:751
+#: ../../bootloader.pm_.c:752
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:843
+#: ../../bootloader.pm_.c:844
msgid "Desktop"
msgstr ""
-#: ../../bootloader.pm_.c:843
+#: ../../bootloader.pm_.c:844
msgid "Start Menu"
msgstr ""
@@ -982,7 +982,7 @@ msgstr ""
msgid "System mode"
msgstr ""
-#: ../../bootlook.pm_.c:191
+#: ../../bootlook.pm_.c:191 ../../standalone/draknet_.c:437
msgid "OK"
msgstr ""
@@ -990,6 +990,7 @@ msgstr ""
#: ../../interactive.pm_.c:105 ../../interactive.pm_.c:240
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:297
#: ../../my_gtk.pm_.c:300 ../../my_gtk.pm_.c:554
+#: ../../standalone/draknet_.c:449
msgid "Cancel"
msgstr ""
@@ -1001,34 +1002,34 @@ msgstr ""
msgid "can not open /etc/sysconfig/autologin for reading: $!"
msgstr ""
-#: ../../common.pm_.c:615
+#: ../../common.pm_.c:616
msgid "GB"
msgstr ""
-#: ../../common.pm_.c:615
+#: ../../common.pm_.c:616
msgid "KB"
msgstr ""
-#: ../../common.pm_.c:615 ../../diskdrake.pm_.c:654
+#: ../../common.pm_.c:616 ../../diskdrake.pm_.c:654
#: ../../install_steps_graphical.pm_.c:287
#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr ""
-#: ../../common.pm_.c:623
+#: ../../common.pm_.c:624
msgid "TB"
msgstr ""
-#: ../../common.pm_.c:636
+#: ../../common.pm_.c:637
#, c-format
msgid "%d minutes"
msgstr ""
-#: ../../common.pm_.c:638
+#: ../../common.pm_.c:639
msgid "1 minute"
msgstr ""
-#: ../../common.pm_.c:640
+#: ../../common.pm_.c:641
#, c-format
msgid "%d seconds"
msgstr ""
@@ -1744,15 +1745,15 @@ msgid ""
"levels to install or update your\n"
"Linux-Mandrake operating system:\n"
"\n"
-"\t* Recommanded: if you have never installed a GNU/Linux operating system "
+"\t* Recommended: if you have never installed a GNU/Linux operating system "
"choose this. Installation will be\n"
"\t be very easy and you will be asked only on few questions.\n"
"\n"
"\n"
"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
"the primary usage (workstation, server,\n"
-"\t development) of your sytem. You will need to answer to more questions "
-"than in \"Recommanded\" installation\n"
+"\t development) of your system. You will need to answer to more questions "
+"than in \"Recommended\" installation\n"
"\t class, so you need to know how GNU/Linux works to choose this "
"installation class.\n"
"\n"
@@ -2880,25 +2881,25 @@ msgstr ""
msgid "Install system"
msgstr ""
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
+#: ../../install2.pm_.c:49 ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:806
+msgid "Set root password"
msgstr ""
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:739
-msgid "Summary"
+#: ../../install2.pm_.c:50
+msgid "Add a user"
msgstr ""
-#: ../../install2.pm_.c:52
-msgid "Configure services"
+#: ../../install2.pm_.c:51
+msgid "Configure networking"
msgstr ""
-#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:805
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Set root password"
+#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:739
+msgid "Summary"
msgstr ""
#: ../../install2.pm_.c:54
-msgid "Add a user"
+msgid "Configure services"
msgstr ""
#: ../../install2.pm_.c:56
@@ -3914,7 +3915,7 @@ msgid "Insert a blank floppy in drive %s"
msgstr ""
#: ../../install_steps_interactive.pm_.c:1028
-#: ../../install_steps_interactive.pm_.c:1059
+#: ../../install_steps_interactive.pm_.c:1060
msgid "Creating auto install floppy"
msgstr ""
@@ -4428,35 +4429,35 @@ msgstr ""
msgid "Please fill or check the field below"
msgstr ""
-#: ../../netconnect.pm_.c:226 ../../standalone/draknet_.c:491
+#: ../../netconnect.pm_.c:226 ../../standalone/draknet_.c:495
msgid "Card IRQ"
msgstr ""
-#: ../../netconnect.pm_.c:227 ../../standalone/draknet_.c:492
+#: ../../netconnect.pm_.c:227 ../../standalone/draknet_.c:496
msgid "Card mem (DMA)"
msgstr ""
-#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:497
msgid "Card IO"
msgstr ""
-#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:494
+#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:498
msgid "Card IO_0"
msgstr ""
-#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:495
+#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:499
msgid "Card IO_1"
msgstr ""
-#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:496
+#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:500
msgid "Your personal phone number"
msgstr ""
-#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:497
+#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:501
msgid "Provider name (ex provider.net)"
msgstr ""
-#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:498
+#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:502
msgid "Provider phone number"
msgstr ""
@@ -4468,15 +4469,15 @@ msgstr ""
msgid "Provider dns 2"
msgstr ""
-#: ../../netconnect.pm_.c:236 ../../standalone/draknet_.c:503
+#: ../../netconnect.pm_.c:236 ../../standalone/draknet_.c:507
msgid "Dialing mode"
msgstr ""
-#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:501
+#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:505
msgid "Account Login (user name)"
msgstr ""
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:502
+#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:506
msgid "Account Password"
msgstr ""
@@ -4592,43 +4593,43 @@ msgstr ""
msgid "Dialup options"
msgstr ""
-#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:505
+#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:509
msgid "Connection name"
msgstr ""
-#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:506
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:510
msgid "Phone number"
msgstr ""
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:507
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:511
msgid "Login ID"
msgstr ""
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Authentication"
msgstr ""
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "PAP"
msgstr ""
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Script-based"
msgstr ""
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Terminal-based"
msgstr ""
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:510
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:514
msgid "Domain name"
msgstr ""
-#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:511
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:515
msgid "First DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:512
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:516
msgid "Second DNS Server"
msgstr ""
@@ -4855,15 +4856,15 @@ msgid ""
"Would you like to setup the Internet Connection Sharing?\n"
msgstr ""
-#: ../../network.pm_.c:255
+#: ../../network.pm_.c:252
msgid "no network card found"
msgstr ""
-#: ../../network.pm_.c:279 ../../network.pm_.c:374
+#: ../../network.pm_.c:276 ../../network.pm_.c:371
msgid "Configuring network"
msgstr ""
-#: ../../network.pm_.c:280
+#: ../../network.pm_.c:277
msgid ""
"Please enter your host name if you know it.\n"
"Some DHCP servers require the hostname to work.\n"
@@ -4871,11 +4872,11 @@ msgid ""
"such as ``mybox.mylab.myco.com''."
msgstr ""
-#: ../../network.pm_.c:284 ../../network.pm_.c:379
+#: ../../network.pm_.c:281 ../../network.pm_.c:376
msgid "Host name"
msgstr ""
-#: ../../network.pm_.c:306
+#: ../../network.pm_.c:303
msgid ""
"WARNING: This device has been previously configured to connect to the "
"Internet.\n"
@@ -4883,45 +4884,45 @@ msgid ""
"Modifying the fields below will override this configuration."
msgstr ""
-#: ../../network.pm_.c:311
+#: ../../network.pm_.c:308
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
"notation (for example, 1.2.3.4)."
msgstr ""
-#: ../../network.pm_.c:320 ../../network.pm_.c:321
+#: ../../network.pm_.c:317 ../../network.pm_.c:318
#, c-format
msgid "Configuring network device %s"
msgstr ""
-#: ../../network.pm_.c:321
+#: ../../network.pm_.c:318
msgid " (driver $module)"
msgstr ""
-#: ../../network.pm_.c:323 ../../standalone/draknet_.c:212
-#: ../../standalone/draknet_.c:394
+#: ../../network.pm_.c:320 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:390
msgid "IP address"
msgstr ""
-#: ../../network.pm_.c:324 ../../standalone/draknet_.c:395
+#: ../../network.pm_.c:321 ../../standalone/draknet_.c:391
msgid "Netmask"
msgstr ""
-#: ../../network.pm_.c:325
+#: ../../network.pm_.c:322
msgid "(bootp/dhcp)"
msgstr ""
-#: ../../network.pm_.c:325
+#: ../../network.pm_.c:322
msgid "Automatic IP"
msgstr ""
-#: ../../network.pm_.c:346 ../../printerdrake.pm_.c:98
+#: ../../network.pm_.c:343 ../../printerdrake.pm_.c:98
#: ../../printerdrake.pm_.c:417
msgid "IP address should be in format 1.2.3.4"
msgstr ""
-#: ../../network.pm_.c:375
+#: ../../network.pm_.c:372
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -4929,35 +4930,35 @@ msgid ""
"You may also enter the IP address of the gateway if you have one"
msgstr ""
-#: ../../network.pm_.c:380
+#: ../../network.pm_.c:377
msgid "DNS server"
msgstr ""
-#: ../../network.pm_.c:381 ../../standalone/draknet_.c:504
+#: ../../network.pm_.c:378 ../../standalone/draknet_.c:508
msgid "Gateway"
msgstr ""
-#: ../../network.pm_.c:383
+#: ../../network.pm_.c:380
msgid "Gateway device"
msgstr ""
-#: ../../network.pm_.c:394
+#: ../../network.pm_.c:391
msgid "Proxies configuration"
msgstr ""
-#: ../../network.pm_.c:395
+#: ../../network.pm_.c:392
msgid "HTTP proxy"
msgstr ""
-#: ../../network.pm_.c:396
+#: ../../network.pm_.c:393
msgid "FTP proxy"
msgstr ""
-#: ../../network.pm_.c:399
+#: ../../network.pm_.c:396
msgid "Proxy should be http://..."
msgstr ""
-#: ../../network.pm_.c:400
+#: ../../network.pm_.c:397
msgid "Proxy should be ftp://..."
msgstr ""
@@ -5703,159 +5704,163 @@ msgid ""
"Area Network, using automatic network configuration (DHCP)."
msgstr ""
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:70
#, c-format
msgid "Network configuration (%d adapters)"
msgstr ""
-#: ../../standalone/draknet_.c:81 ../../standalone/draknet_.c:478
+#: ../../standalone/draknet_.c:77 ../../standalone/draknet_.c:482
msgid "Profile: "
msgstr ""
-#: ../../standalone/draknet_.c:89
+#: ../../standalone/draknet_.c:85
msgid "Del profile..."
msgstr ""
-#: ../../standalone/draknet_.c:94
+#: ../../standalone/draknet_.c:90
msgid "Profile to delete:"
msgstr ""
-#: ../../standalone/draknet_.c:121
+#: ../../standalone/draknet_.c:117
msgid "New profile..."
msgstr ""
-#: ../../standalone/draknet_.c:126
+#: ../../standalone/draknet_.c:122
msgid "Name of the profile to create:"
msgstr ""
-#: ../../standalone/draknet_.c:151
+#: ../../standalone/draknet_.c:147
msgid "Hostname: "
msgstr ""
-#: ../../standalone/draknet_.c:158
+#: ../../standalone/draknet_.c:154
msgid "Internet access"
msgstr ""
-#: ../../standalone/draknet_.c:171
+#: ../../standalone/draknet_.c:167
msgid "Type:"
msgstr ""
-#: ../../standalone/draknet_.c:174
+#: ../../standalone/draknet_.c:170
msgid "Gateway:"
msgstr ""
-#: ../../standalone/draknet_.c:174
+#: ../../standalone/draknet_.c:170
msgid "Interface:"
msgstr ""
-#: ../../standalone/draknet_.c:178
+#: ../../standalone/draknet_.c:174
msgid "Status:"
msgstr ""
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:176
msgid "not connected"
msgstr ""
-#: ../../standalone/draknet_.c:183
+#: ../../standalone/draknet_.c:179
msgid "Connect..."
msgstr ""
-#: ../../standalone/draknet_.c:189
+#: ../../standalone/draknet_.c:185
msgid "Configure Internet Access..."
msgstr ""
-#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:380
+#: ../../standalone/draknet_.c:193 ../../standalone/draknet_.c:376
msgid "LAN configuration"
msgstr ""
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
msgid "Adapter"
msgstr ""
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
msgid "Driver"
msgstr ""
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
msgid "Interface"
msgstr ""
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
msgid "Protocole"
msgstr ""
-#: ../../standalone/draknet_.c:225
+#: ../../standalone/draknet_.c:221
msgid "Configure Local Area Network..."
msgstr ""
-#: ../../standalone/draknet_.c:268
+#: ../../standalone/draknet_.c:264
msgid ""
"\n"
"Warning:\n"
"Applying the changes while running may crash your X environnement."
msgstr ""
-#: ../../standalone/draknet_.c:271
+#: ../../standalone/draknet_.c:267
#, c-format
msgid ""
"\n"
"If you continue, I will shut down your %s environnement"
msgstr ""
-#: ../../standalone/draknet_.c:384
+#: ../../standalone/draknet_.c:380
msgid "LAN Configuration"
msgstr ""
-#: ../../standalone/draknet_.c:390
+#: ../../standalone/draknet_.c:386
#, c-format
msgid "Adapter %s: %s"
msgstr ""
-#: ../../standalone/draknet_.c:396
+#: ../../standalone/draknet_.c:392
msgid "Boot Protocol"
msgstr ""
-#: ../../standalone/draknet_.c:397
+#: ../../standalone/draknet_.c:393
msgid "Started on boot"
msgstr ""
-#: ../../standalone/draknet_.c:398
+#: ../../standalone/draknet_.c:394
msgid "DHCP client"
msgstr ""
-#: ../../standalone/draknet_.c:426
-msgid "eth$_"
+#: ../../standalone/draknet_.c:430 ../../standalone/draknet_.c:434
+msgid "Disable"
msgstr ""
-#: ../../standalone/draknet_.c:467
-msgid "Internet connection configuration"
+#: ../../standalone/draknet_.c:430 ../../standalone/draknet_.c:434
+msgid "Enable"
msgstr ""
#: ../../standalone/draknet_.c:471
+msgid "Internet connection configuration"
+msgstr ""
+
+#: ../../standalone/draknet_.c:475
msgid "Internet Connection Configuration"
msgstr ""
-#: ../../standalone/draknet_.c:480
+#: ../../standalone/draknet_.c:484
msgid "Connection type: "
msgstr ""
-#: ../../standalone/draknet_.c:486
+#: ../../standalone/draknet_.c:490
msgid "Parameters"
msgstr ""
-#: ../../standalone/draknet_.c:499
+#: ../../standalone/draknet_.c:503
msgid "Provider dns 1 (optional)"
msgstr ""
-#: ../../standalone/draknet_.c:500
+#: ../../standalone/draknet_.c:504
msgid "Provider dns 2 (optional)"
msgstr ""
-#: ../../standalone/draknet_.c:513
+#: ../../standalone/draknet_.c:517
msgid "Ethernet Card"
msgstr ""
-#: ../../standalone/draknet_.c:514
+#: ../../standalone/draknet_.c:518
msgid "DHCP Client"
msgstr ""
@@ -5902,7 +5907,11 @@ msgstr ""
msgid "Setting security level"
msgstr ""
-#: ../../standalone/drakxconf_.c:20
+#: ../../standalone/drakxconf_.c:40
+msgid "Control Center"
+msgstr ""
+
+#: ../../standalone/drakxconf_.c:41
msgid "Choose the tool you want to use"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index ce5e3f157..2817d2c0e 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-03-06 01:04+0100\n"
+"POT-Creation-Date: 2001-03-06 12:38+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -213,107 +213,107 @@ msgstr "Ekspert modus"
msgid "Show all"
msgstr "Vis alle"
-#: ../../Xconfigurator.pm_.c:674
+#: ../../Xconfigurator.pm_.c:675
msgid "Resolutions"
msgstr "Opplјsninger"
-#: ../../Xconfigurator.pm_.c:1072
+#: ../../Xconfigurator.pm_.c:1073
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../../Xconfigurator.pm_.c:1073
+#: ../../Xconfigurator.pm_.c:1074
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../../Xconfigurator.pm_.c:1074
+#: ../../Xconfigurator.pm_.c:1075
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../../Xconfigurator.pm_.c:1075
+#: ../../Xconfigurator.pm_.c:1076
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../../Xconfigurator.pm_.c:1076
+#: ../../Xconfigurator.pm_.c:1077
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../../Xconfigurator.pm_.c:1077
+#: ../../Xconfigurator.pm_.c:1078
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../../Xconfigurator.pm_.c:1078
+#: ../../Xconfigurator.pm_.c:1079
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../../Xconfigurator.pm_.c:1079
+#: ../../Xconfigurator.pm_.c:1080
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../../Xconfigurator.pm_.c:1081
+#: ../../Xconfigurator.pm_.c:1082
#, c-format
msgid "Color depth: %s\n"
msgstr "Fargedybde: %s\n"
-#: ../../Xconfigurator.pm_.c:1082
+#: ../../Xconfigurator.pm_.c:1083
#, c-format
msgid "Resolution: %s\n"
msgstr "Opplјsning: %s\n"
-#: ../../Xconfigurator.pm_.c:1084
+#: ../../Xconfigurator.pm_.c:1085
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../../Xconfigurator.pm_.c:1085
+#: ../../Xconfigurator.pm_.c:1086
#, c-format
msgid "XFree86 driver: %s\n"
msgstr "XFree86 driver: %s\n"
-#: ../../Xconfigurator.pm_.c:1104
+#: ../../Xconfigurator.pm_.c:1105
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../../Xconfigurator.pm_.c:1124 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1125 ../../standalone/drakboot_.c:45
msgid "What do you want to do?"
msgstr "Hva јnsker du х gjјre?"
-#: ../../Xconfigurator.pm_.c:1129
+#: ../../Xconfigurator.pm_.c:1130
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../../Xconfigurator.pm_.c:1130
+#: ../../Xconfigurator.pm_.c:1131
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../../Xconfigurator.pm_.c:1132
+#: ../../Xconfigurator.pm_.c:1133
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:1133
+#: ../../Xconfigurator.pm_.c:1134
msgid "Change Resolution"
msgstr "Endre opplјsning"
-#: ../../Xconfigurator.pm_.c:1134
+#: ../../Xconfigurator.pm_.c:1135
msgid "Show information"
msgstr "Vis informasjon"
-#: ../../Xconfigurator.pm_.c:1135
+#: ../../Xconfigurator.pm_.c:1136
msgid "Test again"
msgstr "Test igjen"
-#: ../../Xconfigurator.pm_.c:1136
+#: ../../Xconfigurator.pm_.c:1137
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:1144
+#: ../../Xconfigurator.pm_.c:1145
#, c-format
msgid ""
"Keep the changes?\n"
@@ -326,20 +326,20 @@ msgstr ""
"\n"
"%s"
-#: ../../Xconfigurator.pm_.c:1165
+#: ../../Xconfigurator.pm_.c:1166
#, 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:1185
+#: ../../Xconfigurator.pm_.c:1186
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk sх Ctrl-Alt-BackSpace"
-#: ../../Xconfigurator.pm_.c:1188
+#: ../../Xconfigurator.pm_.c:1189
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../../Xconfigurator.pm_.c:1189
+#: ../../Xconfigurator.pm_.c:1190
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -528,7 +528,7 @@ msgstr "Forsinkelse fјr oppstart av standard bilde"
#: ../../any.pm_.c:160 ../../any.pm_.c:735
#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:610
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
-#: ../../standalone/draknet_.c:508
+#: ../../standalone/draknet_.c:512
msgid "Password"
msgstr "Passord"
@@ -885,7 +885,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:266
+#: ../../bootloader.pm_.c:267
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -909,7 +909,7 @@ msgstr ""
# and only one line per string for the GRUB messages
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:743
+#: ../../bootloader.pm_.c:744
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Velkommen til GRUB, operativsystem-velgeren!"
@@ -921,7 +921,7 @@ msgstr "Velkommen til GRUB, operativsystem-velgeren!"
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:744
+#: ../../bootloader.pm_.c:745
#, 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."
@@ -934,7 +934,7 @@ msgstr "Bruk %c og %c tastene for х velge hvilken inngang som er markert."
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:745
+#: ../../bootloader.pm_.c:746
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
@@ -946,7 +946,7 @@ msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:746
+#: ../../bootloader.pm_.c:747
msgid "commands before booting, or 'c' for a command-line."
msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
@@ -958,21 +958,21 @@ msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
# The lines must fit on screen, aka length < 80
# and only one line per string for the GRUB messages
#
-#: ../../bootloader.pm_.c:747
+#: ../../bootloader.pm_.c:748
#, 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:751
+#: ../../bootloader.pm_.c:752
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:843
+#: ../../bootloader.pm_.c:844
msgid "Desktop"
msgstr "Skrivebord"
-#: ../../bootloader.pm_.c:843
+#: ../../bootloader.pm_.c:844
msgid "Start Menu"
msgstr "Startmeny"
@@ -1091,7 +1091,7 @@ msgstr ""
msgid "System mode"
msgstr ""
-#: ../../bootlook.pm_.c:191
+#: ../../bootlook.pm_.c:191 ../../standalone/draknet_.c:437
msgid "OK"
msgstr ""
@@ -1099,6 +1099,7 @@ msgstr ""
#: ../../interactive.pm_.c:105 ../../interactive.pm_.c:240
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:297
#: ../../my_gtk.pm_.c:300 ../../my_gtk.pm_.c:554
+#: ../../standalone/draknet_.c:449
msgid "Cancel"
msgstr "Avbryt"
@@ -1110,34 +1111,34 @@ msgstr ""
msgid "can not open /etc/sysconfig/autologin for reading: $!"
msgstr ""
-#: ../../common.pm_.c:615
+#: ../../common.pm_.c:616
msgid "GB"
msgstr ""
-#: ../../common.pm_.c:615
+#: ../../common.pm_.c:616
msgid "KB"
msgstr ""
-#: ../../common.pm_.c:615 ../../diskdrake.pm_.c:654
+#: ../../common.pm_.c:616 ../../diskdrake.pm_.c:654
#: ../../install_steps_graphical.pm_.c:287
#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr "MB"
-#: ../../common.pm_.c:623
+#: ../../common.pm_.c:624
msgid "TB"
msgstr ""
-#: ../../common.pm_.c:636
+#: ../../common.pm_.c:637
#, c-format
msgid "%d minutes"
msgstr "%d minutter"
-#: ../../common.pm_.c:638
+#: ../../common.pm_.c:639
msgid "1 minute"
msgstr "1 minutt"
-#: ../../common.pm_.c:640
+#: ../../common.pm_.c:641
#, c-format
msgid "%d seconds"
msgstr "%d sekunder"
@@ -1909,15 +1910,15 @@ msgid ""
"levels to install or update your\n"
"Linux-Mandrake operating system:\n"
"\n"
-"\t* Recommanded: if you have never installed a GNU/Linux operating system "
+"\t* Recommended: if you have never installed a GNU/Linux operating system "
"choose this. Installation will be\n"
"\t be very easy and you will be asked only on few questions.\n"
"\n"
"\n"
"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
"the primary usage (workstation, server,\n"
-"\t development) of your sytem. You will need to answer to more questions "
-"than in \"Recommanded\" installation\n"
+"\t development) of your system. You will need to answer to more questions "
+"than in \"Recommended\" installation\n"
"\t class, so you need to know how GNU/Linux works to choose this "
"installation class.\n"
"\n"
@@ -3789,27 +3790,27 @@ msgstr "Velg pakker for installering"
msgid "Install system"
msgstr "Installer systemet"
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:49 ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:806
+msgid "Set root password"
+msgstr "Sett root-passord"
+
+#: ../../install2.pm_.c:50
+msgid "Add a user"
+msgstr "Legg til en bruker"
+
+#: ../../install2.pm_.c:51
msgid "Configure networking"
msgstr "Konfigurer nettverk"
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:739
+#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:739
msgid "Summary"
msgstr ""
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:54
msgid "Configure services"
msgstr "Konfigurer tjenester"
-#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:805
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Set root password"
-msgstr "Sett root-passord"
-
-#: ../../install2.pm_.c:54
-msgid "Add a user"
-msgstr "Legg til en bruker"
-
#: ../../install2.pm_.c:56
msgid "Create a bootdisk"
msgstr "Opprett en oppstartdiskett"
@@ -5106,7 +5107,7 @@ msgid "Insert a blank floppy in drive %s"
msgstr "Sett inn en tom diskett i stasjon %s"
#: ../../install_steps_interactive.pm_.c:1028
-#: ../../install_steps_interactive.pm_.c:1059
+#: ../../install_steps_interactive.pm_.c:1060
msgid "Creating auto install floppy"
msgstr "Oppretter diskett for autoinstallasjon"
@@ -5641,35 +5642,35 @@ msgstr "Konfigurasjon tilknytning."
msgid "Please fill or check the field below"
msgstr "Vennnligst fyll eller merk feltet under"
-#: ../../netconnect.pm_.c:226 ../../standalone/draknet_.c:491
+#: ../../netconnect.pm_.c:226 ../../standalone/draknet_.c:495
msgid "Card IRQ"
msgstr "Kort IRQ"
-#: ../../netconnect.pm_.c:227 ../../standalone/draknet_.c:492
+#: ../../netconnect.pm_.c:227 ../../standalone/draknet_.c:496
msgid "Card mem (DMA)"
msgstr "Kort mem (DMA)"
-#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:497
msgid "Card IO"
msgstr "Kort IO"
-#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:494
+#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:498
msgid "Card IO_0"
msgstr "Kort IO_0"
-#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:495
+#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:499
msgid "Card IO_1"
msgstr "Kort IO_1"
-#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:496
+#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:500
msgid "Your personal phone number"
msgstr "Ditt telefonnummer"
-#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:497
+#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:501
msgid "Provider name (ex provider.net)"
msgstr "Navn tilbyder (f.eks. tilbyder.net)"
-#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:498
+#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:502
msgid "Provider phone number"
msgstr "Telefonnummer tilbyder"
@@ -5681,15 +5682,15 @@ msgstr "Tilbyder dns 1"
msgid "Provider dns 2"
msgstr "Tilbyder dns 2"
-#: ../../netconnect.pm_.c:236 ../../standalone/draknet_.c:503
+#: ../../netconnect.pm_.c:236 ../../standalone/draknet_.c:507
msgid "Dialing mode"
msgstr "Oppringningsmodus"
-#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:501
+#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:505
msgid "Account Login (user name)"
msgstr "Logg inn (brukernavn)"
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:502
+#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:506
msgid "Account Password"
msgstr "Passord"
@@ -5817,43 +5818,43 @@ msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:505
+#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:509
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:506
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:510
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:507
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:511
msgid "Login ID"
msgstr "Login ID"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:510
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:514
msgid "Domain name"
msgstr "Domenenavn"
-#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:511
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:515
msgid "First DNS Server"
msgstr "Fјrste DNS-tjener"
-#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:512
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:516
msgid "Second DNS Server"
msgstr "Andre DNS-tjener"
@@ -6109,15 +6110,15 @@ msgstr ""
"\n"
"иnsker du х sette opp deling av Internett-tilknytning?\n"
-#: ../../network.pm_.c:255
+#: ../../network.pm_.c:252
msgid "no network card found"
msgstr "ingen nettverkskort funnet"
-#: ../../network.pm_.c:279 ../../network.pm_.c:374
+#: ../../network.pm_.c:276 ../../network.pm_.c:371
msgid "Configuring network"
msgstr "Konfigurerer nettverk"
-#: ../../network.pm_.c:280
+#: ../../network.pm_.c:277
msgid ""
"Please enter your host name if you know it.\n"
"Some DHCP servers require the hostname to work.\n"
@@ -6129,11 +6130,11 @@ msgstr ""
"Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
"som ``minboks.mittlab.mittfirma.no''."
-#: ../../network.pm_.c:284 ../../network.pm_.c:379
+#: ../../network.pm_.c:281 ../../network.pm_.c:376
msgid "Host name"
msgstr "Vertsnavn"
-#: ../../network.pm_.c:306
+#: ../../network.pm_.c:303
#, fuzzy
msgid ""
"WARNING: This device has been previously configured to connect to the "
@@ -6146,7 +6147,7 @@ msgstr ""
"Trykk OK for х beholde enhetens konfigurasjon.\n"
"Modifisering av feltene nedenfor vil overskrive denne konfigurasjonen."
-#: ../../network.pm_.c:311
+#: ../../network.pm_.c:308
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -6156,38 +6157,38 @@ msgstr ""
"Hvert element bјr entres som en IP-adresse i punkt-desimal\n"
"notasjon (f.eks, 1.2.3.4)."
-#: ../../network.pm_.c:320 ../../network.pm_.c:321
+#: ../../network.pm_.c:317 ../../network.pm_.c:318
#, c-format
msgid "Configuring network device %s"
msgstr "Konfigurerer nettverksenhet %s"
-#: ../../network.pm_.c:321
+#: ../../network.pm_.c:318
msgid " (driver $module)"
msgstr ""
-#: ../../network.pm_.c:323 ../../standalone/draknet_.c:212
-#: ../../standalone/draknet_.c:394
+#: ../../network.pm_.c:320 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:390
msgid "IP address"
msgstr "IP-adresse"
-#: ../../network.pm_.c:324 ../../standalone/draknet_.c:395
+#: ../../network.pm_.c:321 ../../standalone/draknet_.c:391
msgid "Netmask"
msgstr "Nettmaske"
-#: ../../network.pm_.c:325
+#: ../../network.pm_.c:322
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../network.pm_.c:325
+#: ../../network.pm_.c:322
msgid "Automatic IP"
msgstr "Automatisk IP"
-#: ../../network.pm_.c:346 ../../printerdrake.pm_.c:98
+#: ../../network.pm_.c:343 ../../printerdrake.pm_.c:98
#: ../../printerdrake.pm_.c:417
msgid "IP address should be in format 1.2.3.4"
msgstr "IP-adresse bјr vцre i format 1.2.3.4"
-#: ../../network.pm_.c:375
+#: ../../network.pm_.c:372
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -6199,35 +6200,35 @@ msgstr ""
"sх som ``minboks.mittlab.mittfirma.no''.\n"
"Du kan ogsх entre IP-adressen til gateway'en hvis du har en"
-#: ../../network.pm_.c:380
+#: ../../network.pm_.c:377
msgid "DNS server"
msgstr "DNS-tjener"
-#: ../../network.pm_.c:381 ../../standalone/draknet_.c:504
+#: ../../network.pm_.c:378 ../../standalone/draknet_.c:508
msgid "Gateway"
msgstr "Gateway"
-#: ../../network.pm_.c:383
+#: ../../network.pm_.c:380
msgid "Gateway device"
msgstr "Gateway-enhet"
-#: ../../network.pm_.c:394
+#: ../../network.pm_.c:391
msgid "Proxies configuration"
msgstr "Konfigurasjon proxy"
-#: ../../network.pm_.c:395
+#: ../../network.pm_.c:392
msgid "HTTP proxy"
msgstr "HTTP-proxy"
-#: ../../network.pm_.c:396
+#: ../../network.pm_.c:393
msgid "FTP proxy"
msgstr "FTP-proxy"
-#: ../../network.pm_.c:399
+#: ../../network.pm_.c:396
msgid "Proxy should be http://..."
msgstr "Proxy burde vцre http://..."
-#: ../../network.pm_.c:400
+#: ../../network.pm_.c:397
msgid "Proxy should be ftp://..."
msgstr "Proxy burde vцre ftp://..."
@@ -7115,168 +7116,172 @@ msgstr ""
"Du kan nх dele Internett-tilkobling med andre maskiner pх ditt lokale "
"nettverk ved х bruke automatisk nettverkskonfigurasjon (DHCP)."
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:70
#, fuzzy, c-format
msgid "Network configuration (%d adapters)"
msgstr "Nettverkskonfigurasjon"
-#: ../../standalone/draknet_.c:81 ../../standalone/draknet_.c:478
+#: ../../standalone/draknet_.c:77 ../../standalone/draknet_.c:482
msgid "Profile: "
msgstr "Profil: "
-#: ../../standalone/draknet_.c:89
+#: ../../standalone/draknet_.c:85
msgid "Del profile..."
msgstr ""
-#: ../../standalone/draknet_.c:94
+#: ../../standalone/draknet_.c:90
msgid "Profile to delete:"
msgstr ""
-#: ../../standalone/draknet_.c:121
+#: ../../standalone/draknet_.c:117
msgid "New profile..."
msgstr ""
-#: ../../standalone/draknet_.c:126
+#: ../../standalone/draknet_.c:122
msgid "Name of the profile to create:"
msgstr ""
-#: ../../standalone/draknet_.c:151
+#: ../../standalone/draknet_.c:147
msgid "Hostname: "
msgstr "Vertsnavn: "
-#: ../../standalone/draknet_.c:158
+#: ../../standalone/draknet_.c:154
msgid "Internet access"
msgstr "Internett-tilgang"
-#: ../../standalone/draknet_.c:171
+#: ../../standalone/draknet_.c:167
msgid "Type:"
msgstr "Type:"
-#: ../../standalone/draknet_.c:174
+#: ../../standalone/draknet_.c:170
msgid "Gateway:"
msgstr "Gateway:"
-#: ../../standalone/draknet_.c:174
+#: ../../standalone/draknet_.c:170
msgid "Interface:"
msgstr "Grensesnitt:"
-#: ../../standalone/draknet_.c:178
+#: ../../standalone/draknet_.c:174
msgid "Status:"
msgstr "Status:"
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:176
msgid "not connected"
msgstr "ikke tilkoblet"
-#: ../../standalone/draknet_.c:183
+#: ../../standalone/draknet_.c:179
msgid "Connect..."
msgstr "Koble til..."
-#: ../../standalone/draknet_.c:189
+#: ../../standalone/draknet_.c:185
#, fuzzy
msgid "Configure Internet Access..."
msgstr "Konfigurer tjenester"
-#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:380
+#: ../../standalone/draknet_.c:193 ../../standalone/draknet_.c:376
msgid "LAN configuration"
msgstr "LAN-konfigurasjon"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
#, fuzzy
msgid "Adapter"
msgstr "Oppdater"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
#, fuzzy
msgid "Driver"
msgstr "Tjener"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
#, fuzzy
msgid "Interface"
msgstr "Grensesnitt:"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
msgid "Protocole"
msgstr ""
-#: ../../standalone/draknet_.c:225
+#: ../../standalone/draknet_.c:221
#, fuzzy
msgid "Configure Local Area Network..."
msgstr "Konfigurer lokalt nettverk"
-#: ../../standalone/draknet_.c:268
+#: ../../standalone/draknet_.c:264
msgid ""
"\n"
"Warning:\n"
"Applying the changes while running may crash your X environnement."
msgstr ""
-#: ../../standalone/draknet_.c:271
+#: ../../standalone/draknet_.c:267
#, c-format
msgid ""
"\n"
"If you continue, I will shut down your %s environnement"
msgstr ""
-#: ../../standalone/draknet_.c:384
+#: ../../standalone/draknet_.c:380
#, fuzzy
msgid "LAN Configuration"
msgstr "LAN-konfigurasjon"
-#: ../../standalone/draknet_.c:390
+#: ../../standalone/draknet_.c:386
#, c-format
msgid "Adapter %s: %s"
msgstr ""
-#: ../../standalone/draknet_.c:396
+#: ../../standalone/draknet_.c:392
msgid "Boot Protocol"
msgstr ""
-#: ../../standalone/draknet_.c:397
+#: ../../standalone/draknet_.c:393
msgid "Started on boot"
msgstr ""
-#: ../../standalone/draknet_.c:398
+#: ../../standalone/draknet_.c:394
msgid "DHCP client"
msgstr ""
-#: ../../standalone/draknet_.c:426
-msgid "eth$_"
-msgstr ""
+#: ../../standalone/draknet_.c:430 ../../standalone/draknet_.c:434
+msgid "Disable"
+msgstr "Slх av"
-#: ../../standalone/draknet_.c:467
+#: ../../standalone/draknet_.c:430 ../../standalone/draknet_.c:434
+msgid "Enable"
+msgstr "Slх pх"
+
+#: ../../standalone/draknet_.c:471
msgid "Internet connection configuration"
msgstr "Internett tilkobling konfigurasjon"
-#: ../../standalone/draknet_.c:471
+#: ../../standalone/draknet_.c:475
msgid "Internet Connection Configuration"
msgstr "Internett tilkobling konfigurasjon"
-#: ../../standalone/draknet_.c:480
+#: ../../standalone/draknet_.c:484
#, fuzzy
msgid "Connection type: "
msgstr "Navn tilknytning"
-#: ../../standalone/draknet_.c:486
+#: ../../standalone/draknet_.c:490
msgid "Parameters"
msgstr ""
-#: ../../standalone/draknet_.c:499
+#: ../../standalone/draknet_.c:503
#, fuzzy
msgid "Provider dns 1 (optional)"
msgstr "Tilbyder dns 1"
-#: ../../standalone/draknet_.c:500
+#: ../../standalone/draknet_.c:504
#, fuzzy
msgid "Provider dns 2 (optional)"
msgstr "Tilbyder dns 2"
-#: ../../standalone/draknet_.c:513
+#: ../../standalone/draknet_.c:517
msgid "Ethernet Card"
msgstr ""
-#: ../../standalone/draknet_.c:514
+#: ../../standalone/draknet_.c:518
msgid "DHCP Client"
msgstr ""
@@ -7337,7 +7342,12 @@ msgstr ""
msgid "Setting security level"
msgstr "Setter sikkerhetsnivх"
-#: ../../standalone/drakxconf_.c:20
+#: ../../standalone/drakxconf_.c:40
+#, fuzzy
+msgid "Control Center"
+msgstr "Koble opp mot Internett"
+
+#: ../../standalone/drakxconf_.c:41
msgid "Choose the tool you want to use"
msgstr "Velg verktјyet du јnsker х bruke"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index dada8d66a..ef429577b 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-03-06 01:04+0100\n"
+"POT-Creation-Date: 2001-03-06 12:38+0100\n"
"PO-Revision-Date: 2001-01-06 17:46+0200\n"
"Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
"Language-Team: Serbian (cyrillic)\n"
@@ -210,107 +210,107 @@ msgstr "Експерт мод"
msgid "Show all"
msgstr "Прикажи све"
-#: ../../Xconfigurator.pm_.c:674
+#: ../../Xconfigurator.pm_.c:675
msgid "Resolutions"
msgstr "Резолуција"
-#: ../../Xconfigurator.pm_.c:1072
+#: ../../Xconfigurator.pm_.c:1073
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Тип тастатуре: %s\n"
-#: ../../Xconfigurator.pm_.c:1073
+#: ../../Xconfigurator.pm_.c:1074
#, c-format
msgid "Mouse type: %s\n"
msgstr "Тип миша: %s\n"
-#: ../../Xconfigurator.pm_.c:1074
+#: ../../Xconfigurator.pm_.c:1075
#, c-format
msgid "Mouse device: %s\n"
msgstr "Миш је постављен на уређај: %s\n"
-#: ../../Xconfigurator.pm_.c:1075
+#: ../../Xconfigurator.pm_.c:1076
#, c-format
msgid "Monitor: %s\n"
msgstr "Монитор: %s\n"
-#: ../../Xconfigurator.pm_.c:1076
+#: ../../Xconfigurator.pm_.c:1077
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Монитор - хоризонталнa фреквенција: %s\n"
-#: ../../Xconfigurator.pm_.c:1077
+#: ../../Xconfigurator.pm_.c:1078
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Монитор - вертикално освежавање: %s\n"
-#: ../../Xconfigurator.pm_.c:1078
+#: ../../Xconfigurator.pm_.c:1079
#, c-format
msgid "Graphic card: %s\n"
msgstr "Графичка картица: %s\n"
-#: ../../Xconfigurator.pm_.c:1079
+#: ../../Xconfigurator.pm_.c:1080
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Меморија на графичкој картици: %s kB\n"
-#: ../../Xconfigurator.pm_.c:1081
+#: ../../Xconfigurator.pm_.c:1082
#, c-format
msgid "Color depth: %s\n"
msgstr "Број боја: %s\n"
-#: ../../Xconfigurator.pm_.c:1082
+#: ../../Xconfigurator.pm_.c:1083
#, c-format
msgid "Resolution: %s\n"
msgstr "Резолуција: %s\n"
-#: ../../Xconfigurator.pm_.c:1084
+#: ../../Xconfigurator.pm_.c:1085
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 сервер: %s\n"
-#: ../../Xconfigurator.pm_.c:1085
+#: ../../Xconfigurator.pm_.c:1086
#, c-format
msgid "XFree86 driver: %s\n"
msgstr "XFree86 драjвер: %s\n"
-#: ../../Xconfigurator.pm_.c:1104
+#: ../../Xconfigurator.pm_.c:1105
msgid "Preparing X-Window configuration"
msgstr "Провера конфигурације за X-Window систем"
-#: ../../Xconfigurator.pm_.c:1124 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1125 ../../standalone/drakboot_.c:45
msgid "What do you want to do?"
msgstr "Шта желите да урадите?"
-#: ../../Xconfigurator.pm_.c:1129
+#: ../../Xconfigurator.pm_.c:1130
msgid "Change Monitor"
msgstr "Промена монитора"
-#: ../../Xconfigurator.pm_.c:1130
+#: ../../Xconfigurator.pm_.c:1131
msgid "Change Graphic card"
msgstr "Промена графичке картице"
-#: ../../Xconfigurator.pm_.c:1132
+#: ../../Xconfigurator.pm_.c:1133
msgid "Change Server options"
msgstr "Промена Сервер опција"
-#: ../../Xconfigurator.pm_.c:1133
+#: ../../Xconfigurator.pm_.c:1134
msgid "Change Resolution"
msgstr "Промена резолуције"
-#: ../../Xconfigurator.pm_.c:1134
+#: ../../Xconfigurator.pm_.c:1135
msgid "Show information"
msgstr "Прикажи информације"
-#: ../../Xconfigurator.pm_.c:1135
+#: ../../Xconfigurator.pm_.c:1136
msgid "Test again"
msgstr "Тестирај поново"
-#: ../../Xconfigurator.pm_.c:1136
+#: ../../Xconfigurator.pm_.c:1137
msgid "Quit"
msgstr "Крај"
-#: ../../Xconfigurator.pm_.c:1144
+#: ../../Xconfigurator.pm_.c:1145
#, c-format
msgid ""
"Keep the changes?\n"
@@ -323,20 +323,20 @@ msgstr ""
"\n"
"%s"
-#: ../../Xconfigurator.pm_.c:1165
+#: ../../Xconfigurator.pm_.c:1166
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Молим, поново унесите %s ради активирања промена"
-#: ../../Xconfigurator.pm_.c:1185
+#: ../../Xconfigurator.pm_.c:1186
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Молим ваш излогујте се и рестартујте (Ctrl-Alt-BackSpace) рачунар"
-#: ../../Xconfigurator.pm_.c:1188
+#: ../../Xconfigurator.pm_.c:1189
msgid "X at startup"
msgstr "X окружење на старту"
-#: ../../Xconfigurator.pm_.c:1189
+#: ../../Xconfigurator.pm_.c:1190
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -525,7 +525,7 @@ msgstr "Пауза пре стартања default image-а"
#: ../../any.pm_.c:160 ../../any.pm_.c:735
#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:610
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
-#: ../../standalone/draknet_.c:508
+#: ../../standalone/draknet_.c:512
msgid "Password"
msgstr "Лозинка"
@@ -880,7 +880,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:266
+#: ../../bootloader.pm_.c:267
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -902,7 +902,7 @@ msgstr ""
# The lines must fit on screen, aka length < 80
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:743
+#: ../../bootloader.pm_.c:744
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Dobrodosli u GRUB starter operativnog sistema !"
@@ -913,7 +913,7 @@ msgstr "Dobrodosli u GRUB starter operativnog sistema !"
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:744
+#: ../../bootloader.pm_.c:745
#, 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"
@@ -925,7 +925,7 @@ msgstr "Koristi %c i %c slova da bi oznacili izbor"
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:745
+#: ../../bootloader.pm_.c:746
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
@@ -936,7 +936,7 @@ msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:746
+#: ../../bootloader.pm_.c:747
msgid "commands before booting, or 'c' for a command-line."
msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
@@ -947,21 +947,21 @@ msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
#
# The lines must fit on screen, aka length < 80
#
-#: ../../bootloader.pm_.c:747
+#: ../../bootloader.pm_.c:748
#, 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:751
+#: ../../bootloader.pm_.c:752
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:843
+#: ../../bootloader.pm_.c:844
msgid "Desktop"
msgstr "Десктоп"
-#: ../../bootloader.pm_.c:843
+#: ../../bootloader.pm_.c:844
msgid "Start Menu"
msgstr "Старт мени "
@@ -1079,7 +1079,7 @@ msgstr ""
msgid "System mode"
msgstr ""
-#: ../../bootlook.pm_.c:191
+#: ../../bootlook.pm_.c:191 ../../standalone/draknet_.c:437
msgid "OK"
msgstr ""
@@ -1087,6 +1087,7 @@ msgstr ""
#: ../../interactive.pm_.c:105 ../../interactive.pm_.c:240
#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:297
#: ../../my_gtk.pm_.c:300 ../../my_gtk.pm_.c:554
+#: ../../standalone/draknet_.c:449
msgid "Cancel"
msgstr "Обустави"
@@ -1098,34 +1099,34 @@ msgstr ""
msgid "can not open /etc/sysconfig/autologin for reading: $!"
msgstr ""
-#: ../../common.pm_.c:615
+#: ../../common.pm_.c:616
msgid "GB"
msgstr ""
-#: ../../common.pm_.c:615
+#: ../../common.pm_.c:616
msgid "KB"
msgstr ""
-#: ../../common.pm_.c:615 ../../diskdrake.pm_.c:654
+#: ../../common.pm_.c:616 ../../diskdrake.pm_.c:654
#: ../../install_steps_graphical.pm_.c:287
#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr "MB"
-#: ../../common.pm_.c:623
+#: ../../common.pm_.c:624
msgid "TB"
msgstr ""
-#: ../../common.pm_.c:636
+#: ../../common.pm_.c:637
#, c-format
msgid "%d minutes"
msgstr "%d минутa"
-#: ../../common.pm_.c:638
+#: ../../common.pm_.c:639
msgid "1 minute"
msgstr "1 минут"
-#: ../../common.pm_.c:640
+#: ../../common.pm_.c:641
#, c-format
msgid "%d seconds"
msgstr "%d секунди"
@@ -1887,15 +1888,15 @@ msgid ""
"levels to install or update your\n"
"Linux-Mandrake operating system:\n"
"\n"
-"\t* Recommanded: if you have never installed a GNU/Linux operating system "
+"\t* Recommended: if you have never installed a GNU/Linux operating system "
"choose this. Installation will be\n"
"\t be very easy and you will be asked only on few questions.\n"
"\n"
"\n"
"\t* Customized: if you are familiar enough with GNU/Linux, you may choose "
"the primary usage (workstation, server,\n"
-"\t development) of your sytem. You will need to answer to more questions "
-"than in \"Recommanded\" installation\n"
+"\t development) of your system. You will need to answer to more questions "
+"than in \"Recommended\" installation\n"
"\t class, so you need to know how GNU/Linux works to choose this "
"installation class.\n"
"\n"
@@ -3761,27 +3762,27 @@ msgstr "Пакети за инсталацију"
msgid "Install system"
msgstr "Инсталирај систем"
-#: ../../install2.pm_.c:49
+#: ../../install2.pm_.c:49 ../../install_steps_interactive.pm_.c:805
+#: ../../install_steps_interactive.pm_.c:806
+msgid "Set root password"
+msgstr "Унеси root лозинку"
+
+#: ../../install2.pm_.c:50
+msgid "Add a user"
+msgstr "Додај корисника"
+
+#: ../../install2.pm_.c:51
msgid "Configure networking"
msgstr "Подеси мрежу"
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:739
+#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:739
msgid "Summary"
msgstr ""
-#: ../../install2.pm_.c:52
+#: ../../install2.pm_.c:54
msgid "Configure services"
msgstr "Подеси сервисе"
-#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:805
-#: ../../install_steps_interactive.pm_.c:806
-msgid "Set root password"
-msgstr "Унеси root лозинку"
-
-#: ../../install2.pm_.c:54
-msgid "Add a user"
-msgstr "Додај корисника"
-
#: ../../install2.pm_.c:56
msgid "Create a bootdisk"
msgstr "Направи стартни диск"
@@ -5054,7 +5055,7 @@ msgid "Insert a blank floppy in drive %s"
msgstr "Убаците празну дискету у уређај %s"
#: ../../install_steps_interactive.pm_.c:1028
-#: ../../install_steps_interactive.pm_.c:1059
+#: ../../install_steps_interactive.pm_.c:1060
msgid "Creating auto install floppy"
msgstr "Креирам ауто инсталациони флопи"
@@ -5593,35 +5594,35 @@ msgstr "Конфигурација Интернет конекциje"
msgid "Please fill or check the field below"
msgstr "Молим ВАС да попуните или ознaчите поља испод"
-#: ../../netconnect.pm_.c:226 ../../standalone/draknet_.c:491
+#: ../../netconnect.pm_.c:226 ../../standalone/draknet_.c:495
msgid "Card IRQ"
msgstr "IRQ картицe"
-#: ../../netconnect.pm_.c:227 ../../standalone/draknet_.c:492
+#: ../../netconnect.pm_.c:227 ../../standalone/draknet_.c:496
msgid "Card mem (DMA)"
msgstr "(DMA) картицe"
-#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:497
msgid "Card IO"
msgstr " IO картицe"
-#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:494
+#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:498
msgid "Card IO_0"
msgstr " IO_0 картицe"
-#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:495
+#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:499
msgid "Card IO_1"
msgstr "IO_1 картицe"
-#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:496
+#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:500
msgid "Your personal phone number"
msgstr "Вaш лични броj телефонa"
-#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:497
+#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:501
msgid "Provider name (ex provider.net)"
msgstr "Име проваjдера (нпр. provider.net)"
-#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:498
+#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:502
msgid "Provider phone number"
msgstr "Број телефона проваjдерa"
@@ -5633,15 +5634,15 @@ msgstr "Проваjдеров dns 1"
msgid "Provider dns 2"
msgstr "Проваjдеров dns 2"
-#: ../../netconnect.pm_.c:236 ../../standalone/draknet_.c:503
+#: ../../netconnect.pm_.c:236 ../../standalone/draknet_.c:507
msgid "Dialing mode"
msgstr "Мод за бирaњe"
-#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:501
+#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:505
msgid "Account Login (user name)"
msgstr "Логовaње за рaчун (корисничко име)"
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:502
+#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:506
msgid "Account Password"
msgstr "Лозинка за рaчун"
@@ -5769,43 +5770,43 @@ msgstr "Изаберите серијски порт на који је модем повезан."
msgid "Dialup options"
msgstr "Dialup опције"
-#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:505
+#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:509
msgid "Connection name"
msgstr "Име конекције"
-#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:506
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:510
msgid "Phone number"
msgstr "Број телефона"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:507
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:511
msgid "Login ID"
msgstr "ID за логовање"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Authentication"
msgstr "Аутентификација"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Script-based"
msgstr "Базирано на скрипти"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:513
msgid "Terminal-based"
msgstr "Базирано на терминалу"
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:510
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:514
msgid "Domain name"
msgstr "Име домена"
-#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:511
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:515
msgid "First DNS Server"
msgstr "Први DNS Сервер"
-#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:512
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:516
msgid "Second DNS Server"
msgstr "Други DNS Сервер"
@@ -6063,15 +6064,15 @@ msgstr ""
"\n"
"Да ли желите да подесите дeљeње Интернет конекциje ?\n"
-#: ../../network.pm_.c:255
+#: ../../network.pm_.c:252
msgid "no network card found"
msgstr "Није пронађена мрежна картица"
-#: ../../network.pm_.c:279 ../../network.pm_.c:374
+#: ../../network.pm_.c:276 ../../network.pm_.c:371
msgid "Configuring network"
msgstr "Подешавање мреже"
-#: ../../network.pm_.c:280
+#: ../../network.pm_.c:277
msgid ""
"Please enter your host name if you know it.\n"
"Some DHCP servers require the hostname to work.\n"
@@ -6083,11 +6084,11 @@ msgstr ""
"Вaше име хоста треба да буде пуно име као нпр.\n"
"``mybox.mylab.myco.com''."
-#: ../../network.pm_.c:284 ../../network.pm_.c:379
+#: ../../network.pm_.c:281 ../../network.pm_.c:376
msgid "Host name"
msgstr "Име хоста:"
-#: ../../network.pm_.c:306
+#: ../../network.pm_.c:303
#, fuzzy
msgid ""
"WARNING: This device has been previously configured to connect to the "
@@ -6100,7 +6101,7 @@ msgstr ""
"Само притисните У реду (OK) да би поставку оставили истом.\n"
"Измена поља коjе видите ће поништити постоjeћу конфигурациjу."
-#: ../../network.pm_.c:311
+#: ../../network.pm_.c:308
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -6110,38 +6111,38 @@ msgstr ""
"Свака ставка треба де буде tavka треба да буде унета као\n"
"IP адреса (на пример, 123.45.67.89)."
-#: ../../network.pm_.c:320 ../../network.pm_.c:321
+#: ../../network.pm_.c:317 ../../network.pm_.c:318
#, c-format
msgid "Configuring network device %s"
msgstr "Подешавање мрежног уређаја %s"
-#: ../../network.pm_.c:321
+#: ../../network.pm_.c:318
msgid " (driver $module)"
msgstr ""
-#: ../../network.pm_.c:323 ../../standalone/draknet_.c:212
-#: ../../standalone/draknet_.c:394
+#: ../../network.pm_.c:320 ../../standalone/draknet_.c:208
+#: ../../standalone/draknet_.c:390
msgid "IP address"
msgstr "IP адреса"
-#: ../../network.pm_.c:324 ../../standalone/draknet_.c:395
+#: ../../network.pm_.c:321 ../../standalone/draknet_.c:391
msgid "Netmask"
msgstr "Мрежна маска"
-#: ../../network.pm_.c:325
+#: ../../network.pm_.c:322
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../network.pm_.c:325
+#: ../../network.pm_.c:322
msgid "Automatic IP"
msgstr "Аутоматски IP"
-#: ../../network.pm_.c:346 ../../printerdrake.pm_.c:98
+#: ../../network.pm_.c:343 ../../printerdrake.pm_.c:98
#: ../../printerdrake.pm_.c:417
msgid "IP address should be in format 1.2.3.4"
msgstr "IP адреса треба да буде у формату 1.2.3.4"
-#: ../../network.pm_.c:375
+#: ../../network.pm_.c:372
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -6153,35 +6154,35 @@ msgstr ""
"као на пр. ``mybox.mylab.myco.com''.\n"
"Ако немате додатних 'nameserver'-а, оставите та поља празна."
-#: ../../network.pm_.c:380
+#: ../../network.pm_.c:377
msgid "DNS server"
msgstr "DNS сервер"
-#: ../../network.pm_.c:381 ../../standalone/draknet_.c:504
+#: ../../network.pm_.c:378 ../../standalone/draknet_.c:508
msgid "Gateway"
msgstr "Gateway"
-#: ../../network.pm_.c:383
+#: ../../network.pm_.c:380
msgid "Gateway device"
msgstr "Gateway уређаj"
-#: ../../network.pm_.c:394
+#: ../../network.pm_.c:391
msgid "Proxies configuration"
msgstr "Подeшавaње проксиja"
-#: ../../network.pm_.c:395
+#: ../../network.pm_.c:392
msgid "HTTP proxy"
msgstr "HTTP proxy"
-#: ../../network.pm_.c:396
+#: ../../network.pm_.c:393
msgid "FTP proxy"
msgstr "FTP proxy"
-#: ../../network.pm_.c:399
+#: ../../network.pm_.c:396
msgid "Proxy should be http://..."
msgstr "Proxy треба да буде http://..."
-#: ../../network.pm_.c:400
+#: ../../network.pm_.c:397
msgid "Proxy should be ftp://..."
msgstr "Proxy треба да буде ftp://..."
@@ -7057,176 +7058,180 @@ msgstr ""
"Сада можете делити Интернет конекциjу са другим компjутерима на вaшоj "
"локалноj мрeжи (LAN), користећи аутоматску мрeжну конфигурациjу (DHCP)."
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:70
#, fuzzy, c-format
msgid "Network configuration (%d adapters)"
msgstr "Подешавање мрежe"
-#: ../../standalone/draknet_.c:81 ../../standalone/draknet_.c:478
+#: ../../standalone/draknet_.c:77 ../../standalone/draknet_.c:482
#, fuzzy
msgid "Profile: "
msgstr "монтирање није успело"
-#: ../../standalone/draknet_.c:89
+#: ../../standalone/draknet_.c:85
msgid "Del profile..."
msgstr ""
-#: ../../standalone/draknet_.c:94
+#: ../../standalone/draknet_.c:90
msgid "Profile to delete:"
msgstr ""
-#: ../../standalone/draknet_.c:121
+#: ../../standalone/draknet_.c:117
msgid "New profile..."
msgstr ""
-#: ../../standalone/draknet_.c:126
+#: ../../standalone/draknet_.c:122
msgid "Name of the profile to create:"
msgstr ""
-#: ../../standalone/draknet_.c:151
+#: ../../standalone/draknet_.c:147
#, fuzzy
msgid "Hostname: "
msgstr "Име хоста:"
-#: ../../standalone/draknet_.c:158
+#: ../../standalone/draknet_.c:154
#, fuzzy
msgid "Internet access"
msgstr "Интернет"
-#: ../../standalone/draknet_.c:171
+#: ../../standalone/draknet_.c:167
#, fuzzy
msgid "Type:"
msgstr "Унеси: "
-#: ../../standalone/draknet_.c:174
+#: ../../standalone/draknet_.c:170
msgid "Gateway:"
msgstr "Gateway:"
-#: ../../standalone/draknet_.c:174
+#: ../../standalone/draknet_.c:170
#, fuzzy
msgid "Interface:"
msgstr "Интернет"
-#: ../../standalone/draknet_.c:178
+#: ../../standalone/draknet_.c:174
msgid "Status:"
msgstr ""
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:176
msgid "not connected"
msgstr ""
-#: ../../standalone/draknet_.c:183
+#: ../../standalone/draknet_.c:179
msgid "Connect..."
msgstr ""
-#: ../../standalone/draknet_.c:189
+#: ../../standalone/draknet_.c:185
#, fuzzy
msgid "Configure Internet Access..."
msgstr "Подеси сервисе"
-#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:380
+#: ../../standalone/draknet_.c:193 ../../standalone/draknet_.c:376
#, fuzzy
msgid "LAN configuration"
msgstr "ADSL конфигурацијa"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
#, fuzzy
msgid "Adapter"
msgstr "Ажурирање"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
#, fuzzy
msgid "Driver"
msgstr "Сервер"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
#, fuzzy
msgid "Interface"
msgstr "Интернет"
-#: ../../standalone/draknet_.c:212
+#: ../../standalone/draknet_.c:208
msgid "Protocole"
msgstr ""
-#: ../../standalone/draknet_.c:225
+#: ../../standalone/draknet_.c:221
#, fuzzy
msgid "Configure Local Area Network..."
msgstr "Подеси локални мрежу"
-#: ../../standalone/draknet_.c:268
+#: ../../standalone/draknet_.c:264
msgid ""
"\n"
"Warning:\n"
"Applying the changes while running may crash your X environnement."
msgstr ""
-#: ../../standalone/draknet_.c:271
+#: ../../standalone/draknet_.c:267
#, c-format
msgid ""
"\n"
"If you continue, I will shut down your %s environnement"
msgstr ""
-#: ../../standalone/draknet_.c:384
+#: ../../standalone/draknet_.c:380
#, fuzzy
msgid "LAN Configuration"
msgstr "ADSL конфигурацијa"
-#: ../../standalone/draknet_.c:390
+#: ../../standalone/draknet_.c:386
#, c-format
msgid "Adapter %s: %s"
msgstr ""
-#: ../../standalone/draknet_.c:396
+#: ../../standalone/draknet_.c:392
msgid "Boot Protocol"
msgstr ""
-#: ../../standalone/draknet_.c:397
+#: ../../standalone/draknet_.c:393
msgid "Started on boot"
msgstr ""
-#: ../../standalone/draknet_.c:398
+#: ../../standalone/draknet_.c:394
msgid "DHCP client"
msgstr ""
-#: ../../standalone/draknet_.c:426
-msgid "eth$_"
-msgstr ""
+#: ../../standalone/draknet_.c:430 ../../standalone/draknet_.c:434
+msgid "Disable"
+msgstr "Онeмогући"
-#: ../../standalone/draknet_.c:467
+#: ../../standalone/draknet_.c:430 ../../standalone/draknet_.c:434
+msgid "Enable"
+msgstr "Омогући"
+
+#: ../../standalone/draknet_.c:471
#, fuzzy
msgid "Internet connection configuration"
msgstr "Интернет конекциjа и конфигурациja"
-#: ../../standalone/draknet_.c:471
+#: ../../standalone/draknet_.c:475
#, fuzzy
msgid "Internet Connection Configuration"
msgstr "Интернет конекциjа и конфигурациja"
-#: ../../standalone/draknet_.c:480
+#: ../../standalone/draknet_.c:484
#, fuzzy
msgid "Connection type: "
msgstr "Име конекције"
-#: ../../standalone/draknet_.c:486
+#: ../../standalone/draknet_.c:490
msgid "Parameters"
msgstr ""
-#: ../../standalone/draknet_.c:499
+#: ../../standalone/draknet_.c:503
#, fuzzy
msgid "Provider dns 1 (optional)"
msgstr "Проваjдеров dns 1"
-#: ../../standalone/draknet_.c:500
+#: ../../standalone/draknet_.c:504
#, fuzzy
msgid "Provider dns 2 (optional)"
msgstr "Проваjдеров dns 2"
-#: ../../standalone/draknet_.c:513
+#: ../../standalone/draknet_.c:517
msgid "Ethernet Card"
msgstr ""
-#: ../../standalone/draknet_.c:514
+#: ../../standalone/draknet_.c:518
msgid "DHCP Client"
msgstr ""
@@ -7289,7 +7294,12 @@ msgstr ""
msgid "Setting security level"
msgstr "Подешавање сигурносног нивоа"
-#: ../../standalone/drakxconf_.c:20
+#: ../../standalone/drakxconf_.c:40
+#, fuzzy
+msgid "Control Center"
+msgstr "Конектуj на Интернет"
+
+#: ../../standalone/drakxconf_.c:41
msgid "Choose the tool you want to use"
msgstr "Изаберите алат које желите да користите"
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 051b20e24..234c04c5a 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -383,7 +383,7 @@ sub configure_lan {
my @eth_data;
foreach (0..$#all_cards) {
my $vbox_local=new Gtk::VBox(0,0);
- $vbox_local->pack_start(new Gtk::Label(_("Adapter %s: %s", $_+1 , "eth$_")),1,1,0);
+ $vbox_local->pack_start(new Gtk::Label( _("Adapter %s: %s", $_+1 , "eth$_")),1,1,0);
# Eth${_}Hostname=$netc->{HOSTNAME}
# Eth${_}HostAlias=" . do { $netc->{HOSTNAME} =~ /([^\.]*)\./; $1 } . "
# Eth${_}Driver=$all_cards[$_]->[1]
@@ -419,7 +419,7 @@ sub configure_lan {
my $hbox_local = new Gtk::HBox(0,0);
my $pix = new Gtk::Pixmap ($pix_eth_map, $pix_eth_mask);
$hbox_local->pack_start($pix,0,0,0);
- $hbox_local->pack_start(new Gtk::Label(_("eth$_")),0,0,0);
+ $hbox_local->pack_start(new Gtk::Label("eth$_"),0,0,0);
$hbox_local->show_all;
$notebook->append_page($vbox_local, $hbox_local);
}
@@ -434,7 +434,7 @@ sub configure_lan {
$button_able->child->set($netc->{NETWORKING} eq "yes" ? _("Disable") : _("Enable"));
} );
$bbox1->add($button_able);
- my $button_ok = new Gtk::Button "OK";
+ my $button_ok = new Gtk::Button( _("OK") );
$button_ok->signal_connect ( clicked => sub {
my $i=0;
foreach (@conf_data) {
@@ -446,7 +446,7 @@ sub configure_lan {
$window->destroy(); Gtk->main_quit;
});
$bbox1->add($button_ok);
- my $button_cancel = new Gtk::Button "Cancel";
+ my $button_cancel = new Gtk::Button( _("Cancel") );
$button_cancel->signal_connect ( clicked => sub { $netc->{NETWORKING}=$old_networking; $window->destroy(); Gtk->main_quit });
$bbox1->add($button_cancel);