summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/share/po/DrakX.pot145
-rw-r--r--perl-install/share/po/no.po145
-rw-r--r--perl-install/share/po/sp.po145
3 files changed, 222 insertions, 213 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 2ce0e0445..f0318f875 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-05 17:31+0100\n"
+"POT-Creation-Date: 2001-03-06 01:04+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"
@@ -496,7 +496,7 @@ msgid "Delay before booting default image"
msgstr ""
#: ../../any.pm_.c:160 ../../any.pm_.c:735
-#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:608
+#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:610
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
#: ../../standalone/draknet_.c:508
msgid "Password"
@@ -955,7 +955,7 @@ msgid "horizontal nice looking aurora"
msgstr ""
#: ../../bootlook.pm_.c:131
-msgid "vertical traditionnal aurora"
+msgid "vertical traditional aurora"
msgstr ""
#: ../../bootlook.pm_.c:135
@@ -1938,7 +1938,7 @@ msgid ""
"hard drive.\n"
"\n"
"\n"
-" * Auto allocate:: this option allows you to automatically create Ext2 and "
+" * Auto allocate: this option allows you to automatically create Ext2 and "
"swap partitions in free space of your\n"
" hard drive.\n"
"\n"
@@ -1993,7 +1993,7 @@ msgid ""
"'bootstrap' partition of at least 1MB for use\n"
"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emgergency boot situations."
+"a spare kernel and ramdisk image for emergency boot situations."
msgstr ""
#: ../../help.pm_.c:224
@@ -4561,8 +4561,8 @@ msgid ""
"Please choose which network adapter you want to use to connect to Internet"
msgstr ""
-#: ../../netconnect.pm_.c:375 ../../netconnect.pm_.c:664
-#: ../../netconnect.pm_.c:809 ../../standalone/drakgw_.c:228
+#: ../../netconnect.pm_.c:375 ../../netconnect.pm_.c:668
+#: ../../netconnect.pm_.c:813 ../../standalone/drakgw_.c:228
msgid "Network interface"
msgstr ""
@@ -4584,196 +4584,196 @@ msgstr ""
msgid "Do you want to start your connection at boot?"
msgstr ""
-#: ../../netconnect.pm_.c:599
+#: ../../netconnect.pm_.c:601
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../netconnect.pm_.c:604
+#: ../../netconnect.pm_.c:606
msgid "Dialup options"
msgstr ""
-#: ../../netconnect.pm_.c:605 ../../standalone/draknet_.c:505
+#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:505
msgid "Connection name"
msgstr ""
-#: ../../netconnect.pm_.c:606 ../../standalone/draknet_.c:506
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:506
msgid "Phone number"
msgstr ""
-#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:507
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:507
msgid "Login ID"
msgstr ""
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Authentication"
msgstr ""
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "PAP"
msgstr ""
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Script-based"
msgstr ""
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Terminal-based"
msgstr ""
-#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:510
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:510
msgid "Domain name"
msgstr ""
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:511
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:511
msgid "First DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:512
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:512
msgid "Second DNS Server"
msgstr ""
-#: ../../netconnect.pm_.c:665
+#: ../../netconnect.pm_.c:669
msgid ""
"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:706
+#: ../../netconnect.pm_.c:710
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:706 ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:710 ../../netconnect.pm_.c:713
msgid ""
"\n"
"You can reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:706
+#: ../../netconnect.pm_.c:710
msgid "You are currently connected to internet."
msgstr ""
-#: ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:713
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
msgstr ""
-#: ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:713
msgid "You are not currently connected to Internet."
msgstr ""
-#: ../../netconnect.pm_.c:713
+#: ../../netconnect.pm_.c:717
msgid "Connect to Internet"
msgstr ""
-#: ../../netconnect.pm_.c:715
+#: ../../netconnect.pm_.c:719
msgid "Disconnect from Internet"
msgstr ""
-#: ../../netconnect.pm_.c:717
+#: ../../netconnect.pm_.c:721
msgid "Configure network connection (LAN or Internet)"
msgstr ""
-#: ../../netconnect.pm_.c:720
+#: ../../netconnect.pm_.c:724
msgid "Internet connection & configuration"
msgstr ""
-#: ../../netconnect.pm_.c:774 ../../netconnect.pm_.c:893
-#: ../../netconnect.pm_.c:906 ../../netconnect.pm_.c:913
-#: ../../netconnect.pm_.c:929
+#: ../../netconnect.pm_.c:778 ../../netconnect.pm_.c:897
+#: ../../netconnect.pm_.c:910 ../../netconnect.pm_.c:917
+#: ../../netconnect.pm_.c:933
msgid "Network Configuration Wizard"
msgstr ""
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "External ISDN modem"
msgstr ""
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "Internal ISDN card"
msgstr ""
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "What kind is your ISDN connection?"
msgstr ""
-#: ../../netconnect.pm_.c:797 ../../netconnect.pm_.c:846
+#: ../../netconnect.pm_.c:801 ../../netconnect.pm_.c:850
msgid "Connect to the Internet"
msgstr ""
-#: ../../netconnect.pm_.c:798
+#: ../../netconnect.pm_.c:802
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:800
+#: ../../netconnect.pm_.c:804
msgid "use dhcp"
msgstr ""
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
msgid "use pppoe"
msgstr ""
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
msgid "use pptp"
msgstr ""
-#: ../../netconnect.pm_.c:810
+#: ../../netconnect.pm_.c:814
#, c-format
msgid "I'm about to restart the network device %s. Do you agree?"
msgstr ""
-#: ../../netconnect.pm_.c:847
+#: ../../netconnect.pm_.c:851
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
msgstr ""
-#: ../../netconnect.pm_.c:862
+#: ../../netconnect.pm_.c:866
msgid "Network configuration"
msgstr ""
-#: ../../netconnect.pm_.c:863
+#: ../../netconnect.pm_.c:867
msgid "Do you want to restart the network"
msgstr ""
-#: ../../netconnect.pm_.c:874
+#: ../../netconnect.pm_.c:878
msgid "Sorry, the mail configuration is not yet implemented. Be patient."
msgstr ""
-#: ../../netconnect.pm_.c:879 ../../netconnect.pm_.c:1001
+#: ../../netconnect.pm_.c:883 ../../netconnect.pm_.c:1005
msgid "Network Configuration"
msgstr ""
-#: ../../netconnect.pm_.c:880
+#: ../../netconnect.pm_.c:884
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
-"Click on Ok to reconfigure your Network/Internet connection, or cancel to "
-"skip the step.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
msgstr ""
-#: ../../netconnect.pm_.c:894
+#: ../../netconnect.pm_.c:898
msgid ""
"Welcome to The Network Configuration Wizard.\n"
"Which components do you want to configure?\n"
msgstr ""
-#: ../../netconnect.pm_.c:896
+#: ../../netconnect.pm_.c:900
msgid "Internet/Network access"
msgstr ""
-#: ../../netconnect.pm_.c:897
+#: ../../netconnect.pm_.c:901
msgid "Mail information"
msgstr ""
-#: ../../netconnect.pm_.c:898
+#: ../../netconnect.pm_.c:902
msgid "Choose the profile to configure"
msgstr ""
-#: ../../netconnect.pm_.c:907
+#: ../../netconnect.pm_.c:911
msgid ""
"Internet Connection\n"
"\n"
@@ -4781,68 +4781,71 @@ msgid ""
"If you don't want to use the auto detection, deselect the checkbox.\n"
msgstr ""
-#: ../../netconnect.pm_.c:909
+#: ../../netconnect.pm_.c:913
msgid "Use auto detection"
msgstr ""
-#: ../../netconnect.pm_.c:913 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:917 ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr ""
-#: ../../netconnect.pm_.c:921
+#: ../../netconnect.pm_.c:925
msgid "Normal modem connection"
msgstr ""
-#: ../../netconnect.pm_.c:921
+#: ../../netconnect.pm_.c:925
#, c-format
msgid "detected on port %s"
msgstr ""
-#: ../../netconnect.pm_.c:922
+#: ../../netconnect.pm_.c:926
msgid "ISDN connection"
msgstr ""
-#: ../../netconnect.pm_.c:922
+#: ../../netconnect.pm_.c:926
#, c-format
msgid "detected %s"
msgstr ""
-#: ../../netconnect.pm_.c:923
+#: ../../netconnect.pm_.c:927
msgid "DSL (or ADSL) connection"
msgstr ""
-#: ../../netconnect.pm_.c:923
+#: ../../netconnect.pm_.c:927
#, c-format
msgid "detected on interface %s"
msgstr ""
-#: ../../netconnect.pm_.c:924
-msgid "Cable connecion"
+#: ../../netconnect.pm_.c:928
+msgid "Cable connection"
msgstr ""
-#: ../../netconnect.pm_.c:925
+#: ../../netconnect.pm_.c:929
msgid "LAN connection"
msgstr ""
-#: ../../netconnect.pm_.c:925
+#: ../../netconnect.pm_.c:929
msgid "ethernet card(s) detected"
msgstr ""
-#: ../../netconnect.pm_.c:930
+#: ../../netconnect.pm_.c:934
msgid "How do you want to connect to the Internet?"
msgstr ""
-#: ../../netconnect.pm_.c:951
+#: ../../netconnect.pm_.c:956
msgid ""
-"\n"
"Congratulation, The network and internet configuration is finished.\n"
"\n"
-"The configuration will now be applied to your system.\n"
+"The configuration will now be applied to your system."
+msgstr ""
+
+#: ../../netconnect.pm_.c:959
+msgid ""
"After that is done, we recommend you to restart your X\n"
"environnement to avoid hostname changing problem."
msgstr ""
-#: ../../netconnect.pm_.c:1002
+#: ../../netconnect.pm_.c:1006
msgid ""
"Now that your Internet connection is configured,\n"
"your computer can be configured to share its Internet connection.\n"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 542cbe9c6..ce5e3f157 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-05 17:31+0100\n"
+"POT-Creation-Date: 2001-03-06 01:04+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -526,7 +526,7 @@ msgid "Delay before booting default image"
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:608
+#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:610
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
#: ../../standalone/draknet_.c:508
msgid "Password"
@@ -1062,7 +1062,7 @@ msgid "horizontal nice looking aurora"
msgstr ""
#: ../../bootlook.pm_.c:131
-msgid "vertical traditionnal aurora"
+msgid "vertical traditional aurora"
msgstr ""
#: ../../bootlook.pm_.c:135
@@ -2268,7 +2268,7 @@ msgid ""
"hard drive.\n"
"\n"
"\n"
-" * Auto allocate:: this option allows you to automatically create Ext2 and "
+" * Auto allocate: this option allows you to automatically create Ext2 and "
"swap partitions in free space of your\n"
" hard drive.\n"
"\n"
@@ -2323,7 +2323,7 @@ msgid ""
"'bootstrap' partition of at least 1MB for use\n"
"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emgergency boot situations."
+"a spare kernel and ramdisk image for emergency boot situations."
msgstr ""
"Pх dette punktet mх du velge hvilken\n"
"partisjon(er) som skal brukes til х installere ditt nye Linux-Mandrake "
@@ -5784,8 +5784,8 @@ msgstr ""
"Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
"mot Internett"
-#: ../../netconnect.pm_.c:375 ../../netconnect.pm_.c:664
-#: ../../netconnect.pm_.c:809 ../../standalone/drakgw_.c:228
+#: ../../netconnect.pm_.c:375 ../../netconnect.pm_.c:668
+#: ../../netconnect.pm_.c:813 ../../standalone/drakgw_.c:228
msgid "Network interface"
msgstr "Nettverksgrensesnitt"
@@ -5809,62 +5809,62 @@ msgstr "ADSL-konfigurasjon"
msgid "Do you want to start your connection at boot?"
msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
-#: ../../netconnect.pm_.c:599
+#: ../../netconnect.pm_.c:601
msgid "Please choose which serial port your modem is connected to."
msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
-#: ../../netconnect.pm_.c:604
+#: ../../netconnect.pm_.c:606
msgid "Dialup options"
msgstr "Opsjoner oppringt"
-#: ../../netconnect.pm_.c:605 ../../standalone/draknet_.c:505
+#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:505
msgid "Connection name"
msgstr "Navn tilknytning"
-#: ../../netconnect.pm_.c:606 ../../standalone/draknet_.c:506
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:506
msgid "Phone number"
msgstr "Telefonnummer"
-#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:507
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:507
msgid "Login ID"
msgstr "Login ID"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Authentication"
msgstr "Autentifikasjon"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Script-based"
msgstr "Scriptbasert"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Terminal-based"
msgstr "Terminalbasert"
-#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:510
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:510
msgid "Domain name"
msgstr "Domenenavn"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:511
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:511
msgid "First DNS Server"
msgstr "Fјrste DNS-tjener"
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:512
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:512
msgid "Second DNS Server"
msgstr "Andre DNS-tjener"
-#: ../../netconnect.pm_.c:665
+#: ../../netconnect.pm_.c:669
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:706
+#: ../../netconnect.pm_.c:710
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
@@ -5872,7 +5872,7 @@ msgstr ""
"\n"
"Du kan koble ned eller rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:706 ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:710 ../../netconnect.pm_.c:713
msgid ""
"\n"
"You can reconfigure your connection."
@@ -5880,11 +5880,11 @@ msgstr ""
"\n"
"Du kan rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:706
+#: ../../netconnect.pm_.c:710
msgid "You are currently connected to internet."
msgstr "Du er for јyeblikket koblet opp mot Internett"
-#: ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:713
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
@@ -5892,50 +5892,50 @@ msgstr ""
"\n"
"Du kan koble opp mot Internett eller rekonfigurere tilkoblingen din."
-#: ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:713
msgid "You are not currently connected to Internet."
msgstr "Du er for јyeblikket ikke koblet opp mot Internett."
-#: ../../netconnect.pm_.c:713
+#: ../../netconnect.pm_.c:717
msgid "Connect to Internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:715
+#: ../../netconnect.pm_.c:719
msgid "Disconnect from Internet"
msgstr "Koble ned fra Internett"
-#: ../../netconnect.pm_.c:717
+#: ../../netconnect.pm_.c:721
msgid "Configure network connection (LAN or Internet)"
msgstr "Konfigurer nettverk-tilkobling (LAN eller Internett)"
-#: ../../netconnect.pm_.c:720
+#: ../../netconnect.pm_.c:724
msgid "Internet connection & configuration"
msgstr "Internett tilkobling & konfigurasjon"
-#: ../../netconnect.pm_.c:774 ../../netconnect.pm_.c:893
-#: ../../netconnect.pm_.c:906 ../../netconnect.pm_.c:913
-#: ../../netconnect.pm_.c:929
+#: ../../netconnect.pm_.c:778 ../../netconnect.pm_.c:897
+#: ../../netconnect.pm_.c:910 ../../netconnect.pm_.c:917
+#: ../../netconnect.pm_.c:933
#, fuzzy
msgid "Network Configuration Wizard"
msgstr "Nettverkskonfigurasjon"
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "External ISDN modem"
msgstr "Eksternt ISDN modem"
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "Internal ISDN card"
msgstr "Internt ISDN-kort"
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "What kind is your ISDN connection?"
msgstr "Hva slags type er ISDN-tilknytningen din?"
-#: ../../netconnect.pm_.c:797 ../../netconnect.pm_.c:846
+#: ../../netconnect.pm_.c:801 ../../netconnect.pm_.c:850
msgid "Connect to the Internet"
msgstr "Koble opp mot Internett"
-#: ../../netconnect.pm_.c:798
+#: ../../netconnect.pm_.c:802
#, fuzzy
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -5946,24 +5946,24 @@ msgstr ""
"Noen oppkoblinger bruker pptp, noen fх bruker dhcp.\n"
"Hvis du ikke vet, velg 'bruk pppoe'"
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
msgid "use dhcp"
msgstr "bruk dhcp"
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
msgid "use pppoe"
msgstr "bruk pppoe"
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
msgid "use pptp"
msgstr "bruk pptp"
-#: ../../netconnect.pm_.c:810
+#: ../../netconnect.pm_.c:814
#, 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:847
+#: ../../netconnect.pm_.c:851
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
@@ -5971,52 +5971,52 @@ msgstr ""
"Hvilken dhcp klient јnsker du х bruke?\n"
"Standard er dhcpd"
-#: ../../netconnect.pm_.c:862
+#: ../../netconnect.pm_.c:866
msgid "Network configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../../netconnect.pm_.c:863
+#: ../../netconnect.pm_.c:867
msgid "Do you want to restart the network"
msgstr "Vil du starte nettverket pх nytt"
-#: ../../netconnect.pm_.c:874
+#: ../../netconnect.pm_.c:878
msgid "Sorry, the mail configuration is not yet implemented. Be patient."
msgstr ""
-#: ../../netconnect.pm_.c:879 ../../netconnect.pm_.c:1001
+#: ../../netconnect.pm_.c:883 ../../netconnect.pm_.c:1005
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../../netconnect.pm_.c:880
+#: ../../netconnect.pm_.c:884
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
-"Click on Ok to reconfigure your Network/Internet connection, or cancel to "
-"skip the step.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
msgstr ""
-#: ../../netconnect.pm_.c:894
+#: ../../netconnect.pm_.c:898
msgid ""
"Welcome to The Network Configuration Wizard.\n"
"Which components do you want to configure?\n"
msgstr ""
-#: ../../netconnect.pm_.c:896
+#: ../../netconnect.pm_.c:900
#, fuzzy
msgid "Internet/Network access"
msgstr "Internett-tilgang"
-#: ../../netconnect.pm_.c:897
+#: ../../netconnect.pm_.c:901
#, fuzzy
msgid "Mail information"
msgstr "Vis informasjon"
-#: ../../netconnect.pm_.c:898
+#: ../../netconnect.pm_.c:902
#, fuzzy
msgid "Choose the profile to configure"
msgstr "Velg standard bruker:"
-#: ../../netconnect.pm_.c:907
+#: ../../netconnect.pm_.c:911
msgid ""
"Internet Connection\n"
"\n"
@@ -6024,73 +6024,76 @@ msgid ""
"If you don't want to use the auto detection, deselect the checkbox.\n"
msgstr ""
-#: ../../netconnect.pm_.c:909
+#: ../../netconnect.pm_.c:913
msgid "Use auto detection"
msgstr ""
-#: ../../netconnect.pm_.c:913 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:917 ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr "Finner enheter..."
-#: ../../netconnect.pm_.c:921
+#: ../../netconnect.pm_.c:925
#, fuzzy
msgid "Normal modem connection"
msgstr "Konfigurer en normal modem-tilkobling"
-#: ../../netconnect.pm_.c:921
+#: ../../netconnect.pm_.c:925
#, fuzzy, c-format
msgid "detected on port %s"
msgstr "Dupliser monteringspunkt %s"
-#: ../../netconnect.pm_.c:922
+#: ../../netconnect.pm_.c:926
#, fuzzy
msgid "ISDN connection"
msgstr "Kabeltilkobling"
-#: ../../netconnect.pm_.c:922
+#: ../../netconnect.pm_.c:926
#, c-format
msgid "detected %s"
msgstr ""
-#: ../../netconnect.pm_.c:923
+#: ../../netconnect.pm_.c:927
#, fuzzy
msgid "DSL (or ADSL) connection"
msgstr "Konfigurer en DSL- (eller ADSL) tilkobling"
-#: ../../netconnect.pm_.c:923
+#: ../../netconnect.pm_.c:927
#, fuzzy, c-format
msgid "detected on interface %s"
msgstr "Nettverksgrensesnitt"
-#: ../../netconnect.pm_.c:924
+#: ../../netconnect.pm_.c:928
#, fuzzy
-msgid "Cable connecion"
+msgid "Cable connection"
msgstr "Kabeltilkobling"
-#: ../../netconnect.pm_.c:925
+#: ../../netconnect.pm_.c:929
#, fuzzy
msgid "LAN connection"
msgstr "Kabeltilkobling"
-#: ../../netconnect.pm_.c:925
+#: ../../netconnect.pm_.c:929
msgid "ethernet card(s) detected"
msgstr ""
-#: ../../netconnect.pm_.c:930
+#: ../../netconnect.pm_.c:934
msgid "How do you want to connect to the Internet?"
msgstr "Hvordan vil du koble opp mot Internett?"
-#: ../../netconnect.pm_.c:951
+#: ../../netconnect.pm_.c:956
msgid ""
-"\n"
"Congratulation, The network and internet configuration is finished.\n"
"\n"
-"The configuration will now be applied to your system.\n"
+"The configuration will now be applied to your system."
+msgstr ""
+
+#: ../../netconnect.pm_.c:959
+msgid ""
"After that is done, we recommend you to restart your X\n"
"environnement to avoid hostname changing problem."
msgstr ""
-#: ../../netconnect.pm_.c:1002
+#: ../../netconnect.pm_.c:1006
msgid ""
"Now that your Internet connection is configured,\n"
"your computer can be configured to share its Internet connection.\n"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 455dda5da..dada8d66a 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-05 17:31+0100\n"
+"POT-Creation-Date: 2001-03-06 01:04+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"
@@ -523,7 +523,7 @@ msgid "Delay before booting default image"
msgstr "Пауза пре стартања default image-а"
#: ../../any.pm_.c:160 ../../any.pm_.c:735
-#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:608
+#: ../../install_steps_interactive.pm_.c:815 ../../netconnect.pm_.c:610
#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
#: ../../standalone/draknet_.c:508
msgid "Password"
@@ -1050,7 +1050,7 @@ msgid "horizontal nice looking aurora"
msgstr ""
#: ../../bootlook.pm_.c:131
-msgid "vertical traditionnal aurora"
+msgid "vertical traditional aurora"
msgstr ""
#: ../../bootlook.pm_.c:135
@@ -2239,7 +2239,7 @@ msgid ""
"hard drive.\n"
"\n"
"\n"
-" * Auto allocate:: this option allows you to automatically create Ext2 and "
+" * Auto allocate: this option allows you to automatically create Ext2 and "
"swap partitions in free space of your\n"
" hard drive.\n"
"\n"
@@ -2294,7 +2294,7 @@ msgid ""
"'bootstrap' partition of at least 1MB for use\n"
"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emgergency boot situations."
+"a spare kernel and ramdisk image for emergency boot situations."
msgstr ""
"На овоj тaчки, морате избрати коjу\n"
"партициjу(e) желите да користите за инсталациjу новог Linux-Mandrake "
@@ -5736,8 +5736,8 @@ msgid ""
msgstr ""
"Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
-#: ../../netconnect.pm_.c:375 ../../netconnect.pm_.c:664
-#: ../../netconnect.pm_.c:809 ../../standalone/drakgw_.c:228
+#: ../../netconnect.pm_.c:375 ../../netconnect.pm_.c:668
+#: ../../netconnect.pm_.c:813 ../../standalone/drakgw_.c:228
msgid "Network interface"
msgstr "Мрeжни интерфejс"
@@ -5761,62 +5761,62 @@ msgstr "ADSL конфигурацијa"
msgid "Do you want to start your connection at boot?"
msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
-#: ../../netconnect.pm_.c:599
+#: ../../netconnect.pm_.c:601
msgid "Please choose which serial port your modem is connected to."
msgstr "Изаберите серијски порт на који је модем повезан."
-#: ../../netconnect.pm_.c:604
+#: ../../netconnect.pm_.c:606
msgid "Dialup options"
msgstr "Dialup опције"
-#: ../../netconnect.pm_.c:605 ../../standalone/draknet_.c:505
+#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:505
msgid "Connection name"
msgstr "Име конекције"
-#: ../../netconnect.pm_.c:606 ../../standalone/draknet_.c:506
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:506
msgid "Phone number"
msgstr "Број телефона"
-#: ../../netconnect.pm_.c:607 ../../standalone/draknet_.c:507
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:507
msgid "Login ID"
msgstr "ID за логовање"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Authentication"
msgstr "Аутентификација"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "PAP"
msgstr "PAP"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Script-based"
msgstr "Базирано на скрипти"
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:509
+#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:509
msgid "Terminal-based"
msgstr "Базирано на терминалу"
-#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:510
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:510
msgid "Domain name"
msgstr "Име домена"
-#: ../../netconnect.pm_.c:611 ../../standalone/draknet_.c:511
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:511
msgid "First DNS Server"
msgstr "Први DNS Сервер"
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:512
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:512
msgid "Second DNS Server"
msgstr "Други DNS Сервер"
-#: ../../netconnect.pm_.c:665
+#: ../../netconnect.pm_.c:669
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:706
+#: ../../netconnect.pm_.c:710
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
@@ -5824,7 +5824,7 @@ msgstr ""
"\n"
"Можете се дисконектовати или реконфигурисати конекциjу."
-#: ../../netconnect.pm_.c:706 ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:710 ../../netconnect.pm_.c:713
msgid ""
"\n"
"You can reconfigure your connection."
@@ -5832,11 +5832,11 @@ msgstr ""
"\n"
"Подеси интернет конфигурациjу"
-#: ../../netconnect.pm_.c:706
+#: ../../netconnect.pm_.c:710
msgid "You are currently connected to internet."
msgstr "Тренутно сте конектовани на Интернет"
-#: ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:713
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
@@ -5844,50 +5844,50 @@ msgstr ""
"\n"
"Сада се можете конектовати на Интернет или реконфигурисати конекциjу"
-#: ../../netconnect.pm_.c:709
+#: ../../netconnect.pm_.c:713
msgid "You are not currently connected to Internet."
msgstr "Тренутно нисте конектовани на Интернет"
-#: ../../netconnect.pm_.c:713
+#: ../../netconnect.pm_.c:717
msgid "Connect to Internet"
msgstr "Конектуj на Интернет"
-#: ../../netconnect.pm_.c:715
+#: ../../netconnect.pm_.c:719
msgid "Disconnect from Internet"
msgstr "Дисконектуj са Интернетa"
-#: ../../netconnect.pm_.c:717
+#: ../../netconnect.pm_.c:721
msgid "Configure network connection (LAN or Internet)"
msgstr "Подеси мрeжну конфигурациjу(LAN или Интернет)"
-#: ../../netconnect.pm_.c:720
+#: ../../netconnect.pm_.c:724
msgid "Internet connection & configuration"
msgstr "Интернет конекциjа и конфигурациja"
-#: ../../netconnect.pm_.c:774 ../../netconnect.pm_.c:893
-#: ../../netconnect.pm_.c:906 ../../netconnect.pm_.c:913
-#: ../../netconnect.pm_.c:929
+#: ../../netconnect.pm_.c:778 ../../netconnect.pm_.c:897
+#: ../../netconnect.pm_.c:910 ../../netconnect.pm_.c:917
+#: ../../netconnect.pm_.c:933
#, fuzzy
msgid "Network Configuration Wizard"
msgstr "Подешавање мрежe"
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "External ISDN modem"
msgstr "Екстерни ISDN модем"
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "Internal ISDN card"
msgstr "Интерна ISDN картицa"
-#: ../../netconnect.pm_.c:775
+#: ../../netconnect.pm_.c:779
msgid "What kind is your ISDN connection?"
msgstr "Каква jе врста вaше ISDN кенекциjе ?"
-#: ../../netconnect.pm_.c:797 ../../netconnect.pm_.c:846
+#: ../../netconnect.pm_.c:801 ../../netconnect.pm_.c:850
msgid "Connect to the Internet"
msgstr "Конектуj на интернет"
-#: ../../netconnect.pm_.c:798
+#: ../../netconnect.pm_.c:802
#, fuzzy
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -5898,79 +5898,79 @@ msgstr ""
"Мeђутим, постоjе конекциjе коjе користе само dhcp.\n"
"Уколико не знатe коjа je, изаберитe 'use pppoe'"
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
#, fuzzy
msgid "use dhcp"
msgstr "dhcpd"
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
msgid "use pppoe"
msgstr "користи pppoe"
-#: ../../netconnect.pm_.c:800
+#: ../../netconnect.pm_.c:804
#, fuzzy
msgid "use pptp"
msgstr "користи pppoe"
-#: ../../netconnect.pm_.c:810
+#: ../../netconnect.pm_.c:814
#, fuzzy, c-format
msgid "I'm about to restart the network device %s. Do you agree?"
msgstr ""
"Сада треба да се рестартуjе мрeжни уређај $netc->{NET_DEVICE}. Да ли се "
"слaжете ?"
-#: ../../netconnect.pm_.c:847
+#: ../../netconnect.pm_.c:851
msgid ""
"Which dhcp client do you want to use?\n"
"Default is dhcpd"
msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpd"
-#: ../../netconnect.pm_.c:862
+#: ../../netconnect.pm_.c:866
msgid "Network configuration"
msgstr "Подешавање мрежe"
-#: ../../netconnect.pm_.c:863
+#: ../../netconnect.pm_.c:867
msgid "Do you want to restart the network"
msgstr "Да ли хоћете да рестартуjeте мрежe?"
-#: ../../netconnect.pm_.c:874
+#: ../../netconnect.pm_.c:878
msgid "Sorry, the mail configuration is not yet implemented. Be patient."
msgstr ""
-#: ../../netconnect.pm_.c:879 ../../netconnect.pm_.c:1001
+#: ../../netconnect.pm_.c:883 ../../netconnect.pm_.c:1005
msgid "Network Configuration"
msgstr "Подешавање мрежe"
-#: ../../netconnect.pm_.c:880
+#: ../../netconnect.pm_.c:884
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
-"Click on Ok to reconfigure your Network/Internet connection, or cancel to "
-"skip the step.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
msgstr ""
-#: ../../netconnect.pm_.c:894
+#: ../../netconnect.pm_.c:898
msgid ""
"Welcome to The Network Configuration Wizard.\n"
"Which components do you want to configure?\n"
msgstr ""
-#: ../../netconnect.pm_.c:896
+#: ../../netconnect.pm_.c:900
#, fuzzy
msgid "Internet/Network access"
msgstr "Интернет"
-#: ../../netconnect.pm_.c:897
+#: ../../netconnect.pm_.c:901
#, fuzzy
msgid "Mail information"
msgstr "Прикажи информације"
-#: ../../netconnect.pm_.c:898
+#: ../../netconnect.pm_.c:902
#, fuzzy
msgid "Choose the profile to configure"
msgstr "Изаберите default (основног) корисникa:"
-#: ../../netconnect.pm_.c:907
+#: ../../netconnect.pm_.c:911
msgid ""
"Internet Connection\n"
"\n"
@@ -5978,73 +5978,76 @@ msgid ""
"If you don't want to use the auto detection, deselect the checkbox.\n"
msgstr ""
-#: ../../netconnect.pm_.c:909
+#: ../../netconnect.pm_.c:913
msgid "Use auto detection"
msgstr ""
-#: ../../netconnect.pm_.c:913 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:917 ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr "Детектуjем урeђаje..."
-#: ../../netconnect.pm_.c:921
+#: ../../netconnect.pm_.c:925
#, fuzzy
msgid "Normal modem connection"
msgstr "Подеси нормалну модемске конекциjу"
-#: ../../netconnect.pm_.c:921
+#: ../../netconnect.pm_.c:925
#, fuzzy, c-format
msgid "detected on port %s"
msgstr "Дуплиранa тачка монтирања %s"
-#: ../../netconnect.pm_.c:922
+#: ../../netconnect.pm_.c:926
#, fuzzy
msgid "ISDN connection"
msgstr "Кабловска конекциja"
-#: ../../netconnect.pm_.c:922
+#: ../../netconnect.pm_.c:926
#, c-format
msgid "detected %s"
msgstr ""
-#: ../../netconnect.pm_.c:923
+#: ../../netconnect.pm_.c:927
#, fuzzy
msgid "DSL (or ADSL) connection"
msgstr "Подеси DSL (или ADSL) конекциjу"
-#: ../../netconnect.pm_.c:923
+#: ../../netconnect.pm_.c:927
#, fuzzy, c-format
msgid "detected on interface %s"
msgstr "Мрeжни интерфejс"
-#: ../../netconnect.pm_.c:924
+#: ../../netconnect.pm_.c:928
#, fuzzy
-msgid "Cable connecion"
+msgid "Cable connection"
msgstr "Кабловска конекциja"
-#: ../../netconnect.pm_.c:925
+#: ../../netconnect.pm_.c:929
#, fuzzy
msgid "LAN connection"
msgstr "Кабловска конекциja"
-#: ../../netconnect.pm_.c:925
+#: ../../netconnect.pm_.c:929
msgid "ethernet card(s) detected"
msgstr ""
-#: ../../netconnect.pm_.c:930
+#: ../../netconnect.pm_.c:934
msgid "How do you want to connect to the Internet?"
msgstr "Како желите да се конектуjете на интернет ?"
-#: ../../netconnect.pm_.c:951
+#: ../../netconnect.pm_.c:956
msgid ""
-"\n"
"Congratulation, The network and internet configuration is finished.\n"
"\n"
-"The configuration will now be applied to your system.\n"
+"The configuration will now be applied to your system."
+msgstr ""
+
+#: ../../netconnect.pm_.c:959
+msgid ""
"After that is done, we recommend you to restart your X\n"
"environnement to avoid hostname changing problem."
msgstr ""
-#: ../../netconnect.pm_.c:1002
+#: ../../netconnect.pm_.c:1006
msgid ""
"Now that your Internet connection is configured,\n"
"your computer can be configured to share its Internet connection.\n"