summaryrefslogtreecommitdiffstats
path: root/po/lv.po
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-04-02 16:33:10 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-04-02 16:33:10 +0000
commitfe5fcc80319e0bfa26fcfac34bbc998e1c78db75 (patch)
tree9a77dc6289fd525ac53f13456e3df4711efa6ae4 /po/lv.po
parentfd3ecf4345f68d6426e53dfd8211709452bbc04a (diff)
downloaddrakx-net-fe5fcc80319e0bfa26fcfac34bbc998e1c78db75.tar
drakx-net-fe5fcc80319e0bfa26fcfac34bbc998e1c78db75.tar.gz
drakx-net-fe5fcc80319e0bfa26fcfac34bbc998e1c78db75.tar.bz2
drakx-net-fe5fcc80319e0bfa26fcfac34bbc998e1c78db75.tar.xz
drakx-net-fe5fcc80319e0bfa26fcfac34bbc998e1c78db75.zip
po: spelling fix.
Diffstat (limited to 'po/lv.po')
-rw-r--r--po/lv.po314
1 files changed, 157 insertions, 157 deletions
diff --git a/po/lv.po b/po/lv.po
index 61b7aec..caa0575 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2009-03-31 10:42-0300\n"
+"POT-Creation-Date: 2009-04-02 13:30-0300\n"
"PO-Revision-Date: 2002-09-27 17:45+0200\n"
"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
"Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -24,19 +24,19 @@ msgid "Interface"
msgstr "Interfeiss"
#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:617
+#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:626
#: ../lib/network/vpn/openvpn.pm:221
#, c-format
msgid "IP address"
msgstr "IP adrese"
#: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:461
+#: ../lib/network/netconnect.pm:470
#, c-format
msgid "Protocol"
msgstr "Protokols"
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:447
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:456
#, c-format
msgid "Driver"
msgstr "Draiveris"
@@ -98,7 +98,7 @@ msgstr "Labi"
#: ../lib/network/connection_manager.pm:348 ../lib/network/drakvpn.pm:49
#: ../lib/network/netcenter.pm:142 ../lib/network/netconnect.pm:186
#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:717 ../lib/network/thirdparty.pm:354
+#: ../lib/network/netconnect.pm:726 ../lib/network/thirdparty.pm:354
#: ../lib/network/thirdparty.pm:369
#, c-format
msgid "Please wait"
@@ -267,8 +267,8 @@ msgstr "Pārkonfigurēt"
msgid "Please select the network interface directly connected to the internet."
msgstr ""
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:363
-#: ../lib/network/netconnect.pm:398
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:372
+#: ../lib/network/netconnect.pm:407
#, fuzzy, c-format
msgid "Net Device"
msgstr "Xinetd serviss"
@@ -328,7 +328,7 @@ msgstr "Ieksējais domēna vārds"
#: ../bin/draksambashare:1363 ../bin/draksambashare:1385
#: ../bin/draksambashare:1394 ../bin/draksambashare:1413
#: ../bin/draksambashare:1422 ../bin/draksambashare:1434
-#: ../lib/network/connection/xdsl.pm:359
+#: ../lib/network/connection/xdsl.pm:361
#: ../lib/network/connection_manager.pm:62
#: ../lib/network/connection_manager.pm:68
#: ../lib/network/connection_manager.pm:84
@@ -342,7 +342,7 @@ msgstr "Ieksējais domēna vārds"
#: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
#: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
#: ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234
-#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:831
+#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:840
#: ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141
#: ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:234
#: ../lib/network/thirdparty.pm:255
@@ -450,7 +450,7 @@ msgid ""
"No ethernet network adapter configured for LAN has been detected on your "
"system.\n"
"\n"
-"Please run the hardware configuration tool to configure it, and certify that "
+"Please run the hardware configuration tool to configure it, and ensure that "
"the Mandriva firewall is not enabled for network adapter connected to your "
"LAN network."
msgstr ""
@@ -797,7 +797,7 @@ msgstr ""
msgid "Virtual ID"
msgstr ""
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:599
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:608
#: ../lib/network/vpn/vpnc.pm:56
#, c-format
msgid "Password"
@@ -853,7 +853,7 @@ msgstr ""
#: ../bin/draknetprofile:165 ../bin/draknetprofile:167
#: ../bin/draknetprofile.orig:165 ../bin/draknetprofile.orig:167
#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:484
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:493
#, c-format
msgid "Warning"
msgstr "Uzmanību"
@@ -2131,7 +2131,7 @@ msgstr ""
msgid "Profiles"
msgstr "Profili"
-#: ../bin/net_applet:180 ../lib/network/connection.pm:226
+#: ../bin/net_applet:180 ../lib/network/connection.pm:228
#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
#: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
#, fuzzy, c-format
@@ -2326,67 +2326,67 @@ msgstr "Interneta savienojuma konfigurācija"
msgid "Unknown connection type"
msgstr "Nezināms konekcijas tips"
-#: ../lib/network/connection.pm:159
+#: ../lib/network/connection.pm:161
#, c-format
msgid "Network access settings"
msgstr ""
-#: ../lib/network/connection.pm:160
+#: ../lib/network/connection.pm:162
#, c-format
msgid "Access settings"
msgstr ""
-#: ../lib/network/connection.pm:161
+#: ../lib/network/connection.pm:163
#, c-format
msgid "Address settings"
msgstr ""
-#: ../lib/network/connection.pm:175 ../lib/network/connection.pm:195
-#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:217
-#: ../lib/network/netconnect.pm:476 ../lib/network/netconnect.pm:572
-#: ../lib/network/netconnect.pm:575
+#: ../lib/network/connection.pm:177 ../lib/network/connection.pm:197
+#: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
+#: ../lib/network/netconnect.pm:485 ../lib/network/netconnect.pm:581
+#: ../lib/network/netconnect.pm:584
#, c-format
msgid "Unlisted - edit manually"
msgstr ""
-#: ../lib/network/connection.pm:228 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection.pm:230 ../lib/network/connection/cable.pm:41
#: ../lib/network/connection/wireless.pm:48 ../lib/network/vpn/openvpn.pm:127
#: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
#, c-format
msgid "None"
msgstr "Nekas"
-#: ../lib/network/connection.pm:240
+#: ../lib/network/connection.pm:242
#, c-format
msgid "Allow users to manage the connection"
msgstr ""
-#: ../lib/network/connection.pm:241
+#: ../lib/network/connection.pm:243
#, c-format
msgid "Start the connection at boot"
msgstr ""
-#: ../lib/network/connection.pm:242
+#: ../lib/network/connection.pm:244
#, fuzzy, c-format
msgid "Metric"
msgstr "ierobežot"
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:245
#, c-format
msgid "MTU"
msgstr ""
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:246
#, c-format
msgid "Maximum size of network message (MTU). If unsure, left blank."
msgstr ""
-#: ../lib/network/connection.pm:316
+#: ../lib/network/connection.pm:318
#, fuzzy, c-format
msgid "Link detected on interface %s"
msgstr "atklāts uz porta %s"
-#: ../lib/network/connection.pm:317 ../lib/network/connection/ethernet.pm:291
+#: ../lib/network/connection.pm:319 ../lib/network/connection/ethernet.pm:291
#, c-format
msgid "Link beat lost on interface %s"
msgstr ""
@@ -2406,19 +2406,19 @@ msgstr "Kartes modelis:"
msgid "Use BPALogin (needed for Telstra)"
msgstr ""
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:600
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:609
#, c-format
msgid "Authentication"
msgstr "Autentifikācija"
#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:339 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:348 ../lib/network/vpn/openvpn.pm:393
#, c-format
msgid "Account Login (user name)"
msgstr "Konta nosaukums (lietotāja vārds)"
#: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:340 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:349 ../lib/network/vpn/openvpn.pm:394
#, c-format
msgid "Account Password"
msgstr "Konta parole"
@@ -2543,7 +2543,7 @@ msgstr ""
"Visi dati jāievada kā IP adreses ar punktiem atdalītu decimālu\n"
"skaitļu veidā (piemēram, 1.2.3.4)."
-#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:649
+#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:658
#: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
#, c-format
msgid "Gateway"
@@ -2662,22 +2662,22 @@ msgstr ""
msgid "ISDN"
msgstr ""
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
#, c-format
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
#, c-format
msgid "I do not know"
msgstr "Nezinu"
-#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:417
#, c-format
msgid "PCI"
msgstr "PCI"
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:417
#, c-format
msgid "USB"
msgstr "USB"
@@ -3560,12 +3560,12 @@ msgstr ""
msgid "DSL"
msgstr "SSL"
-#: ../lib/network/connection/xdsl.pm:95 ../lib/network/netconnect.pm:773
+#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:782
#, fuzzy, c-format
msgid "Alcatel speedtouch USB modem"
msgstr "Alcatel speedtouch usb"
-#: ../lib/network/connection/xdsl.pm:123
+#: ../lib/network/connection/xdsl.pm:125
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -3574,54 +3574,54 @@ msgid ""
"You can find a driver on http://eciadsl.flashtux.org/"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:183
+#: ../lib/network/connection/xdsl.pm:185
#, c-format
msgid ""
"Modems using Conexant AccessRunner chipsets cannot be supported due to "
"binary firmware distribution problem."
msgstr ""
-#: ../lib/network/connection/xdsl.pm:203
+#: ../lib/network/connection/xdsl.pm:205
#, c-format
msgid "DSL over CAPI"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:206
+#: ../lib/network/connection/xdsl.pm:208
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:207
+#: ../lib/network/connection/xdsl.pm:209
#, fuzzy, c-format
msgid "Manual TCP/IP configuration"
msgstr "Manuāla konfigurēšana"
-#: ../lib/network/connection/xdsl.pm:208
+#: ../lib/network/connection/xdsl.pm:210
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:209
+#: ../lib/network/connection/xdsl.pm:211
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:210
+#: ../lib/network/connection/xdsl.pm:212
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:250
+#: ../lib/network/connection/xdsl.pm:252
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:251
+#: ../lib/network/connection/xdsl.pm:253
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr ""
-#: ../lib/network/connection/xdsl.pm:359
+#: ../lib/network/connection/xdsl.pm:361
#: ../lib/network/connection_manager.pm:62 ../lib/network/drakvpn.pm:45
#: ../lib/network/netconnect.pm:135 ../lib/network/thirdparty.pm:123
#, fuzzy, c-format
@@ -3911,7 +3911,7 @@ msgstr "Konfigurēt"
msgid "Refresh"
msgstr "Atsvaidzināt"
-#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:779
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:788
#, fuzzy, c-format
msgid "Wireless connection"
msgstr "Kabeļa savienojums"
@@ -4046,8 +4046,8 @@ msgid "port %d"
msgstr "Ziņojums"
#: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:616
-#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:625
+#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
#, c-format
msgid "Manual"
msgstr "Pašrocīgi"
@@ -4055,10 +4055,10 @@ msgstr "Pašrocīgi"
#: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
#: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
#: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:611
-#: ../lib/network/netconnect.pm:616 ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
-#: ../lib/network/netconnect.pm:651
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:620
+#: ../lib/network/netconnect.pm:625 ../lib/network/netconnect.pm:637
+#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
+#: ../lib/network/netconnect.pm:660
#, c-format
msgid "Automatic"
msgstr "Automātiski"
@@ -4142,8 +4142,8 @@ msgstr "Paplašināti parametri"
msgid "United States"
msgstr "A.S.V."
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:506
-#: ../lib/network/netconnect.pm:520
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:515
+#: ../lib/network/netconnect.pm:529
#, fuzzy, c-format
msgid "Manual choice"
msgstr "Mjanma"
@@ -4182,8 +4182,8 @@ msgstr "Tīkla konfigurācija"
msgid "Choose the connection you want to configure"
msgstr "Izvēlieties savienojumu, kuru vēlaties konfigurēt"
-#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:361
-#: ../lib/network/netconnect.pm:806
+#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:370
+#: ../lib/network/netconnect.pm:815
#, fuzzy, c-format
msgid "Select the network interface to configure:"
msgstr "Izvēlieties tīkla interfeisu"
@@ -4215,114 +4215,114 @@ msgid ""
"If you do not know it, keep the preselected protocol."
msgstr ""
-#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:668
+#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:677
#, c-format
msgid "Connection control"
msgstr ""
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:717
+#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:726
#, c-format
msgid "Testing your connection..."
msgstr "Izmēģinu savienojumu..."
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:337
#, c-format
msgid "Connection Configuration"
msgstr "Savienojuma konfigurēšana"
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:337
#, c-format
msgid "Please fill or check the field below"
msgstr "Lūdzu aizpildiet vai izvēlietis lauku"
-#: ../lib/network/netconnect.pm:331
+#: ../lib/network/netconnect.pm:340
#, c-format
msgid "Your personal phone number"
msgstr "Jūsu privātais telefona numurs"
-#: ../lib/network/netconnect.pm:332
+#: ../lib/network/netconnect.pm:341
#, c-format
msgid "Provider name (ex provider.net)"
msgstr "Pakalpojumu sniedzēja nosaukums (piem., provider.net)"
-#: ../lib/network/netconnect.pm:333
+#: ../lib/network/netconnect.pm:342
#, c-format
msgid "Provider phone number"
msgstr "Pakalpojumu sniedzēja telefona numurs"
-#: ../lib/network/netconnect.pm:334
+#: ../lib/network/netconnect.pm:343
#, fuzzy, c-format
msgid "Provider DNS 1 (optional)"
msgstr "Provaidera dns 1 (nav obligāti)"
-#: ../lib/network/netconnect.pm:335
+#: ../lib/network/netconnect.pm:344
#, fuzzy, c-format
msgid "Provider DNS 2 (optional)"
msgstr "Provaidera dns 2 (nav obligāti)"
-#: ../lib/network/netconnect.pm:336
+#: ../lib/network/netconnect.pm:345
#, c-format
msgid "Dialing mode"
msgstr "Zvanīšanas režīms"
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:346
#, c-format
msgid "Connection speed"
msgstr "Savienojuma ātrums"
-#: ../lib/network/netconnect.pm:338
+#: ../lib/network/netconnect.pm:347
#, c-format
msgid "Connection timeout (in sec)"
msgstr "Savienojuma taimauts (sek.)"
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:350
#, c-format
msgid "Card IRQ"
msgstr "Kartes IRQ"
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:351
#, c-format
msgid "Card mem (DMA)"
msgstr "Kartes mem (DMA)"
-#: ../lib/network/netconnect.pm:343
+#: ../lib/network/netconnect.pm:352
#, c-format
msgid "Card IO"
msgstr "Kartes IO"
-#: ../lib/network/netconnect.pm:344
+#: ../lib/network/netconnect.pm:353
#, c-format
msgid "Card IO_0"
msgstr "Kartes IO_0"
-#: ../lib/network/netconnect.pm:345
+#: ../lib/network/netconnect.pm:354
#, c-format
msgid "Card IO_1"
msgstr "Kartes IO_1"
-#: ../lib/network/netconnect.pm:364 ../lib/network/netconnect.pm:369
+#: ../lib/network/netconnect.pm:373 ../lib/network/netconnect.pm:378
#, c-format
msgid "External ISDN modem"
msgstr "Ārējs ISDN modēms"
-#: ../lib/network/netconnect.pm:397
+#: ../lib/network/netconnect.pm:406
#, fuzzy, c-format
msgid "Select a device!"
msgstr "Izvēlieties skeneri"
-#: ../lib/network/netconnect.pm:406 ../lib/network/netconnect.pm:416
-#: ../lib/network/netconnect.pm:426 ../lib/network/netconnect.pm:459
-#: ../lib/network/netconnect.pm:473
+#: ../lib/network/netconnect.pm:415 ../lib/network/netconnect.pm:425
+#: ../lib/network/netconnect.pm:435 ../lib/network/netconnect.pm:468
+#: ../lib/network/netconnect.pm:482
#, c-format
msgid "ISDN Configuration"
msgstr "ISDN konfigurācija"
-#: ../lib/network/netconnect.pm:407
+#: ../lib/network/netconnect.pm:416
#, c-format
msgid "What kind of card do you have?"
msgstr "Kāds ir jūsu kartes tips?"
-#: ../lib/network/netconnect.pm:417
+#: ../lib/network/netconnect.pm:426
#, c-format
msgid ""
"\n"
@@ -4336,22 +4336,22 @@ msgstr ""
"\n"
"Ja jums ir PCMCIA karte, jums ir jāzina kartes irq un io.\n"
-#: ../lib/network/netconnect.pm:421
+#: ../lib/network/netconnect.pm:430
#, c-format
msgid "Continue"
msgstr "Turpināt"
-#: ../lib/network/netconnect.pm:421
+#: ../lib/network/netconnect.pm:430
#, c-format
msgid "Abort"
msgstr "Pārtraukt"
-#: ../lib/network/netconnect.pm:427
+#: ../lib/network/netconnect.pm:436
#, fuzzy, c-format
msgid "Which of the following is your ISDN card?"
msgstr "Kura ir jūsu ISDN karte ?"
-#: ../lib/network/netconnect.pm:445
+#: ../lib/network/netconnect.pm:454
#, c-format
msgid ""
"A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -4359,12 +4359,12 @@ msgid ""
"want to use?"
msgstr ""
-#: ../lib/network/netconnect.pm:459
+#: ../lib/network/netconnect.pm:468
#, c-format
msgid "Which protocol do you want to use?"
msgstr "Kādu protokolu vēlaties izmantot?"
-#: ../lib/network/netconnect.pm:473
+#: ../lib/network/netconnect.pm:482
#, c-format
msgid ""
"Select your provider.\n"
@@ -4373,144 +4373,144 @@ msgstr ""
"Izvēlieties pakalpojumu sniedzēju.\n"
" Ja tas nav šajā sarakstā, izvēlietis Nav sarakstā"
-#: ../lib/network/netconnect.pm:475 ../lib/network/netconnect.pm:571
+#: ../lib/network/netconnect.pm:484 ../lib/network/netconnect.pm:580
#, fuzzy, c-format
msgid "Provider:"
msgstr "Printeris"
-#: ../lib/network/netconnect.pm:484
+#: ../lib/network/netconnect.pm:493
#, c-format
msgid ""
"Your modem is not supported by the system.\n"
"Take a look at http://www.linmodems.org"
msgstr ""
-#: ../lib/network/netconnect.pm:503
+#: ../lib/network/netconnect.pm:512
#, fuzzy, c-format
msgid "Select the modem to configure:"
msgstr "Izvēlieties tīkla interfeisu"
-#: ../lib/network/netconnect.pm:505
+#: ../lib/network/netconnect.pm:514
#, c-format
msgid "Modem"
msgstr "Modēms"
-#: ../lib/network/netconnect.pm:540
+#: ../lib/network/netconnect.pm:549
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr "Lūdzu norādiet, kuram seriālajam portam ir pievienots modēms."
-#: ../lib/network/netconnect.pm:569
+#: ../lib/network/netconnect.pm:578
#, fuzzy, c-format
msgid "Select your provider:"
msgstr "Izvēlieties printera spolētāju"
-#: ../lib/network/netconnect.pm:593
+#: ../lib/network/netconnect.pm:602
#, fuzzy, c-format
msgid "Dialup: account options"
msgstr "Iezvanpieejas opcijas"
-#: ../lib/network/netconnect.pm:596
+#: ../lib/network/netconnect.pm:605
#, c-format
msgid "Connection name"
msgstr "Savienojuma nosaukums"
-#: ../lib/network/netconnect.pm:597
+#: ../lib/network/netconnect.pm:606
#, c-format
msgid "Phone number"
msgstr "Telefona numurs"
-#: ../lib/network/netconnect.pm:598
+#: ../lib/network/netconnect.pm:607
#, c-format
msgid "Login ID"
msgstr "Lietotāja ID"
-#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:622 ../lib/network/netconnect.pm:655
#, fuzzy, c-format
msgid "Dialup: IP parameters"
msgstr "Parametri"
-#: ../lib/network/netconnect.pm:616
+#: ../lib/network/netconnect.pm:625
#, fuzzy, c-format
msgid "IP parameters"
msgstr "Parametri"
-#: ../lib/network/netconnect.pm:618
+#: ../lib/network/netconnect.pm:627
#, fuzzy, c-format
msgid "Subnet mask"
msgstr "Tīkla maska"
-#: ../lib/network/netconnect.pm:630
+#: ../lib/network/netconnect.pm:639
#, c-format
msgid "Dialup: DNS parameters"
msgstr ""
-#: ../lib/network/netconnect.pm:633
+#: ../lib/network/netconnect.pm:642
#, c-format
msgid "DNS"
msgstr "DNS"
-#: ../lib/network/netconnect.pm:634
+#: ../lib/network/netconnect.pm:643
#, c-format
msgid "Domain name"
msgstr "Domēna nosaukums"
-#: ../lib/network/netconnect.pm:635
+#: ../lib/network/netconnect.pm:644
#, c-format
msgid "First DNS Server (optional)"
msgstr "Pirmais DNS serveris (neobligāts)"
-#: ../lib/network/netconnect.pm:636
+#: ../lib/network/netconnect.pm:645
#, c-format
msgid "Second DNS Server (optional)"
msgstr "Otrais DNS serveris (neobligāts)"
-#: ../lib/network/netconnect.pm:637
+#: ../lib/network/netconnect.pm:646
#, fuzzy, c-format
msgid "Set hostname from IP"
msgstr "Printera resursa vārds vai IP"
-#: ../lib/network/netconnect.pm:650
+#: ../lib/network/netconnect.pm:659
#, fuzzy, c-format
msgid "Gateway IP address"
msgstr "IP adrese"
-#: ../lib/network/netconnect.pm:683
+#: ../lib/network/netconnect.pm:692
#, fuzzy, c-format
msgid "Automatically at boot"
msgstr "Sākt pie ielādes"
-#: ../lib/network/netconnect.pm:685
+#: ../lib/network/netconnect.pm:694
#, c-format
msgid "By using Net Applet in the system tray"
msgstr ""
-#: ../lib/network/netconnect.pm:687
+#: ../lib/network/netconnect.pm:696
#, c-format
msgid "Manually (the interface would still be activated at boot)"
msgstr ""
-#: ../lib/network/netconnect.pm:696
+#: ../lib/network/netconnect.pm:705
#, fuzzy, c-format
msgid "How do you want to dial this connection?"
msgstr "Vai vēlaties startēt savienojumu palaišanas laikā?"
-#: ../lib/network/netconnect.pm:709
+#: ../lib/network/netconnect.pm:718
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr "Vai vēlaties mēģināt savienoties ar internetu tūlīt?"
-#: ../lib/network/netconnect.pm:736
+#: ../lib/network/netconnect.pm:745
#, fuzzy, c-format
msgid "The system is now connected to the Internet."
msgstr "Sistēma pašlaik ir savienota ar Internetu."
-#: ../lib/network/netconnect.pm:737
+#: ../lib/network/netconnect.pm:746
#, fuzzy, c-format
msgid "For security reasons, it will be disconnected now."
msgstr "Tā tiks tagad atslēgta drošības dēļ."
-#: ../lib/network/netconnect.pm:738
+#: ../lib/network/netconnect.pm:747
#, fuzzy, c-format
msgid ""
"The system does not seem to be connected to the Internet.\n"
@@ -4519,7 +4519,7 @@ msgstr ""
"Šķiet, ja jūsu sistēmu nav pieslēgta Internetam.\n"
"Mēģiniet pārkonfigurēt savienojumu."
-#: ../lib/network/netconnect.pm:754
+#: ../lib/network/netconnect.pm:763
#, fuzzy, c-format
msgid "Problems occured during the network connectivity test."
msgstr ""
@@ -4527,21 +4527,21 @@ msgstr ""
"\n"
"%s"
-#: ../lib/network/netconnect.pm:755
+#: ../lib/network/netconnect.pm:764
#, c-format
msgid ""
"This can be caused by invalid network configuration, or problems with your "
"modem or router."
msgstr ""
-#: ../lib/network/netconnect.pm:756
+#: ../lib/network/netconnect.pm:765
#, c-format
msgid ""
"You might want to relaunch the configuration to verify the connection "
"settings."
msgstr ""
-#: ../lib/network/netconnect.pm:759
+#: ../lib/network/netconnect.pm:768
#, fuzzy, c-format
msgid "Congratulations, the network configuration is finished."
msgstr ""
@@ -4549,14 +4549,14 @@ msgstr ""
"Konfigurācija tagad tiks lietota uz Jūsu datora.\n"
"\n"
-#: ../lib/network/netconnect.pm:759
+#: ../lib/network/netconnect.pm:768
#, c-format
msgid ""
"However, the Internet connectivity test failed. You should test your "
"connection manually, and verify your Internet modem or router."
msgstr ""
-#: ../lib/network/netconnect.pm:760
+#: ../lib/network/netconnect.pm:769
#, fuzzy, c-format
msgid ""
"If your connection does not work, you might want to relaunch the "
@@ -4566,7 +4566,7 @@ msgstr ""
"Pārbaudiet savienojumu ar net_monitor vai mcc. Ja savienojums nestrādā, Jūs, "
"iespējams, vēlaties atkārtot konfigurēšanu."
-#: ../lib/network/netconnect.pm:762
+#: ../lib/network/netconnect.pm:771
#, fuzzy, c-format
msgid "Congratulations, the network and Internet configuration are finished."
msgstr ""
@@ -4574,7 +4574,7 @@ msgstr ""
"Konfigurācija tagad tiks lietota uz Jūsu datora.\n"
"\n"
-#: ../lib/network/netconnect.pm:763
+#: ../lib/network/netconnect.pm:772
#, c-format
msgid ""
"After this is done, we recommend that you restart your X environment to "
@@ -4583,78 +4583,78 @@ msgstr ""
"Kad tas tiks paveikts, mēs rekomendējam restartēt X vidi, lai izvairītos no "
"problēmām, saistītām ar hosta vārdu."
-#: ../lib/network/netconnect.pm:774
+#: ../lib/network/netconnect.pm:783
#, fuzzy, c-format
msgid "Sagem USB modem"
msgstr "Sistēmas režīms"
-#: ../lib/network/netconnect.pm:775 ../lib/network/netconnect.pm:776
+#: ../lib/network/netconnect.pm:784 ../lib/network/netconnect.pm:785
#, c-format
msgid "Bewan modem"
msgstr ""
-#: ../lib/network/netconnect.pm:777
+#: ../lib/network/netconnect.pm:786
#, c-format
msgid "ECI Hi-Focus modem"
msgstr ""
-#: ../lib/network/netconnect.pm:778
+#: ../lib/network/netconnect.pm:787
#, c-format
msgid "LAN connection"
msgstr "LAN savienojums"
-#: ../lib/network/netconnect.pm:780
+#: ../lib/network/netconnect.pm:789
#, c-format
msgid "ADSL connection"
msgstr "ADSL savienojums"
-#: ../lib/network/netconnect.pm:781
+#: ../lib/network/netconnect.pm:790
#, c-format
msgid "Cable connection"
msgstr "Kabeļa savienojums"
-#: ../lib/network/netconnect.pm:782
+#: ../lib/network/netconnect.pm:791
#, c-format
msgid "ISDN connection"
msgstr "ISDN savienojums"
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:792
#, fuzzy, c-format
msgid "Modem connection"
msgstr "Parasts modēma savienojums"
-#: ../lib/network/netconnect.pm:784
+#: ../lib/network/netconnect.pm:793
#, c-format
msgid "DVB connection"
msgstr ""
-#: ../lib/network/netconnect.pm:786
+#: ../lib/network/netconnect.pm:795
#, fuzzy, c-format
msgid "(detected on port %s)"
msgstr "atklāts uz porta %s"
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:788
+#: ../lib/network/netconnect.pm:797
#, fuzzy, c-format
msgid "(detected %s)"
msgstr "atklāts %s"
-#: ../lib/network/netconnect.pm:788
+#: ../lib/network/netconnect.pm:797
#, fuzzy, c-format
msgid "(detected)"
msgstr "atklāts %s"
-#: ../lib/network/netconnect.pm:789
+#: ../lib/network/netconnect.pm:798
#, c-format
msgid "Network Configuration"
msgstr "Tīkla konfigurācija"
-#: ../lib/network/netconnect.pm:790
+#: ../lib/network/netconnect.pm:799
#, fuzzy, c-format
msgid "Zeroconf hostname resolution"
msgstr "Resursa vārds"
-#: ../lib/network/netconnect.pm:791
+#: ../lib/network/netconnect.pm:800
#, c-format
msgid ""
"If desired, enter a Zeroconf hostname.\n"
@@ -4663,17 +4663,17 @@ msgid ""
"It is not necessary on most networks."
msgstr ""
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:804
#, fuzzy, c-format
msgid "Zeroconf Host name"
msgstr "Resursa vārds"
-#: ../lib/network/netconnect.pm:796
+#: ../lib/network/netconnect.pm:805
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr ""
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:806
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -4685,12 +4685,12 @@ msgstr ""
"Klikšķiniet uz Labi, lai paturētu konfigurāciju, vai uz Atlikt, lai "
"konfigurētu Internet un tīkla savienojumu.\n"
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:809
#, fuzzy, c-format
msgid "The network needs to be restarted. Do you want to restart it?"
msgstr "Nepieciešams instalēt pakotni %s. Vai vēlaties to instalēt?"
-#: ../lib/network/netconnect.pm:801
+#: ../lib/network/netconnect.pm:810
#, c-format
msgid ""
"A problem occurred while restarting the network: \n"
@@ -4701,7 +4701,7 @@ msgstr ""
"\n"
"%s"
-#: ../lib/network/netconnect.pm:802
+#: ../lib/network/netconnect.pm:811
#, fuzzy, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -4717,12 +4717,12 @@ msgstr ""
"\n"
"Nospiediet Labi lai turpinātu."
-#: ../lib/network/netconnect.pm:803
+#: ../lib/network/netconnect.pm:812
#, fuzzy, c-format
msgid "Configuration is complete, do you want to apply settings?"
msgstr "Kuru Xorg konfigurāciju izvēlaties?"
-#: ../lib/network/netconnect.pm:804
+#: ../lib/network/netconnect.pm:813
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -4733,24 +4733,24 @@ msgstr ""
"Izvēlieties vienu, kuru vēlaties lietot.\n"
"\n"
-#: ../lib/network/netconnect.pm:805
+#: ../lib/network/netconnect.pm:814
#, c-format
msgid "Internet connection"
msgstr "Interneta savienojums"
-#: ../lib/network/netconnect.pm:807
+#: ../lib/network/netconnect.pm:816
#, fuzzy, c-format
msgid "Configuring network device %s (driver %s)"
msgstr "Konfigurēju tīkla iekārtu %s"
-#: ../lib/network/netconnect.pm:808
+#: ../lib/network/netconnect.pm:817
#, c-format
msgid ""
"The following protocols can be used to configure a LAN connection. Please "
"choose the one you want to use."
msgstr ""
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:818
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -4763,27 +4763,27 @@ msgstr ""
"piemēram, ``mybox.mylab.myco.com''.\n"
"Jūs varat ievadīt arī vārtejas IP adresi, ja tāda ir"
-#: ../lib/network/netconnect.pm:814
+#: ../lib/network/netconnect.pm:823
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
msgstr ""
-#: ../lib/network/netconnect.pm:815
+#: ../lib/network/netconnect.pm:824
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNS servera adreses formātam jābūt 1.2.3.4"
-#: ../lib/network/netconnect.pm:816
+#: ../lib/network/netconnect.pm:825
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "Vārtejas adreses formātam ir jābūt 1.2.3.4"
-#: ../lib/network/netconnect.pm:817
+#: ../lib/network/netconnect.pm:826
#, c-format
msgid "Gateway device"
msgstr "Vārtejas ierīce"
-#: ../lib/network/netconnect.pm:831
+#: ../lib/network/netconnect.pm:840
#, c-format
msgid ""
"An unexpected error has happened:\n"
unt { my ($o, $o_reread) = @_; if ($o_reread) { $o->{all_hds} = fsedit::empty_all_hds(); install_any::getHds($o, $o); } if ($virtual_key_part) { #- :/ merge_from_mtab didn't got my virtual key, need to add it manually push @{$o->{fstab}}, $virtual_key_part; } require fs; fs::mount_part($_) foreach key_parts($o); } sub key_umount { my ($o) = @_; eval { fs::umount_part($_) foreach key_parts($o); 1 }; } sub machine_ident { #- , c::get_hw_address('eth0'); before detect of network :( md5_hex(join '', (map { (split)[1] } cat_('/proc/bus/pci/devices'))); } sub key_installfiles { my ($mode) = @_; my $done if 0; $done and return; mkdir $key_sysconf; my $sysconf = "$key_sysconf/" . machine_ident(); my $copy_userinfo = sub { my (@files) = @_; my @etcpasswords = glob("$key_sysconf/*/etc/passwd"); if (@etcpasswords > 1) { print "inconsistency: more than one /etc/passwd on key! can't proceed, please clean the key\n"; exit 1; } return if !@etcpasswords; my ($path) = $etcpasswords[0] =~ m|(.*)/etc/passwd|; run_program::run('cp', '-f', "$path$_", $_) foreach @files; run_program::run('rm', '-f', $etcpasswords[0]); }; if (!-d $sysconf) { if ($mode eq 'full') { log::l("key_installfiles: installing config files in $sysconf"); mkdir $sysconf; foreach (chomp_(cat_('/image/move/keyfiles'))) { my $target_dir = "$sysconf/" . dirname($_); mkdir_p($target_dir); if (/\*$/) { system("cp $_ $target_dir"); symlinkf("$sysconf$_", $_) foreach glob($_); } else { system("cp $_ $sysconf$_"); symlinkf("$sysconf$_", $_); } } system("cp /image/move/README.adding.more.files $key_sysconf"); $done = 1; } else { #- not in full mode and no host directory, grab user config from first existing host directory if possible log::l("key_installfiles: only looking for user config files"); $copy_userinfo->(qw(/etc/passwd /etc/group /etc/sysconfig/i18n)); } } else { log::l("key_installfiles: installing symlinks to key"); if (!-e "$sysconf/etc/passwd") { log::l("key_installfiles: /etc/passwd not here, trying to copy from previous host boot"); $copy_userinfo->(qw(/etc/passwd /etc/group)); } foreach (chomp_(`find $sysconf -type f`)) { my ($path) = /^\Q$sysconf\E(.*)/; mkdir_p(dirname($path)); symlinkf($_, $path); } $done = 1; $::o->{steps}{configMove}{done} = 1; } #- /etc/sudoers can't be a link unlink($_), system("cp /image/$_ $_") foreach qw(/etc/sudoers); } sub reboot { output('/var/run/rebootctl', "reboot"); #- tell X_move to not respawn system("killall X"); #- kill it ourselves to be sure that it won't lock console when killed by our init exit 0; } sub install2::verifyKey { my ($o) = $::o; log::l("automatic transparent key support is disabled"), return if $key_disabled; while (cat_('/proc/mounts') !~ m|\s/home\s|) { $o->ask_okcancel_({ title => N("Need a key to save your data"), messages => formatAlaTeX( N("We didn't detect any USB key on your system. If you plug in an USB key now, Mandrake Move will have the ability to transparently save the data in your home directory and system wide configuration, for next boot on this computer or another one. Note: if you plug in a key now, wait several seconds before detecting again. You may also proceed without an USB key - you'll still be able to use Mandrake Move as a normal live Mandrake Operating System.")), ok => N("Detect again USB key"), cancel => N("Continue without USB key") }) or return; key_mount($o, 'reread'); } local *F; while (!open F, '>/home/.touched') { if (!key_umount($o)) { #- this case happens when the user boots with a write-protected key containing #- all user and host data, /etc/X11/X which is on key busyfies it $o->ask_okcancel_({ title => N("Key isn't writable"), messages => formatAlaTeX( N("The USB key seems to have write protection enabled, but we can't safely unplug it now. Click the button to reboot the machine, unplug it, remove write protection, plug the key again, and launch Mandrake Move again.")), ok => N("Reboot") }); reboot(); } modules::unload('usb-storage'); #- it won't notice change on write protection otherwise :/ $o->ask_okcancel_({ title => N("Key isn't writable"), messages => formatAlaTeX( N("The USB key seems to have write protection enabled. Please unplug it, remove write protection, and then plug it again.")), ok => N("Retry"), cancel => N("Continue without USB key") }) or return; modules::load('usb-storage'); sleep 2; key_mount($o, 'reread'); } close F; unlink '/home/.touched'; my $wait = $using_existing_host_config || $o->wait_message(N("Setting up USB key"), N("Please wait, setting up system configuration files on USB key...")); key_installfiles('full'); setup_userconf($o); } sub enable_service { run_program::run('/sbin/chkconfig', '--level', 5, $_[0], 'on'); } sub install2::configMove { my $o = $::o; #- just in case lomount_clp("always_i18n_$o->{locale}{lang}", '/usr'); if (!$using_existing_user_config) { if (cat_('/proc/cmdline') =~ /\buser=(\w+)/) { $o->{users} = [ { name => $1 } ]; } else { require any; any::ask_user_one($o, $o->{users} ||= [], $o->{security}, additional_msg => N("Enter your user information, password will be used for screensaver"), noaccept => 1, needauser => 1, noicons => 1); } #- force uid/gid to 501 as it was used when mounting key, addUser may choose 502 when key already holds user data put_in_hash($o->{users}[0], { uid => 501, gid => 501 }); require install_steps; install_steps::addUser($o); } my $wait = $o->wait_message(N("Auto configuration"), N("Please wait, detecting and configuring devices...")); #- automatic printer, timezone, network configs require install_steps_interactive; if (cat_('/proc/mounts') !~ /nfs/) { install_steps_interactive::configureNetwork($o); enable_service('network'); } install_steps_interactive::summaryBefore($o); modules::load_category('multimedia/sound'); enable_service('sound'); $o->{useSupermount} = 1; fs::set_removable_mntpoints($o->{all_hds}); fs::set_all_default_options($o->{all_hds}, %$o, lang::fs_options($o->{locale})); require install_any; install_any::write_fstab($o); modules::write_conf(''); require mouse; mouse::write_conf($o, $o->{mouse}, 1); #- write xfree mouse conf detect_devices::install_addons(''); eval { cp_af("/usr/share/services/ksycoca-$o->{locale}{lang}", '/etc/X11/ksycoca') }; { my $user = $o->{users}[0]{name}; my $confdir = "/home/$user/.kde/share/config"; mkdir_p($confdir); output("$confdir/kdeglobals", cat_("/usr/share/config/kdeglobals")); lang::configure_kdeglobals($o->{locale}, $confdir); run_program::run('chown', '-R', "$user.$user", "/home/$user/.kde"); } foreach my $step (@{$o->{orderedSteps_orig}}) { next if member($step, @{$o->{orderedSteps}}); while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) { log::l("doing remaining toBeDone for undone step $step"); eval { &$f() }; $o->ask_warn(N("Error"), [ N("An error occurred, but I don't know how to handle it nicely. Continue at your own risk."), formatError($@) ]) if $@; } } } sub install_TrueFS_in_home { my ($o) = @_; require fsedit; my $home = fsedit::mntpoint2part('/home', $o->{fstab}) or return; my %loopbacks = map { my $part = { type => 0x83, device => "/home/.mdkmove-$_", loopback_file => "/.mdkmove-$_", loopback_device => $home, mntpoint => "/home/$_/.mdkmove-truefs", size => 6 << 11, toFormat => ! -e "/home/.mdkmove-$_", }; $_ => $part; } list_users(); $home->{loopback} = [ values %loopbacks ]; fsedit::recompute_loopbacks($o->{all_hds}); fs::formatMount_all([], $home->{loopback}, $o->{prefix}); foreach my $user (keys %loopbacks) { my $dir = $loopbacks{$user}{mntpoint}; foreach (qw(.kde .openoffice)) { if (-d "/home/$user/$_" && ! -d "$dir/$_") { run_program::run('mv', "/home/$user/$_", "$dir/$_"); } mkdir $_ foreach "/home/$user/$_", "$dir/$_"; run_program::run('mount', '-o', 'bind', "$dir/$_", "/home/$user/$_"); } my $cache = "/tmp/.$user-cache"; foreach (qw(.kde/share/cache)) { mkdir_p("$cache/$_"); mkdir_p("/home/$user/" . dirname($_)); symlink "$cache/$_", "/home/$user/$_"; } run_program::run('chown', '-R', "$user.$user", $dir); run_program::run('chown', '-R', "$user.$user", $cache); $ENV{XAUTHORITY} = "$dir/.Xauthority"; $ENV{ICEAUTHORITY} = "$dir/.ICEauthority"; } } sub errorInStep { my ($o, $err) = @_; if (!fsedit::mntpoint2part('/home', $o->{fstab})) { $o->ask_warn(N("Error"), [ N("An error occurred"), formatError($err) ]); return; } $o->ask_okcancel_({ title => N("Error"), messages => formatAlaTeX( N("An error occurred: %s This may come from corrupted system configuration files on the USB key, in this case removing them and then rebooting Mandrake Move would fix the problem. To do so, click on the corresponding button. You may also want to reboot and remove the USB key, or examine its contents under another OS, or even have a look at log files in console #3 and #4 to try to guess what's happening.", formatError($err))), ok => N("Remove system config files"), cancel => N("Simply reboot") }) or goto reboot; eval { rm_rf $key_sysconf }; reboot: reboot(); } sub install2::initGraphical { my $xdim = $::rootwidth; $xdim < 800 and $xdim = 800; $xdim > 1600 and $xdim = 1600; system("qiv --root /image/move/BOOT-$xdim-MOVE.jpg"); *install_steps_interactive::errorInStep = \&errorInStep; } sub install2::startMove { my $o = $::o; $::WizardWindow->destroy if $::WizardWindow; require ugtk2; ugtk2::flush(); #- have a nice mtab (esp. for /cdrom) system('mount', '-a', '-f'); #- get info from existing fstab. This won't do anything if we already wrote fstab in configMove fs::get_info_from_fstab($o->{all_hds}, ''); foreach (fsedit::get_really_all_fstab($o->{all_hds})) { $_->{mntpoint} && !$_->{isMounted} && $_->{options} !~ /\bnoauto\b/ or next; mkdir_p($_->{mntpoint}); run_program::run('mount', $_->{mntpoint}); } install_TrueFS_in_home($o); my $username = $o->{users}[0]{name}; output('/var/run/console.lock', $username); output("/var/run/console/$username", 1); run_program::run('pam_console_apply'); run_program::run('chown', "$username.root", '/var/run/rebootctl'); touch '/var/run/utmp'; run_program::run('runlevel_set', '5'); member($_, qw(xfs dm devfsd syslog)) or run_program::run($_, 'start') foreach glob('/etc/rc.d/rc5.d/*'); #- allow user customisation of startup through /etc/rc.d/rc.local run_program::run('/etc/rc.d/rc.local'); if (cat_('/proc/mounts') =~ m|\s/home\s|) { output '/var/lib/machine_ident', machine_ident(); run_program::run('/usr/bin/etc-monitorer.pl', uniq map { dirname($_) } (chomp_(`find /etc -type f`), grep { readlink !~ m|^/| } chomp_(`find /etc -type l`))); run_program::raw({ detach => 1 }, '/usr/bin/dnotify', '-MCRD', '/etc', '-r', '-e', '/usr/bin/etc-monitorer.pl', '{}') or die "dnotify not found!"; } #- password in screensaver doesn't make sense if we keep the shell kill 9, cat_('/var/run/drakx_shell.pid'); output('/dev/tty2', "Killed\n"); if (fork()) { sleep 1; log::l("DrakX waves bye-bye"); open STDOUT, ">/dev/tty10"; #- don't display startkde shit on first console open STDERR, ">/dev/tty10"; my (undef, undef, $uid, $gid, undef, undef, undef, $home, $shell) = getpwnam($username); $( = $) = "$gid $gid"; $< = $> = $uid; $ENV{LOGNAME} = $ENV{USER} = $username; $ENV{HOME} = $home; $ENV{SHELL} = $shell; $ENV{XDM_MANAGED} = '/var/run/rebootctl,maysd,mayfn,sched'; #- for reboot/halt availability of "logout" by kde $ENV{GDMSESSION} = 1; #- disable ~/.xsession-errors in Xsession (waste of usb key writes) exec '/etc/X11/Xsession', 'KDE'; #- call it with KDE parameter to keep background } else { exec 'xwait' or c::_exit(0); } } sub automatic_xconf { my ($o) = @_; if (!$using_existing_host_config) { log::l('automatic XFree configuration'); any::devfssymlinkf($o->{mouse}, 'mouse'); local $o->{mouse}{device} = 'mouse'; require Xconfig::default; $o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings require Xconfig::main; require class_discard; Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, { allowNVIDIA_rpms => [], allowATI_rpms => [], allowFB => $o->{allowFB} }); my $card = Xconfig::card::from_raw_X($o->{raw_X}); }