Menu
▾
▴
vectorlinux-devel
|
From: <cod...@go...> - 2008-09-25 19:13:34
|
Author: M0...@gm...
Date: Thu Sep 25 12:12:14 2008
New Revision: 184
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.lang/en_US.po
branches/iVL/.lang/es.mo
branches/iVL/.lang/es.po
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmLangSel.class
branches/iVL/FrmLangSel.form
branches/iVL/FrmNetConf.class
branches/iVL/FrmNetConf.form
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmSelISO.class
branches/iVL/MdlCore.module
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlNetConf.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlSummarize.module
branches/iVL/MdlWinDrives.module
branches/iVL/installer.gambas
Log:
- Added distinction between wired and wiereless network interfaces
- Added interface status detection (connected / unplugged) to network iface
- Coded in objects to setup wireless connection (security type, Key,
A/P box)
- Separated formatting HTML code from strings for easier translation writing
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Sep 25 12:12:14 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:375
+#: FMain.class:373
msgid "Process Overview"
msgstr ""
-#: FMain.class:395
+#: FMain.class:393
msgid "Next"
msgstr ""
-#: FMain.class:401
+#: FMain.class:399
msgid "Back"
msgstr ""
-#: FMain.class:407
+#: FMain.class:405
msgid "Exit Installation"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Sep 25 12:12:14 2008
@@ -14,6 +14,18 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: FrmPartScheme.class:55
+msgid "Select this option if you already have a linux installation that
you wish to overwrite or if a linux partition scheme exists in your hard
disk."
+msgstr ""
+
+#: FrmPartScheme.class:55
+msgid "This option will overwrite any existing data in the selected
partitions"
+msgstr ""
+
+#: FrmPartScheme.class:55
+msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
+msgstr ""
+
#: FrmPartScheme.class:105
msgid "Select your disk partition option"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Sep 25 12:12:14 2008
@@ -18,19 +18,35 @@
msgid "No Installable Media Found"
msgstr ""
-#: FrmSelISO.class:221
+#: FrmSelISO.class:73
+msgid "Click"
+msgstr ""
+
+#: FrmSelISO.class:73
+msgid "to begin installating "
+msgstr ""
+
+#: FrmSelISO.class:96
+msgid "Unable to identify distro."
+msgstr ""
+
+#: FrmSelISO.class:131
+msgid "Minimum Disk Space Requirements"
+msgstr ""
+
+#: FrmSelISO.class:225
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:227
+#: FrmSelISO.class:231
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:232
+#: FrmSelISO.class:236
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:237
+#: FrmSelISO.class:241
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Sep 25 12:12:14 2008
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlCore.module:237
-msgid "<b>Scanning system for installable media. Please wait ...</b>"
+#: MdlCore.module:250
+msgid "Scanning system for installable media. Please wait ..."
msgstr ""
-#: MdlCore.module:253
+#: MdlCore.module:266
msgid "No Installable Media Found"
msgstr ""
-#: MdlCore.module:255
+#: MdlCore.module:268
msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
msgstr ""
-#: MdlCore.module:255
-msgid "installation CD and click '"
+#: MdlCore.module:268
+msgid "installation CD and click "
msgstr ""
-#: MdlCore.module:255
-msgid "' to try again"
+#: MdlCore.module:268
+msgid "to try again"
msgstr ""
-#: MdlCore.module:416
+#: MdlCore.module:429
msgid "Build Date: "
msgstr ""
-#: MdlCore.module:416
-msgid "<b>MINIMUM REQUIREMENTS<br>"
+#: MdlCore.module:429
+msgid "MINIMUM REQUIREMENTS"
msgstr ""
-#: MdlCore.module:421
+#: MdlCore.module:434
msgid "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
msgstr ""
-#: MdlCore.module:494
+#: MdlCore.module:507
msgid "Cannot find SETUP.CONF"
msgstr ""
-#: MdlCore.module:502
+#: MdlCore.module:515
msgid "Preparation"
msgstr ""
-#: MdlCore.module:503
+#: MdlCore.module:516
msgid "Language Selection"
msgstr ""
-#: MdlCore.module:504
+#: MdlCore.module:517
msgid "Find installation media"
msgstr ""
-#: MdlCore.module:505
+#: MdlCore.module:518
msgid "Disk Partitioning"
msgstr ""
-#: MdlCore.module:506
+#: MdlCore.module:519
msgid "Software Selection"
msgstr ""
-#: MdlCore.module:508
+#: MdlCore.module:521
msgid "Installation"
msgstr ""
-#: MdlCore.module:509
+#: MdlCore.module:522
msgid "Installation Summary"
msgstr ""
-#: MdlCore.module:511
+#: MdlCore.module:524
msgid "Install Operating System"
msgstr ""
-#: MdlCore.module:512
+#: MdlCore.module:525
msgid "System Configuration"
msgstr ""
-#: MdlCore.module:513
+#: MdlCore.module:526
msgid "Boot Menu Options"
msgstr ""
-#: MdlCore.module:514
+#: MdlCore.module:527
msgid "System Administrator"
msgstr ""
-#: MdlCore.module:515
+#: MdlCore.module:528
msgid "Network Configuration"
msgstr ""
-#: MdlCore.module:516
+#: MdlCore.module:529
msgid "User Accounts"
msgstr ""
-#: MdlCore.module:517
+#: MdlCore.module:530
msgid "Hardware Configuration"
msgstr ""
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Sep 25 12:12:14 2008
@@ -14,12 +14,28 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: MdlDiskPart.module:46
+msgid "VectorLinux is unable to determine the type of hard disks on your
system."
+msgstr ""
+
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"
+msgstr ""
+
#: MdlDiskPart.module:53
msgid "Gparted was not found on this system. Please install gparted and
try again"
msgstr ""
#: MdlDiskPart.module:57
-msgid "<h3>Loading gparted ... Please wait</h3>"
+msgid "Loading gparted ... Please wait"
+msgstr ""
+
+#: MdlDiskPart.module:90
+msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
+msgstr ""
+
+#: MdlDiskPart.module:90
+msgid "a bad install media. Setup cannot continue."
msgstr ""
#: MdlDiskPart.module:95
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Sep 25 12:12:14 2008
@@ -15,15 +15,15 @@
"Content-Transfer-Encoding: 8bit\n"
#: MdlPartSel.module:67
-msgid "<b>PARTITION</b>"
+msgid "PARTITION"
msgstr ""
#: MdlPartSel.module:77
-msgid "<b>MOUNT POINT</b>"
+msgid "MOUNT POINT"
msgstr ""
#: MdlPartSel.module:86
-msgid "<b>FILESYSTEM</b>"
+msgid "FILESYSTEM"
msgstr ""
#: MdlPartSel.module:148
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Sep 25 12:12:14 2008
@@ -15,26 +15,30 @@
"Content-Transfer-Encoding: 8bit\n"
#: MdlSummarize.module:28
-msgid "<b><br>PARTITIONING LAYOUT:</b><br>"
+msgid "PARTITIONING LAYOUT"
msgstr ""
#: MdlSummarize.module:49
-msgid "<b>OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.</b><br>"
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
msgstr ""
#: MdlSummarize.module:55
-msgid "<b>INSTALL TYPE:</b> Custom<br>"
+msgid "INSTALL TYPE:"
+msgstr ""
+
+#: MdlSummarize.module:55
+msgid "Custom"
msgstr ""
#: MdlSummarize.module:57
-msgid "<br><b>BULK PACKAGES:</b> "
+msgid "BULK PACKAGES:"
msgstr ""
#: MdlSummarize.module:61
-msgid "<br><br><b>OPTIONAL PACKAGES:</b>"
+msgid "OPTIONAL PACKAGES:"
msgstr ""
#: MdlSummarize.module:67
-msgid "<b>INSTALL TYPE:</b> Full<br>"
+msgid "Full"
msgstr ""
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Sep 25 12:12:14 2008
@@ -15,22 +15,22 @@
"Content-Transfer-Encoding: 8bit\n"
#: MdlWinDrives.module:55
-msgid "<b>Windows Partitions Detected</b>"
+msgid "Windows Partitions Detected"
msgstr ""
#: MdlWinDrives.module:71
-msgid "<B>PARTITION</B>"
+msgid "PARTITION"
msgstr ""
#: MdlWinDrives.module:81
-msgid "<b>MOUNT TO </B>"
+msgid "MOUNT TO"
msgstr ""
-#: MdlWinDrives.module:161
+#: MdlWinDrives.module:119
msgid "Do not mount"
msgstr ""
#: MdlWinDrives.module:181
-msgid "<b>No Windows partitions detected</b>"
+msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Thu Sep 25 12:12:14 2008
@@ -18,19 +18,19 @@
msgid "GUI installer for Vector linux"
msgstr "GUI installer for Vector linux"
-#: FMain.class:375
+#: FMain.class:373
msgid "Process Overview"
msgstr "Process Overview"
-#: FMain.class:395
+#: FMain.class:393
msgid "Next"
msgstr "Next"
-#: FMain.class:401
+#: FMain.class:399
msgid "Back"
msgstr "Back"
-#: FMain.class:407
+#: FMain.class:405
msgid "Exit Installation"
msgstr "Exit Installation"
@@ -52,7 +52,7 @@
#: FrmHostPrep.class:139 FrmInstallSys.class:226 FrmLilo.class:203
#: FrmPartScheme.class:120 FrmPkgSel.class:99 FrmPkgsel2.class:86
-#: FrmSelISO.class:232 FrmSummary.class:87
+#: FrmSelISO.class:236 FrmSummary.class:87
msgid "TextLabel1"
msgstr "-"
@@ -72,14 +72,10 @@
msgid "Current Step "
msgstr "Current Step "
-#: FrmLangSel.class:73
+#: FrmLangSel.class:69
msgid "Select your language"
msgstr "Select your language"
-#: FrmLangSel.class:79
-msgid "Button1"
-msgstr "-"
-
#: FrmLicense.class:99
msgid "LICENSE AGREEMENT"
msgstr "LICENSE AGREEMENT"
@@ -172,6 +168,22 @@
msgid "NETWORK CONFIGURATION"
msgstr "NETWORK CONFIGURATION"
+#: FrmPartScheme.class:55
+msgid ""
+"Select this option if you already have a linux installation that you wish
to "
+"overwrite or if a linux partition scheme exists in your hard disk."
+msgstr ""
+
+#: FrmPartScheme.class:55
+msgid "This option will overwrite any existing data in the selected
partitions"
+msgstr ""
+
+#: FrmPartScheme.class:55
+msgid ""
+"Use this option if you already prepared your partitions using the "
+"VectorLinux installer"
+msgstr ""
+
#: FrmPartScheme.class:105
msgid "Select your disk partition option"
msgstr "Select your disk partition option"
@@ -238,21 +250,39 @@
msgid "Set Password"
msgstr "Set Password"
-#: FrmSelISO.class:29 MdlCore.module:253
+#: FrmSelISO.class:29 MdlCore.module:281
msgid "No Installable Media Found"
msgstr "No Installable Media Found"
-#: FrmSelISO.class:221
+#: FrmSelISO.class:73
+msgid "Click"
+msgstr ""
+
+#: FrmSelISO.class:73
+#, fuzzy
+msgid "to begin installating "
+msgstr "Find installation media"
+
+#: FrmSelISO.class:96
+#, fuzzy
+msgid "Unable to identify distro."
+msgstr "Unable to install kernels. "
+
+#: FrmSelISO.class:131
+msgid "Minimum Disk Space Requirements"
+msgstr ""
+
+#: FrmSelISO.class:225
msgid "No installable images found."
msgstr "No installable images found."
-#: FrmSelISO.class:227
+#: FrmSelISO.class:231
msgid ""
"Select which VectorLinux version you wish to install from the list below"
msgstr ""
"Select which VectorLinux version you wish to install from the list below"
-#: FrmSelISO.class:237
+#: FrmSelISO.class:241
msgid "Search Again"
msgstr "Search Again"
@@ -328,11 +358,12 @@
msgid "Boot loader has been setup successfully"
msgstr "Boot loader has been setup successfully"
-#: MdlCore.module:237
-msgid "<b>Scanning system for installable media. Please wait ...</b>"
+#: MdlCore.module:265
+#, fuzzy
+msgid "Scanning system for installable media. Please wait ..."
msgstr "<b>Scanning system for installable media. Please wait ...</b>"
-#: MdlCore.module:255
+#: MdlCore.module:283
msgid ""
"Setup was unable to find any installable media on your system. Please
insert "
"your VectorLinux "
@@ -340,23 +371,26 @@
"Setup was unable to find any installable media on your system. Please
insert "
"your VectorLinux "
-#: MdlCore.module:255
-msgid "installation CD and click '"
+#: MdlCore.module:283
+#, fuzzy
+msgid "installation CD and click "
msgstr "installation CD and click '"
-#: MdlCore.module:255
-msgid "' to try again"
+#: MdlCore.module:283
+#, fuzzy
+msgid "to try again"
msgstr "-"
-#: MdlCore.module:416
+#: MdlCore.module:444
msgid "Build Date: "
msgstr "Build Date: "
-#: MdlCore.module:416
-msgid "<b>MINIMUM REQUIREMENTS<br>"
+#: MdlCore.module:444
+#, fuzzy
+msgid "MINIMUM REQUIREMENTS"
msgstr "<b>MINIMUM REQUIREMENTS<br>"
-#: MdlCore.module:421
+#: MdlCore.module:449
msgid ""
"Setup is unable to find SETUP.CONF in your install media. This could be "
"symptoms of a bad burn or a bad ISO"
@@ -364,66 +398,78 @@
"Setup is unable to find SETUP.CONF in your install media. This could be "
"symptoms of a bad burn or a bad ISO"
-#: MdlCore.module:494
+#: MdlCore.module:522
msgid "Cannot find SETUP.CONF"
msgstr "Cannot find SETUP.CONF"
-#: MdlCore.module:502
+#: MdlCore.module:530
msgid "Preparation"
msgstr "Preparation"
-#: MdlCore.module:503
+#: MdlCore.module:531
+#, fuzzy
+msgid "Language Selection"
+msgstr "Software Selection"
+
+#: MdlCore.module:532
msgid "Find installation media"
msgstr "Find installation media"
-#: MdlCore.module:504
+#: MdlCore.module:533
msgid "Disk Partitioning"
msgstr "Disk Partitioning"
-#: MdlCore.module:505
+#: MdlCore.module:534
msgid "Software Selection"
msgstr "Software Selection"
-#: MdlCore.module:507
+#: MdlCore.module:536
msgid "Installation"
msgstr "Installation"
-#: MdlCore.module:508
+#: MdlCore.module:537
msgid "Installation Summary"
msgstr "Installation Summary"
-#: MdlCore.module:509
-msgid "Prepare Host"
-msgstr "Prepare Host"
-
-#: MdlCore.module:510
+#: MdlCore.module:539
msgid "Install Operating System"
msgstr "Install Operating System"
-#: MdlCore.module:511
+#: MdlCore.module:540
msgid "System Configuration"
msgstr "System Configuration"
-#: MdlCore.module:512
+#: MdlCore.module:541
msgid "Boot Menu Options"
msgstr "Boot Menu Options"
-#: MdlCore.module:513
+#: MdlCore.module:542
msgid "System Administrator"
msgstr "System Administrator"
-#: MdlCore.module:514
+#: MdlCore.module:543
msgid "Network Configuration"
msgstr "Network Configuration"
-#: MdlCore.module:515
+#: MdlCore.module:544
msgid "User Accounts"
msgstr "User Accounts"
-#: MdlCore.module:516
+#: MdlCore.module:545
msgid "Hardware Configuration"
msgstr "Hardware Configuration"
+#: MdlDiskPart.module:46
+msgid ""
+"VectorLinux is unable to determine the type of hard disks on your system."
+msgstr ""
+
+#: MdlDiskPart.module:46
+msgid ""
+"It is still possible to install VectorLinux on your system, but you need
to "
+"pre-partition your disks first"
+msgstr ""
+
#: MdlDiskPart.module:53
msgid ""
"Gparted was not found on this system. Please install gparted and try
again"
@@ -431,9 +477,20 @@
"Gparted was not found on this system. Please install gparted and try
again"
#: MdlDiskPart.module:57
-msgid "<h3>Loading gparted ... Please wait</h3>"
+#, fuzzy
+msgid "Loading gparted ... Please wait"
msgstr "<h3>Loading gparted ... Please wait</h3>"
+#: MdlDiskPart.module:90
+msgid ""
+"Setup is unable to successfully run gparted on this system. This may be
a "
+"sign of "
+msgstr ""
+
+#: MdlDiskPart.module:90
+msgid "a bad install media. Setup cannot continue."
+msgstr ""
+
#: MdlDiskPart.module:95
msgid "Several windows found. I will take the first one!"
msgstr "Several windows found. I will take the first one!"
@@ -528,7 +585,7 @@
msgid "Do not format"
msgstr "Do not format"
-#: MdlInstallSys.module:169 MdlWinDrives.module:161
+#: MdlInstallSys.module:169 MdlWinDrives.module:119
msgid "Do not mount"
msgstr "Do not mount"
@@ -565,7 +622,8 @@
msgstr "Installing Required Packages ..."
#: MdlLiloOsList.module:67
-msgid "<b>Windows installation found in "
+#, fuzzy
+msgid "Windows installation found in "
msgstr "<b>Windows installation found in "
#: MdlLiloOsList.module:75
@@ -585,7 +643,8 @@
msgstr "Label"
#: MdlLiloOsList.module:270
-msgid "<b>Operating system installed in "
+#, fuzzy
+msgid "Operating system installed in "
msgstr "<b>Operating system installed in "
#: MdlLiloOsList.module:282
@@ -608,70 +667,107 @@
msgid "Add option to boot this Operating system into Text mode"
msgstr "Add option to boot this Operating system into Text mode"
-#: MdlNetConf.module:76
+#: MdlNetConf.module:91
msgid "Wired"
msgstr "Wired"
-#: MdlNetConf.module:79
+#: MdlNetConf.module:94
msgid "Wireless"
msgstr "Wireless"
-#: MdlNetConf.module:98
+#: MdlNetConf.module:103
+msgid "Plugged-in"
+msgstr ""
+
+#: MdlNetConf.module:105
+msgid "Unplugged"
+msgstr ""
+
+#: MdlNetConf.module:124
msgid "Hardware Address"
msgstr "Hardware Address"
-#: MdlNetConf.module:119
+#: MdlNetConf.module:145
msgid "Interface Type"
msgstr "Interface Type"
-#: MdlNetConf.module:138
+#: MdlNetConf.module:164
msgid "Automatically activate this interface at start-up"
msgstr "Automatically activate this interface at start-up"
-#: MdlNetConf.module:151
+#: MdlNetConf.module:177
msgid "Setup Mode"
msgstr "Setup Mode"
-#: MdlNetConf.module:206
+#: MdlNetConf.module:202
+msgid "Encryption type"
+msgstr ""
+
+#: MdlNetConf.module:215
+msgid "None"
+msgstr ""
+
+#: MdlNetConf.module:228
+msgid "Encryption key"
+msgstr ""
+
+#: MdlNetConf.module:247
+msgid "Access Point"
+msgstr ""
+
+#: MdlNetConf.module:271
+msgid "STATUS:"
+msgstr ""
+
+#: MdlNetConf.module:313
msgid " Static IP Address Settings "
msgstr " Static IP Address Settings "
-#: MdlNetConf.module:216
+#: MdlNetConf.module:323
msgid "IP Address"
msgstr "IP Address"
-#: MdlNetConf.module:239
+#: MdlNetConf.module:346
msgid "Subnet Mask"
msgstr "Subnet Mask"
-#: MdlNetConf.module:261
+#: MdlNetConf.module:368
msgid "Gateway Address"
msgstr "Gateway Address"
-#: MdlNetConf.module:298
-msgid ""
-"<b>Dynamic Host Control Protocol</b><br>Automatic settings via DHCP. "
-"<br><br>This will work if you use a cable or DSL modem on a home
network. "
-"<br>If in doubt, choose this option"
-msgstr ""
-"<b>Dynamic Host Control Protocol</b><br>Automatic settings via DHCP. "
-"<br><br>This will work if you use a cable or DSL modem on a home
network. "
-"<br>If in doubt, choose this option"
+#: MdlNetConf.module:406
+msgid "Dynamic Host Control Protocol"
+msgstr ""
+
+#: MdlNetConf.module:406
+msgid "Automatic settings via DHCP."
+msgstr ""
+
+#: MdlNetConf.module:406
+msgid "This will work if you use a cable or DSL modem on a home network."
+msgstr ""
+
+#: MdlNetConf.module:406
+msgid "If in doubt, choose this option"
+msgstr ""
#: MdlPartFrmt.module:121
msgid "There has been an error wile trying to format "
msgstr "There has been an error wile trying to format "
-#: MdlPartSel.module:67
-msgid "<b>PARTITION</b>"
+#: MdlPartSel.module:67 MdlWinDrives.module:71
+#, fuzzy
+msgid "PARTITION"
msgstr "<b>PARTITION</b>"
#: MdlPartSel.module:77
-msgid "<b>MOUNT POINT</b>"
+#, fuzzy
+msgid "MOUNT POINT"
msgstr "<b>MOUNT POINT</b>"
#: MdlPartSel.module:86
-msgid "<b>FILESYSTEM</b>"
+#, fuzzy
+msgid "FILESYSTEM"
msgstr "<b>FILESYSTEM</b>"
#: MdlPartSel.module:293
@@ -683,43 +779,52 @@
msgstr " partition"
#: MdlSummarize.module:28
-msgid "<b><br>PARTITIONING LAYOUT:</b><br>"
+#, fuzzy
+msgid "PARTITIONING LAYOUT"
msgstr "<b><br>PARTITIONING LAYOUT:</b><br>"
#: MdlSummarize.module:49
-msgid "<b>OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.</b><br>"
+#, fuzzy
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
msgstr "<b>OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.</b><br>"
#: MdlSummarize.module:55
-msgid "<b>INSTALL TYPE:</b> Custom<br>"
-msgstr "<b>INSTALL TYPE:</b> Custom<br>"
+#, fuzzy
+msgid "INSTALL TYPE:"
+msgstr "<b>INSTALL TYPE:</b> Full<br>"
+
+#: MdlSummarize.module:55
+#, fuzzy
+msgid "Custom"
+msgstr "Custom Install"
#: MdlSummarize.module:57
-msgid "<br><b>BULK PACKAGES:</b> "
+#, fuzzy
+msgid "BULK PACKAGES:"
msgstr "<br><b>BULK PACKAGES:</b> "
#: MdlSummarize.module:61
-msgid "<br><br><b>OPTIONAL PACKAGES:</b>"
+#, fuzzy
+msgid "OPTIONAL PACKAGES:"
msgstr "<br><br><b>OPTIONAL PACKAGES:</b>"
#: MdlSummarize.module:67
-msgid "<b>INSTALL TYPE:</b> Full<br>"
-msgstr "<b>INSTALL TYPE:</b> Full<br>"
+msgid "Full"
+msgstr ""
#: MdlWinDrives.module:55
-msgid "<b>Windows Partitions Detected</b>"
+#, fuzzy
+msgid "Windows Partitions Detected"
msgstr "<b>Windows Partitions Detected</b>"
-#: MdlWinDrives.module:71
-msgid "<B>PARTITION</B>"
-msgstr "<B>PARTITION</B>"
-
#: MdlWinDrives.module:81
-msgid "<b>MOUNT TO </B>"
-msgstr "<b>MOUNT TO </B>"
+#, fuzzy
+msgid "MOUNT TO"
+msgstr "<b>MOUNT POINT</b>"
#: MdlWinDrives.module:181
-msgid "<b>No Windows partitions detected</b>"
+#, fuzzy
+msgid "No Windows partitions detected"
msgstr "<b>No Windows partitions detected</b>"
#: MdlZoneSet.module:27
@@ -729,3 +834,27 @@
#: MdlZoneSet.module:28
msgid "localtime"
msgstr "localtime"
+
+#~ msgid "<b>INSTALL TYPE:</b> Custom<br>"
+#~ msgstr "<b>INSTALL TYPE:</b> Custom<br>"
+
+#~ msgid "<B>PARTITION</B>"
+#~ msgstr "<B>PARTITION</B>"
+
+#~ msgid "<b>MOUNT TO </B>"
+#~ msgstr "<b>MOUNT TO </B>"
+
+#~ msgid ""
+#~ "<b>Dynamic Host Control Protocol</b><br>Automatic settings via DHCP. "
+#~ "<br><br>This will work if you use a cable or DSL modem on a home
network. "
+#~ "<br>If in doubt, choose this option"
+#~ msgstr ""
+#~ "<b>Dynamic Host Control Protocol</b><br>Automatic settings via DHCP. "
+#~ "<br><br>This will work if you use a cable or DSL modem on a home
network. "
+#~ "<br>If in doubt, choose this option"
+
+#~ msgid "Button1"
+#~ msgstr "-"
+
+#~ msgid "Prepare Host"
+#~ msgstr "Prepare Host"
Modified: branches/iVL/.lang/es.mo
==============================================================================
Binary files. No diff available.
Modified: branches/iVL/.lang/es.po
==============================================================================
--- branches/iVL/.lang/es.po (original)
+++ branches/iVL/.lang/es.po Thu Sep 25 12:12:14 2008
@@ -18,19 +18,19 @@
msgid "GUI installer for Vector linux"
msgstr "Instaladaor Gráfico de VectorLinux"
-#: FMain.class:375
+#: FMain.class:373
msgid "Process Overview"
msgstr "Resumen del proceso"
-#: FMain.class:395
+#: FMain.class:393
msgid "Next"
msgstr "Siguiente"
-#: FMain.class:401
+#: FMain.class:399
msgid "Back"
msgstr "Regreso"
-#: FMain.class:407
+#: FMain.class:405
msgid "Exit Installation"
msgstr "Cancelar Instalación"
@@ -53,7 +53,7 @@
#: FrmHostPrep.class:139 FrmInstallSys.class:226 FrmLilo.class:203
#: FrmPartScheme.class:120 FrmPkgSel.class:99 FrmPkgsel2.class:86
-#: FrmSelISO.class:232 FrmSummary.class:87
+#: FrmSelISO.class:236 FrmSummary.class:87
msgid "TextLabel1"
msgstr "-"
@@ -73,14 +73,10 @@
msgid "Current Step "
msgstr "Estado actual "
-#: FrmLangSel.class:73
+#: FrmLangSel.class:69
msgid "Select your language"
msgstr "Selecciona tu idioma"
-#: FrmLangSel.class:79
-msgid "Button1"
-msgstr "-"
-
#: FrmLicense.class:99
msgid "LICENSE AGREEMENT"
msgstr "ACEPTACIÓN DE LICENCIA"
@@ -173,6 +169,22 @@
msgid "NETWORK CONFIGURATION"
msgstr "CONFIGURACIÓN DE RED"
+#: FrmPartScheme.class:55
+msgid ""
+"Select this option if you already have a linux installation that you wish
to "
+"overwrite or if a linux partition scheme exists in your hard disk."
+msgstr ""
+
+#: FrmPartScheme.class:55
+msgid "This option will overwrite any existing data in the selected
partitions"
+msgstr ""
+
+#: FrmPartScheme.class:55
+msgid ""
+"Use this option if you already prepared your partitions using the "
+"VectorLinux installer"
+msgstr ""
+
#: FrmPartScheme.class:105
msgid "Select your disk partition option"
msgstr "Selecciona como vamos a instalar VectorLinux"
@@ -239,20 +251,39 @@
msgid "Set Password"
msgstr "Define contraseña"
-#: FrmSelISO.class:29 MdlCore.module:253
+#: FrmSelISO.class:29 MdlCore.module:281
msgid "No Installable Media Found"
msgstr "No se encontró ningún medio instalable"
-#: FrmSelISO.class:221
+#: FrmSelISO.class:73
+#, fuzzy
+msgid "Click"
+msgstr "Haga click en "
+
+#: FrmSelISO.class:73
+#, fuzzy
+msgid "to begin installating "
+msgstr "' para comenzar la instalacion"
+
+#: FrmSelISO.class:96
+msgid "Unable to identify distro."
+msgstr ""
+
+#: FrmSelISO.class:131
+#, fuzzy
+msgid "Minimum Disk Space Requirements"
+msgstr "<b>Requisitos minimos de espacio en es disco</b><br>"
+
+#: FrmSelISO.class:225
msgid "No installable images found."
msgstr "No se encontró ninguna imagen que se pueda instalar"
-#: FrmSelISO.class:227
+#: FrmSelISO.class:231
msgid ""
"Select which VectorLinux version you wish to install from the list below"
msgstr "Selectiona la imagen que deseas instalar de la lista abajo"
-#: FrmSelISO.class:237
+#: FrmSelISO.class:241
msgid "Search Again"
msgstr "Buscar de nuevo"
@@ -323,13 +354,14 @@
msgid "Boot loader has been setup successfully"
msgstr "El cargador de arranque ha sido configurado con éxito"
-#: MdlCore.module:237
-msgid "<b>Scanning system for installable media. Please wait ...</b>"
+#: MdlCore.module:265
+#, fuzzy
+msgid "Scanning system for installable media. Please wait ..."
msgstr ""
"<b>Analizando el sistema para en busqueda de imagenes instalables. Por
favor "
"Espere...</b>"
-#: MdlCore.module:255
+#: MdlCore.module:283
msgid ""
"Setup was unable to find any installable media on your system. Please
insert "
"your VectorLinux "
@@ -337,23 +369,26 @@
"El instalador no ha podido encontrar ningún medio instalable en tu
sistema. "
"Por favor inserta Vectorlinux"
-#: MdlCore.module:255
-msgid "installation CD and click '"
+#: MdlCore.module:283
+#, fuzzy
+msgid "installation CD and click "
msgstr "CD de instalación y clica"
-#: MdlCore.module:255
-msgid "' to try again"
+#: MdlCore.module:283
+#, fuzzy
+msgid "to try again"
msgstr "' para intentarlo de nuevo"
-#: MdlCore.module:416
+#: MdlCore.module:444
msgid "Build Date: "
msgstr "Compilado el: "
-#: MdlCore.module:416
-msgid "<b>MINIMUM REQUIREMENTS<br>"
+#: MdlCore.module:444
+#, fuzzy
+msgid "MINIMUM REQUIREMENTS"
msgstr "<b>REQUISITOS MÍNIMOS<br>"
-#: MdlCore.module:421
+#: MdlCore.module:449
msgid ""
"Setup is unable to find SETUP.CONF in your install media. This could be "
"symptoms of a bad burn or a bad ISO"
@@ -361,66 +396,77 @@
"El instalador no puede encontrar SETUP.CONF en el medio de instalación.
Eso "
"puede ser síntoma de una mala grabación de la ISO"
-#: MdlCore.module:494
+#: MdlCore.module:522
msgid "Cannot find SETUP.CONF"
msgstr "No se pudo encontrar SETUP.CONF"
-#: MdlCore.module:502
+#: MdlCore.module:530
msgid "Preparation"
msgstr "Preparación"
-#: MdlCore.module:503
+#: MdlCore.module:531
+msgid "Language Selection"
+msgstr "Seleccion de idioma"
+
+#: MdlCore.module:532
msgid "Find installation media"
msgstr "Buscar medio de instalación"
-#: MdlCore.module:504
+#: MdlCore.module:533
msgid "Disk Partitioning"
msgstr "Particionado de disco"
-#: MdlCore.module:505
+#: MdlCore.module:534
msgid "Software Selection"
msgstr "Selecciona el software"
-#: MdlCore.module:507
+#: MdlCore.module:536
msgid "Installation"
msgstr "Instalación"
-#: MdlCore.module:508
+#: MdlCore.module:537
msgid "Installation Summary"
msgstr "Resumen del proceso"
-#: MdlCore.module:509
-msgid "Prepare Host"
-msgstr "Preparar host"
-
-#: MdlCore.module:510
+#: MdlCore.module:539
msgid "Install Operating System"
msgstr "Instalación del systema operativo"
-#: MdlCore.module:511
+#: MdlCore.module:540
msgid "System Configuration"
msgstr "Configurar el systema"
-#: MdlCore.module:512
+#: MdlCore.module:541
msgid "Boot Menu Options"
msgstr "Opciones de arranque"
-#: MdlCore.module:513
+#: MdlCore.module:542
msgid "System Administrator"
msgstr "Administrador del systema"
-#: MdlCore.module:514
+#: MdlCore.module:543
msgid "Network Configuration"
msgstr "Configuración de red"
-#: MdlCore.module:515
+#: MdlCore.module:544
msgid "User Accounts"
msgstr "Usuarios"
-#: MdlCore.module:516
+#: MdlCore.module:545
msgid "Hardware Configuration"
msgstr "Configuración de hardware"
+#: MdlDiskPart.module:46
+msgid ""
+"VectorLinux is unable to determine the type of hard disks on your system."
+msgstr ""
+
+#: MdlDiskPart.module:46
+msgid ""
+"It is still possible to install VectorLinux on your system, but you need
to "
+"pre-partition your disks first"
+msgstr ""
+
#: MdlDiskPart.module:53
msgid ""
"Gparted was not found on this system. Please install gparted and try
again"
@@ -429,9 +475,20 @@
"de nuevo"
#: MdlDiskPart.module:57
-msgid "<h3>Loading gparted ... Please wait</h3>"
+#, fuzzy
+msgid "Loading gparted ... Please wait"
msgstr "<h3>Cargando gparted ... Por favor espere</h3>"
+#: MdlDiskPart.module:90
+msgid ""
+"Setup is unable to successfully run gparted on this system. This may be
a "
+"sign of "
+msgstr ""
+
+#: MdlDiskPart.module:90
+msgid "a bad install media. Setup cannot continue."
+msgstr ""
+
#: MdlDiskPart.module:95
msgid "Several windows found. I will take the first one!"
msgstr "Se han encontrado varios windows. Cogeré el primero!"
@@ -525,7 +582,7 @@
msgid "Do not format"
msgstr "No Formatear"
-#: MdlInstallSys.module:169 MdlWinDrives.module:161
+#: MdlInstallSys.module:169 MdlWinDrives.module:119
msgid "Do not mount"
msgstr "No montar"
@@ -562,7 +619,8 @@
msgstr "Instalando paquetes necesarios ..."
#: MdlLiloOsList.module:67
-msgid "<b>Windows installation found in "
+#, fuzzy
+msgid "Windows installation found in "
msgstr "<b>Instalación Windows econtrada en "
#: MdlLiloOsList.module:75
@@ -582,7 +640,8 @@
msgstr "Etiqueta"
#: MdlLiloOsList.module:270
-msgid "<b>Operating system installed in "
+#, fuzzy
+msgid "Operating system installed in "
msgstr "<b>Sistemas operativos instalados en "
#: MdlLiloOsList.module:282
@@ -605,70 +664,107 @@
msgid "Add option to boot this Operating system into Text mode"
msgstr "Añadir una opción para arrancar este sistema operativo en modo
texto"
-#: MdlNetConf.module:76
+#: MdlNetConf.module:91
msgid "Wired"
msgstr "Cableado"
-#: MdlNetConf.module:79
+#: MdlNetConf.module:94
msgid "Wireless"
msgstr "Inalámbrico"
-#: MdlNetConf.module:98
+#: MdlNetConf.module:103
+msgid "Plugged-in"
+msgstr ""
+
+#: MdlNetConf.module:105
+msgid "Unplugged"
+msgstr ""
+
+#: MdlNetConf.module:124
msgid "Hardware Address"
msgstr ""
-#: MdlNetConf.module:119
+#: MdlNetConf.module:145
msgid "Interface Type"
msgstr "Tipo de interfaz"
-#: MdlNetConf.module:138
+#: MdlNetConf.module:164
msgid "Automatically activate this interface at start-up"
msgstr "Activar esta interfaz automáticamente al arrancar"
-#: MdlNetConf.module:151
+#: MdlNetConf.module:177
msgid "Setup Mode"
msgstr "Modo configuración"
-#: MdlNetConf.module:206
+#: MdlNetConf.module:202
+msgid "Encryption type"
+msgstr ""
+
+#: MdlNetConf.module:215
+msgid "None"
+msgstr ""
+
+#: MdlNetConf.module:228
+msgid "Encryption key"
+msgstr ""
+
+#: MdlNetConf.module:247
+msgid "Access Point"
+msgstr ""
+
+#: MdlNetConf.module:271
+msgid "STATUS:"
+msgstr ""
+
+#: MdlNetConf.module:313
msgid " Static IP Address Settings "
msgstr "Configuración de IP estática"
-#: MdlNetConf.module:216
+#: MdlNetConf.module:323
msgid "IP Address"
msgstr "Dirección IP"
-#: MdlNetConf.module:239
+#: MdlNetConf.module:346
msgid "Subnet Mask"
msgstr "Máscara de subred"
-#: MdlNetConf.module:261
+#: MdlNetConf.module:368
msgid "Gateway Address"
msgstr "Dirección de Puerta de Enlace"
-#: MdlNetConf.module:298
-msgid ""
-"<b>Dynamic Host Control Protocol</b><br>Automatic settings via DHCP. "
-"<br><br>This will work if you use a cable or DSL modem on a home
network. "
-"<br>If in doubt, choose this option"
-msgstr ""
-"<b>Dynamic Host Control Protocol</b><br>Configuración automatica vía
DHCP. "
-"<br><br>Esto funcionara si utiliza conexión por cable o un módem ADSL en
una "
-"red local. <br>Si dudas, selecciona ésta"
+#: MdlNetConf.module:406
+msgid "Dynamic Host Control Protocol"
+msgstr ""
+
+#: MdlNetConf.module:406
+msgid "Automatic settings via DHCP."
+msgstr ""
+
+#: MdlNetConf.module:406
+msgid "This will work if you use a cable or DSL modem on a home network."
+msgstr ""
+
+#: MdlNetConf.module:406
+msgid "If in doubt, choose this option"
+msgstr ""
#: MdlPartFrmt.module:121
msgid "There has been an error wile trying to format "
msgstr "Ha ocurrido un error formateando "
-#: MdlPartSel.module:67
-msgid "<b>PARTITION</b>"
+#: MdlPartSel.module:67 MdlWinDrives.module:71
+#, fuzzy
+msgid "PARTITION"
msgstr "<b>PARTICIÓN</b>"
#: MdlPartSel.module:77
-msgid "<b>MOUNT POINT</b>"
+#, fuzzy
+msgid "MOUNT POINT"
msgstr "<b>PUNTO DE MONTAJE</b>"
#: MdlPartSel.module:86
-msgid "<b>FILESYSTEM</b>"
+#, fuzzy
+msgid "FILESYSTEM"
msgstr "<b>SISTEMA DE ARCHIVOS</b>"
#: MdlPartSel.module:293
@@ -680,44 +776,53 @@
msgstr "partición"
#: MdlSummarize.module:28
-msgid "<b><br>PARTITIONING LAYOUT:</b><br>"
+#, fuzzy
+msgid "PARTITIONING LAYOUT"
msgstr "<b><br>ESQUEMA DE PARTICIONES:</b><br>"
#: MdlSummarize.module:49
-msgid "<b>OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.</b><br>"
+#, fuzzy
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
msgstr ""
"<b>PARTICIONES WINDOWS OPCIONALES A SER MONTADAS EN TIEMPO DE
ARRANQUE</b>"
#: MdlSummarize.module:55
-msgid "<b>INSTALL TYPE:</b> Custom<br>"
-msgstr "<b>TIPO DE INSTALACIÓN:</b> Personalizada<br>"
+#, fuzzy
+msgid "INSTALL TYPE:"
+msgstr "<b>TIPO DE INSTALACIÓN:</b> Completa"
+
+#: MdlSummarize.module:55
+#, fuzzy
+msgid "Custom"
+msgstr "Instalación Personalizada"
#: MdlSummarize.module:57
-msgid "<br><b>BULK PACKAGES:</b> "
+#, fuzzy
+msgid "BULK PACKAGES:"
msgstr "<br><b>SET DE PAQUETES:</b>"
#: MdlSummarize.module:61
-msgid "<br><br><b>OPTIONAL PACKAGES:</b>"
+#, fuzzy
+msgid "OPTIONAL PACKAGES:"
msgstr "<br><br><b>PAQUETES OPCIONALES:</b>"
#: MdlSummarize.module:67
-msgid "<b>INSTALL TYPE:</b> Full<br>"
-msgstr "<b>TIPO DE INSTALACIÓN:</b> Completa"
+msgid "Full"
+msgstr ""
#: MdlWinDrives.module:55
-msgid "<b>Windows Partitions Detected</b>"
+#, fuzzy
+msgid "Windows Partitions Detected"
msgstr "<b>Particiones Windows encontradas</b>"
-#: MdlWinDrives.module:71
-msgid "<B>PARTITION</B>"
-msgstr "<B>PARTICIÓN</B>"
-
#: MdlWinDrives.module:81
-msgid "<b>MOUNT TO </B>"
+#, fuzzy
+msgid "MOUNT TO"
msgstr "<b>MONTAR EN </b>"
#: MdlWinDrives.module:181
-msgid "<b>No Windows partitions detected</b>"
+#, fuzzy
+msgid "No Windows partitions detected"
msgstr "<b>No se han detectado particiones Windows</b>"
#: MdlZoneSet.module:27
@@ -727,3 +832,18 @@
#: MdlZoneSet.module:28
msgid "localtime"
msgstr "Hora local"
+
+#~ msgid "<b>INSTALL TYPE:</b> Custom<br>"
+#~ msgstr "<b>TIPO DE INSTALACIÓN:</b> Personalizada<br>"
+
+#~ msgid "<B>PARTITION</B>"
+#~ msgstr "<B>PARTICIÓN</B>"
+
+#~ msgid ""
+#~ "<b>Dynamic Host Control Protocol</b><br>Automatic settings via DHCP. "
+#~ "<br><br>This will work if you use a cable or DSL modem on a home
network. "
+#~ "<br>If in doubt, choose this option"
+#~ msgstr ""
+#~ "<b>Dynamic Host Control Protocol</b><br>Configuración automatica vía "
+#~ "DHCP. <br><br>Esto funcionara si utiliza conexión por cable o un
módem "
+#~ "ADSL en una red local. <br>Si dudas, selecciona ésta"
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Sep 25 12:12:14 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.91
+Version=0.0.96
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Sep 25 12:12:14 2008
@@ -34,11 +34,11 @@
.ForeColor = Color.Transparent
' .ForeColor = Picture["images/langbg.png"]
END WITH
-FrmLangSel.Picture = Picture["images/langbg.png"]
+
ME.Maximized = TRUE
frmInit = MdlCore.frmInit
-MdlCore.LOCK_GUI
+'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
'MdlCore.LOCK_GUI()
ClsGlobal.sBackNav = NEW Object[]
@@ -77,8 +77,8 @@
.Frame1.BackColor = Color.Transparent
.tvPlan.BackColor = Color.transparent
'.btQuit.Text = "Exit Installation"
- .tvPlan["Prep0"].Selected = TRUE
- .tvPlan["Prep0"].Picture = MdlCore.sNowPic
+ '.tvPlan["Prep0"].Selected = TRUE
+ '.tvPlan["Prep0"].Picture = MdlCore.sNowPic
.tlBanner.Height = .PictureBox1.Height
END WITH
@@ -182,17 +182,15 @@
SELECT CASE FrmCurr.Name ' very nice navigation algoritm
CASE "FrmLangSel"
sLang = MdlLangSel.ID_LANG(Trim(FrmLangSel.lbLangSel.text))
+ System.Language = sLang
+ MdlCore.TRANSLATE_HOST_WINDOW
+
+ frmNext = FrmSelISO
' now need to restart the application to make sure it takes effect
- SHELL Application.Args[0] & Space(1) & sLang
- QUIT
- 'System.Language = sLang
-
- 'FMain.frmNext = FrmSelISO
-
+ 'SHELL Application.Args[0] & Space(1) & sLang
+ 'QUIT
- 'FrmSelISO.Reparent(FMain.pnlwinhost)
- 'FMain.frmNext = FrmSelISO
' SHELL "LC_ALL=" & sLang & Space(1) & "LANG=" & sLang & " ./" &
Application.Args[0] & Space(1) & sLang ' this will set the LANG environment
to what the user selects and restart the application.
'SHELL "LC_ALL=" & Application.Args[1] & Space(1) & "LANG=" &
Application.Args[1] & Space(1) & "./" & Application.Args[0] & Space(1) &
Trim(FrmLangSel.listbox1.text)
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Thu Sep 25 12:12:14 2008
@@ -34,16 +34,14 @@
END
-PUBLIC SUB Button1_Click()
-
- DIM sLang AS String = MdlLangSel.ID_LANG(Trim(ME.lbLangSel.text))
- System.Language = sLang
- ME.Close
- WAIT 1
- FrmLangSel.Showmodal
-
+PUBLIC SUB Form_Resize()
+ WITH ME
+ .tlBanner.Move(8, 4, MdlObjSizer.get_object_width(.tlBanner.text))
+ .lbLangSel.Move(8, .tlBanner.top + .tlBanner.Height + 4)
+ .lbLangSel.Resize((ME.Width / 3), ME.Height - (.tlBanner.Height * 2))
+ END WITH
END
Modified: branches/iVL/FrmLangSel.form
==============================================================================
--- branches/iVL/FrmLangSel.form (original)
+++ branches/iVL/FrmLangSel.form Thu Sep 25 12:12:14 2008
@@ -3,7 +3,6 @@
{ Form Form
MoveScaled(0,0,64,64)
Text = ("")
- Picture = Picture["images/langbg.png"]
{ lbLangSel ListBox
MoveScaled(1,8,32,51)
List = []
@@ -12,9 +11,5 @@
MoveScaled(2,2,37,5)
Text = ("Select your language")
Alignment = Align.Normal
- }
- { Button1 Button
- MoveScaled(42,10,10,3)
- Text = ("Button1")
}
}
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Thu Sep 25 12:12:14 2008
@@ -37,8 +37,8 @@
MdlNetConf.LIST_NETWORK_INTERFACES
cbUseManDNS.Value = FALSE
tlBanner.text = "<h2>" & tlBanner.text & "</h2>"
- FMain.tvPlan["Conf2"].picture = MdlCore.sNowPic
- FMain.tvPlan["Conf2"].Selected = TRUE
+ ' FMain.tvPlan["Conf2"].picture = MdlCore.sNowPic
+ ' FMain.tvPlan["Conf2"].Selected = TRUE
IF ERROR THEN Message(Error.text & "\n" & Error.where)
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Thu Sep 25 12:12:14 2008
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,94,74)
+ MoveScaled(0,0,114.2857,74)
Text = ("")
{ tlHostNameLbl TextLabel
MoveScaled(1,8,16,3)
@@ -13,7 +13,7 @@
Text = ("")
}
{ frmNetDevices Frame
- MoveScaled(1,23,85,49)
+ MoveScaled(1,20,85,49)
Text = (" Network Interfaces")
{ TSNetDevices TabStrip
MoveScaled(2,4,81,43)
@@ -33,18 +33,18 @@
}
{ txtPrimaryDNS TextBox txtManDNSBoxes
Name = "txtPrimaryDNS"
- MoveScaled(24,16,18.5,3)
+ MoveScaled(24,16,18.4286,3)
Enabled = False
Text = ("192.168.1.254")
}
{ tlSecDNS TextLabel
- MoveScaled(2,19,21,3)
+ MoveScaled(44,15,21,3)
Text = ("Secondary DNS Server")
Alignment = Align.Normal
}
{ txtSecDNS TextBox txtManDNSBoxes
Name = "txtSecDNS"
- MoveScaled(26,19,18.5,3)
+ MoveScaled(68,15,18.4286,3)
Enabled = False
Text = ("")
}
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Thu Sep 25 12:12:14 2008
@@ -50,9 +50,9 @@
PUBLIC SUB rbUseExisting_Click()
ME.tlChoiceExp.Text = "<b>" & UCase(rbUseExisting.Text) & "</b><br><br>"
&
- "Select this option if you already have a linux installation that you
wish to overwrite or if a linux partition scheme exists in your " &
- "Hard disk. <b>This option will overwrite whatever is in those
partitions</b><br><br>" &
- "<i>Use this option if you already prepared your partitions using the
VectorLinux installer</i>"
+ ("Select this option if you already have a linux installation that you
wish to overwrite or if a linux partition scheme exists in your hard
disk.")&
+ "<b>" & ("This option will overwrite any existing data in the selected
partitions") & "</b><br><br>" &
+ "<i>" & ("Use this option if you already prepared your partitions using
the VectorLinux installer") & "</i> "
FMain.frmNext = FrmPartSel
END
@@ -60,8 +60,8 @@
PUBLIC SUB rbEditPartitions_Click()
ME.tlChoiceExp.Text = "<b>" & UCase(rbEditPartitions.Text)
& "</b><br><br>" &
- "Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux " &
- "installation. This option is the safest choice if you have other
existing installations that you wish to keep."
+ ("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux " &
+ "installation. This option is the safest choice if you have other
existing installations that you wish to keep.")
FMain.frmNext = FrmDiskPart
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Thu Sep 25 12:12:14 2008
@@ -66,7 +66,7 @@
END
PUBLIC SUB Form_Hide()
- FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
END
PUBLIC FUNCTION ANALYZE_PARTITION_SETUP() AS Integer
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Thu Sep 25 12:12:14 2008
@@ -48,6 +48,9 @@
PUBLIC SUB Form_Open()
+ FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Prep1"].Selected = TRUE
ME.Width = ME.Parent.Width
ME.Height = ME.Parent.Height
@@ -55,17 +58,18 @@
FMain.btback.Height = ME.btResCan.Height
FMain.btQuit.Height = FMain.btback.Height
FMain.btnext.Height = FMain.btback.Height
- FMain.sNextKey = "Prep0"
+ 'FMain.sNextKey = "Prep0"
+
FMain.FrmCurr = ME
- 'FMain.frmNext = FrmPartScheme
-' FMain.tvPlan["Prep0"].Selected = TRUE
- ' FMain.tvPlan["Prep0"].Picture = MdlCore.sNowPic
+ MdlCore.LOCK_GUI()
+ MdlCore.Init()
+ MdlCore.unlock_gui()
IF ClsGlobal.sBackNav.Find(ME) = -1 THEN
ClsGlobal.sBackNav.Add(ME)
END IF
IF lstInstallableImg.count = 1 THEN
- tlBanner.Text = "Click \'" & FMain.btnext.text & "\' to begin
installating " &
+ tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'"
& Space(1) & ("to begin installating ")&
Left(FrmSelISO.lstInstallableImg.text,
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
END IF
@@ -89,7 +93,7 @@
sFile = Split(File.Load(Temp$(sLoc)), gb.NewLine)
ELSE
'can't find Distro ID
- Message.Error("Unable to identify distro.")
+ Message.Error(("Unable to identify distro."))
RETURN
END IF
@@ -124,7 +128,7 @@
END IF
FrmSelISO.tlDistroDesc.Text = "<h3>" & sDist & Space(1) & sVer
& "</h3><br>" &
- "<b>Minimum Disk Space Requirements</b><br>"
+ "<b>" & ("Minimum Disk Space Requirements") & "</b><br>"
IF Right(iMinRoot) LIKE "\'" OR "\"" THEN
@@ -188,7 +192,7 @@
PUBLIC SUB Form_Hide()
FMain.frmLast = ME
- FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+ 'FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Thu Sep 25 12:12:14 2008
@@ -218,23 +218,36 @@
END IF
-'MdlInstallCustom.INSTALL_KERNELS()
-'RETURN
+
FMain.Show
- ME.Init
+
END
+PUBLIC SUB TRANSLATE_HOST_WINDOW()
+
+
+ WITH fmain
+ .tvPlan.Clear
+
+ END WITH
+
+ ME.PREPARE_INSTALL_LAYOUT
+
+
+
+END
+
+
+
PUBLIC SUB Init()
-' FMain.Maximized = TRUE
-' FMain.Resize(Desktop.Width, Desktop.Height)
- 'FMain.tvPlan.MoveTo("Prep0")
+
FMain.tvPlan["Prep0"].Selected = TRUE
-'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost)
+
'RETURN
-FrmSelISO.tlDistroDesc.Text = ("<b>Scanning system for installable media.
Please wait ...</b>")
+FrmSelISO.tlDistroDesc.Text = "<b>" & ("Scanning system for installable
media. Please wait ...") & "</b>"
IF Exist(ClsGlobal.sSourceMnt) = FALSE THEN TRY MKDIR ClsGlobal.sSourceMnt
@@ -252,7 +265,7 @@
IF FrmSelISO.lstInstallableImg.Count = 0 THEN
FrmSelISO.lstInstallableImg.Add(("No Installable Media Found"))
FrmSelISO.tlDistroDesc.Text = ("Setup was unable to find any installable
media on your system. Please insert your VectorLinux ")&
- ("installation CD and click \'") & FrmSelISO.btResCan.Text & ("\' to
try again")
+ ("installation CD and click ") & "\'" & FrmSelISO.btResCan.Text
& "\' " & ("to try again")
FMain.btnext.Enabled = FALSE
FMain.btnext.ForeColor = Color.Gray
ELSE
@@ -410,7 +423,7 @@
WITH FrmSelISO.tlDistroDesc
.Text = sDistro & Space(1) & sver & "<br>" &
("Build Date: ") & sBuildDate & "<br>" &
- ("<b>MINIMUM REQUIREMENTS<br>")&
+ "<b>" & ("MINIMUM REQUIREMENTS") & "<br>" &
"/ " & iMinRoot & "<br>" &
"/home " & iMinHome & "<br>" &
"swap " & iMinSwap
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Sep 25 12:12:14 2008
@@ -42,8 +42,8 @@
stype = Trim(sType)
'Message(sType)
IF stype = "" THEN
- Message.Error(("VectorLinux is unable to determine the type of hard
disks on your system. <br>" &
- "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"))
+ Message.Error(("VectorLinux is unable to determine the type of hard
disks on your system.") & " <br>" &
+ ("It is still possible to install VectorLinux on your system, but
you need to pre-partition your disks first"))
ELSE IF InStr(sType, "\n") > 0 THEN
' more than one type of disk was found... by default, gparted will
load using /dev/hda first
sType = "/dev/hda"
@@ -54,7 +54,7 @@
RETURN
END IF
- FrmDiskPart.tlBanner.Text = ("<h3>Loading gparted ... Please wait</h3>")
+ FrmDiskPart.tlBanner.Text = "<h3>" & ("Loading gparted ... Please wait")
& "</h3>"
SHELL "/usr/sbin/gparted"
WAIT 1
@@ -86,8 +86,8 @@
IF aHandle.Count = 0 THEN
- Message(("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
- "a bad install media. Setup cannot continue."))
+ Message(("Setup is unable to successfully run gparted on this
system. This may be a sign of ") & "\n" &
+ ("a bad install media. Setup cannot continue."))
RETURN
'END IF
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Sep 25 12:12:14 2008
@@ -64,7 +64,7 @@
' now populate it with the necessary stuff
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinBanner"
WITH tl
- .text = ("<b>Windows installation found in ") &
sWinPart & "</b>"
+ .text = "<b>" & ("Windows installation found
in ") & sWinPart & "</b>"
.Move(4, 16, MdlObjSizer.get_object_width(.text)
+ 24, 27)
.Alignment = Align.Normal
.BackColor = Color.Background
@@ -130,7 +130,7 @@
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinPartLbl"
WITH tl
.Move(4, 24)
- .text = ("<b>Windows installation found in ") &
sWinPart & "</b>"
+ .text = "<b>" & ("Windows installation found
in ") & sWinPart & "</b>"
.Height = 27
.Width = MdlObjSizer.get_object_width(.text)
.BackColor = Color.Background
@@ -267,7 +267,7 @@
ENDIF
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
- .text = ("<b>Operating system installed in ") & arrLinux[i]
& "</b>"
+ .text = "<b>" & ("Operating system installed in ") &
arrLinux[i] & "</b> "
.Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
'.BackColor = Color.SelectedBackground
.Alignment = Align.Normal
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Thu Sep 25 12:12:14 2008
@@ -16,6 +16,8 @@
PRIVATE ileft AS Integer
PRIVATE itop AS Integer
PRIVATE icbleft AS Integer
+PRIVATE iWifix AS Integer
+PRIVATE iwifiy AS Integer
PUBLIC objCombos AS Object[]
PUBLIC objCheckboxes AS Object[]
PUBLIC objtxtIps AS Object[]
@@ -23,6 +25,9 @@
PUBLIC objtxtDNS AS Object[]
PUBLIC objFrames AS Object[]
PUBLIC objtlDetails AS Object[]
+PUBLIC objcbWifi AS Object[]
+PUBLIC objtxtWifiKey AS Object[]
+PUBLIC objcbWifiessid AS Object[]
@@ -37,7 +42,7 @@
DIM sDevList AS String[]
DIM sLine AS String[]
DIM sDev AS String
- DIM sType AS String
+ DIM sType, sStatus AS String
DIM sDevAddr AS String
DIM tl AS TextLabel
DIM tb AS TextBox
@@ -45,6 +50,9 @@
DIM bCb AS CheckBox
DIM i, ii, y, x, cbwidth AS Integer
DIM pTabPic AS picture
+ DIM iwifiboxwidth, iwifiboxleft AS Integer
+ DIM sApDump AS String
+ 'DIM iwifix, iwifiy, iwifiboxwidth AS Integer
'initiate the arrays
@@ -55,18 +63,25 @@
objtxtNetMasks = NEW Object[]
objtxtDNS = NEW Object[]
objCheckboxes = NEW Object[]
-
+ objcbWifi = NEW Object[]
+ objtxtWifiKey = NEW Object[]
+ objcbWifiessid = NEW Object[]
- SHELL "ifconfig -a | grep ^[a-z] | grep -v ^lo" TO seths
- File.Save(Temp("eths"), Trim(seths))
+ SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo
\"$res\" | tr -s \' \'" TO seths
+ 'File.Save(Temp("eths"), Trim(seths))
+ 'Message(File.Load(Temp("eths")))
+ seths = Trim(seths)
- sDevList = Split(File.Load(DConv(Temp("eths"))), gb.NewLine)
+ sDevList = Split(seths, gb.NewLine)
+ 'Message(seths)
FOR i = 0 TO sDevList.count - 1
+ 'Message(sDevList[i])
sLine = Split(sDevList[i], " ")
sDev = sLine[0]
- sDevAddr = sLine[10] ' This may be off depending on which box
this runs one... needs careful testing
+ 'Message(sLine[1])
+ sDevAddr = sLine[4] ' This may be off depending on which box
this runs one... needs careful testing
' try to detect wirelesss here
sDump = ""
SHELL "iwconfig " & sDev & " > /tmp/iwdump 2>&1" WAIT
@@ -79,6 +94,17 @@
sType = ("Wireless")
pTabPic = pWirelessPic
END IF
+
+ ' detect status
+ SHELL "ifplugstatus | grep ^" & sDev & " | cut -f 2
-d \':\'" TO sStatus
+ 'Message(sStatus)
+ sStatus = Trim(sStatus)
+ IF InStr(sStatus, "detected") THEN
+ sStatus = ("Plugged-in")
+ ELSE
+ sStatus = ("Unplugged")
+ END IF
+
WITH FrmNetConf.TSNetDevices
PRINT .Count
@@ -110,7 +136,7 @@
.Height = tl.Height
x = .Left
cbwidth = .Width
-
+ iwifiboxwidth = .Width
END WITH
tl = NEW TextLabel(FrmNetConf.TSNetDevices)
AS "DevTYpeLbl"
@@ -151,7 +177,7 @@
.text = ("Setup Mode")
.height = 21
.Width = MdlObjSizer.get_object_width(.text)
- .Alignment = Align.Normal
+ .Alignment = Align.BottomLeft
'y = .top + .Height + 4
iLeft = .Left
END WITH
@@ -170,6 +196,87 @@
y = cb.top + cb.Height + 4
itop = y
objCombos.Add(cb)
+ IF StYPE = ("Wireless") THEN
+ tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ WITH tl
+ .text = ("Encryption type")
+ .Width = MdlObjSizer.get_object_width(.text)
+ .Height = 21
+ '.Move(x + cb.Width + 96, y - .Height - 8)
+ .Move(ileft + 300 + 24, itop + 12)
+ .Alignment = Align.BottomLeft
+ '.Border = Border.Plain
+ END WITH
+ iWifix = tl.Left
+ iwifiy = tl.Top
+ cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "cbWifiEnc"
+ WITH cb
+ .ReadOnly = TRUE
+ .list = [("None"), "WAP", "WEP"]
+ .Width = tb.Width
+ .tag = sDev
+ .Height = tl.Height
+ .Move(tl.left + tl.Width + 12, tl.top)
+
+ iwifiboxleft = .Left
+
+ END WITH
+ objcbWifi.Add(cb)
+
+ tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ WITH tl
+ .text = ("Encryption key")
+ .Width = MdlObjSizer.get_object_width(.text)
+ .Height = 21
+ .Move(iwifix, iwifiy + .Height + 12)
+ .Alignment = Align.Normal
+ END WITH
+ tb = NEW TextBox(FrmNetConf.TSNetDevices)
+ WITH tb
+ .text = ""
+ .Width = iwifiboxwidth
+ .Height = 21
+ .Password = TRUE
+ .Move(iwifiboxleft, tl.Top)
+ .Enabled = FALSE
+ .tag = sDev
+ END WITH
+ objtxtWifiKey.Add(tb)
+ tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ WITH tl
+ .text = ("Access Point...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X