Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r491 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-11 22:39:33
|
Author: M0...@gm...
Date: Wed Feb 11 14:32:23 2009
New Revision: 491
Added:
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/Step3a1a.class
branches/speedy/Step3a1a.form
branches/speedy/Step3a3.class
branches/speedy/Step3a3.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/en_US.po
branches/speedy/.lang/es.po
branches/speedy/ClsGlobal.class
branches/speedy/Step3a.class
branches/speedy/Step3a.form
branches/speedy/Step3a1.class
branches/speedy/Step3a1.form
branches/speedy/Step3a2.class
Log:
More work in auto-partitioning dept
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 11 14:32:23 2009
@@ -102,7 +102,7 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414
+#: Step1.class:414 Step3a1.class:22 Step3a1a.class:81
msgid "WARNING:"
msgstr ""
@@ -242,7 +242,7 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:108
+#: Step3.class:132 Step3a.class:110 Step3a1.class:157
msgid "TextLabel1"
msgstr ""
@@ -307,20 +307,74 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:119
+#: Step3a.class:121
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:140
+#: Step3a.class:143
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:161
+#: Step3a.class:167
msgid "Use entire disk"
msgstr ""
-#: Step3a1.class:19
-msgid "Use Entire Hard Disk"
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr ""
+
+#: Step3a1.class:179 Step3a2.class:455
+msgid "RadioButton1"
+msgstr ""
+
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid "There has been an error deleting"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid ""
+"Please make sure the drive or partition is not being used by some other "
+"program"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "All existing data in"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "is about to be deleted."
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr ""
+
+#: Step3a1a.class:81 Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step3a1a.class:81 Step6.class:385
+msgid "No"
+msgstr ""
+
+#: Step3a1a.class:84
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr ""
+
+#: Step3a1a.class:89
+msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
#: Step3a2.class:25
@@ -353,30 +407,46 @@
"VectorLinux"
msgstr ""
-#: Step3a2.class:189
+#: Step3a2.class:191
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:206
msgid ""
"Unable to find enough un-used space to perform auto-partition. Please "
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:309
+#: Step3a2.class:322
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:422
-msgid "RadioButton1"
+#: Step3a2.class:352
+msgid ""
+"We are unable to find any hard disks with enough unpartitioned space for "
+"this operation."
+msgstr ""
+
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr ""
+
+#: Step3a2.class:354
+msgid ""
+"Unable to find any hard drives with enough unpartitioned space. Please
go "
+"back and select another partitioning method"
+msgstr ""
+
+#: Step3a3.class:22
+msgid "Claim free space from existing partitions"
msgstr ""
#: Step4.class:23
@@ -521,12 +591,4 @@
#: Step6.class:280
msgid "Select which partitions to use for installation"
-msgstr ""
-
-#: Step6.class:385
-msgid "Yes"
-msgstr ""
-
-#: Step6.class:385
-msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Wed Feb 11 14:32:23 2009
@@ -46,19 +46,19 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:108
+#: Step3a.class:110
msgid "TextLabel1"
msgstr ""
-#: Step3a.class:119
+#: Step3a.class:121
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:140
+#: Step3a.class:143
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:161
+#: Step3a.class:167
msgid "Use entire disk"
msgstr ""
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Wed Feb 11 14:32:23 2009
@@ -14,7 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step3a1.class:19
-msgid "Use Entire Hard Disk"
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "WARNING:"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr ""
+
+#: Step3a1.class:157
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3a1.class:179
+msgid "RadioButton1"
msgstr ""
Added: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a1a.pot Wed Feb 11 14:32:23 2009
@@ -0,0 +1,60 @@
+# /home/vluser/devel/speedy/Step3a1a.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid "There has been an error deleting"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid "Please make sure the drive or partition is not being used by some
other program"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "WARNING:"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "All existing data in"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "is about to be deleted."
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "Yes"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "No"
+msgstr ""
+
+#: Step3a1a.class:84
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr ""
+
+#: Step3a1a.class:89
+msgid "Operation cancelled by user. No changes have been made to the
system"
+msgstr ""
+
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Wed Feb 11 14:32:23 2009
@@ -42,27 +42,39 @@
msgid "Select the location on your hard drive where you would like to
install VectorLinux"
msgstr ""
-#: Step3a2.class:189
+#: Step3a2.class:191
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:206
msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:309
+#: Step3a2.class:322
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:422
+#: Step3a2.class:352
+msgid "We are unable to find any hard disks with enough unpartitioned
space for this operation."
+msgstr ""
+
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr ""
+
+#: Step3a2.class:354
+msgid "Unable to find any hard drives with enough unpartitioned space.
Please go back and select another partitioning method"
+msgstr ""
+
+#: Step3a2.class:455
msgid "RadioButton1"
msgstr ""
Added: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a3.pot Wed Feb 11 14:32:23 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/Step3a3.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step3a3.class:22
+msgid "Claim free space from existing partitions"
+msgstr ""
+
Modified: branches/speedy/.lang/en_US.po
==============================================================================
--- branches/speedy/.lang/en_US.po (original)
+++ branches/speedy/.lang/en_US.po Wed Feb 11 14:32:23 2009
@@ -10,119 +10,533 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:258 FMain0.class:251
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "VectorLinux Installer"
+
+#: FMain.class:245 FMain0.class:233
+msgid "Process Overview"
+msgstr "Process Overview"
+
+#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr "Back"
-#: Step1.class:412
-msgid "Check Installation media before installing"
-msgstr "Check Installation media before installing"
+#: FMain.class:298 FMain0.class:282
+msgid "Next"
+msgstr "Next"
-#: Step1.class:234
-msgid "DISTRIBUTION"
-msgstr "DISTRIBUTION"
+#: FMain.class:309 FMain0.class:293
+msgid "Quit"
+msgstr "Quit"
-#: Step0.class:116
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Localization Settings"
+
+#: Step0.class:122
+msgid "Spanish"
+msgstr "Spanish"
+
+#: Step0.class:125
msgid "English (US)"
msgstr "English (US)"
-#: Step1.class:81
-msgid "Found"
-msgstr "Found"
+#: Step0.class:253
+msgid "Select your language"
+msgstr "Select your language"
-#: Step2.class:37
-msgid "Keep in mind however, that this process can take a while to
complete."
-msgstr "Keep in mind however, that this process can take a while to
complete."
+#: Step0.class:284
+msgid "Select your keyboard layout"
+msgstr "Select your keyboard layout"
-#: Step0.class:20
-msgid "Localization Settings"
-msgstr "Localization Settings"
+#: Step0.class:303
+msgid "Select your keyboard model"
+msgstr "Select your keyboard model"
-#: FMain.class:269 FMain0.class:262
-msgid "Next"
-msgstr "Next"
+#: Step0.class:325
+msgid "Use this box to test your keyboard settings"
+msgstr "Use this box to test your keyboard settings"
-#: FMain.class:221 FMain0.class:214
-msgid "Process Overview"
-msgstr "Process Overview"
+#: Step1.class:33
+msgid "on"
+msgstr "on"
-#: FMain.class:280 FMain0.class:273
-msgid "Quit"
-msgstr "Quit"
+#: Step1.class:130
+msgid "Scanning system partitions for installation files"
+msgstr "Scanning system partitions for installation files"
-#: Step1.class:122
-msgid "Scanning"
-msgstr "Scanning"
+#: Step1.class:149
+msgid "Found"
+msgstr "Found"
+
+#: Step1.class:149
+msgid "in partition"
+msgstr "in partition"
-#: Step1.class:109
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr "Scanning for CD Media ... Please wait"
-#: Step1.class:156
+#: Step1.class:203
+msgid "Scanning"
+msgstr "Scanning"
+
+#: Step1.class:213
+msgid "in"
+msgstr "in"
+
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr "Scanning system for installable ISO images"
-#: Step1.class:62
-msgid "Scanning system partitions for installation files"
-msgstr "Scanning system partitions for installation files"
+#: Step1.class:334
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUTION"
-#: Step1.class:388
-msgid "Search Again"
-msgstr "Search Again"
+#: Step1.class:337
+msgid "VERSION"
+msgstr "VERSION"
-#: Step1.class:349
+#: Step1.class:414
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr ""
+
+#: Step1.class:414
+msgid "WARNING:"
+msgstr ""
+
+#: Step1.class:414
+#, fuzzy
+msgid "This process can take a long time to complete."
+msgstr "Keep in mind however, that this process can take a while to
complete."
+
+#: Step1.class:466
msgid "Select Installation Source"
msgstr "Select Installation Source"
-#: Step1.class:367
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr "Select Installation source from the list below"
-#: Step0.class:272
-msgid "Select your keyboard layout"
-msgstr "Select your keyboard layout"
-
-#: Step0.class:291
-msgid "Select your keyboard model"
-msgstr "Select your keyboard model"
-
-#: Step0.class:241
-msgid "Select your language"
-msgstr "Select your language"
-
-#: Step0.class:113
-msgid "Spanish"
-msgstr "Spanish"
-
-#: Step0.class:317
-msgid "Use this box to test your keyboard settings"
-msgstr "Use this box to test your keyboard settings"
-
-#: Step1.class:237
-msgid "VERSION"
-msgstr "VERSION"
+#: Step1.class:505
+msgid "Search Again"
+msgstr "Search Again"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "VectorLinux Installer"
+#: Step1.class:529
+msgid "Check Installation media before installing"
+msgstr "Check Installation media before installing"
-#: Step2.class:22
+#: Step2.class:27
msgid "Verify Installation Files"
msgstr "Verify Installation Files"
-#: Step2.class:37
-msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
-msgstr "Verifying installation files can prevent you from performing an
unsuccessful install"
+#: Step2.class:46
+msgid ""
+"This installation media has already been checked. Would you like to check
it "
+"again?"
+msgstr ""
+
+#: Step2.class:78
+msgid "Verifying data on compressed package"
+msgstr ""
+
+#: Step2.class:82
+msgid "Testing file"
+msgstr ""
+
+#: Step2.class:82
+msgid "of"
+msgstr ""
+
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
+msgid "FAILED"
+msgstr ""
+
+#: Step2.class:117
+msgid "The following"
+msgstr ""
+
+#: Step2.class:117
+msgid "required"
+msgstr ""
+
+#: Step2.class:117
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+
+#: Step2.class:118
+msgid "Integrity test"
+msgstr ""
+
+#: Step2.class:124
+msgid "PASSED"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"has failed the data integrity test. All required packages have passed
this "
+"test"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"Possible causes for this are a corrupted download or a badly burnt cd.
You "
+"can try the following options"
+msgstr ""
+
+#: Step2.class:154
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr ""
+
+#: Step2.class:154
+msgid "Burn the image at a lower speed rate"
+msgstr ""
+
+#: Step2.class:174
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+
+#: Step2.class:181
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+
+#: Step2.class:198
+msgid ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
+msgstr ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
-#: Step1.class:132
-msgid "in"
-msgstr "in"
+#: Step2.class:198
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr "Keep in mind however, that this process can take a while to
complete."
-#: Step1.class:81
-msgid "in partition"
+#: Step2.class:198
+msgid "Click"
+msgstr ""
+
+#: Step2.class:198
+msgid "to abort this process at any time"
+msgstr ""
+
+#: Step2.class:352
+msgid "TextLabel2"
+msgstr ""
+
+#: Step2.class:366
+msgid "Stop"
+msgstr ""
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:132 Step3a.class:110
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3.class:150
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:160
+msgid ""
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
+msgstr ""
+
+#: Step3.class:167
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:177
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:184
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:194
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr ""
+
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:121
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:142
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr ""
+
+#: Step3a.class:163
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
+#: Step3a2.class:25
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:45
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "Another partitioning option"
+msgstr ""
+
+#: Step3a2.class:92
+msgid "(Recomended)"
+msgstr ""
+
+#: Step3a2.class:102
+msgid "of free space"
+msgstr ""
+
+#: Step3a2.class:143
+msgid ""
+"Select the location on your hard drive where you would like to install "
+"VectorLinux"
+msgstr ""
+
+#: Step3a2.class:189
+msgid "Please wait while your hard drive is being partitioned"
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:204
+msgid ""
+"Unable to find enough un-used space to perform auto-partition. Please "
+"consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:309
+msgid "Partitioning stage complete... Click next to continue"
+msgstr ""
+
+#: Step3a2.class:422
+msgid "RadioButton1"
+msgstr ""
+
+#: Step3a3.class:6
+msgid "Claim free space from existing partitions"
+msgstr ""
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:174
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
+msgstr ""
+
+#: Step6.class:58
+#, fuzzy
+msgid "Partition"
msgstr "in partition"
-#: Step1.class:80
-msgid "on"
-msgstr "on"
+#: Step6.class:59
+msgid "Size"
+msgstr ""
+
+#: Step6.class:60
+msgid "Mount Point"
+msgstr ""
+
+#: Step6.class:61
+msgid "File System"
+msgstr ""
+
+#: Step6.class:133
+msgid "Not Used"
+msgstr ""
+
+#: Step6.class:154
+msgid "Do not format"
+msgstr ""
+
+#: Step6.class:199
+msgid "You have already selected"
+msgstr ""
+
+#: Step6.class:199
+msgid "as your"
+msgstr ""
+
+#: Step6.class:199
+#, fuzzy
+msgid "partition."
+msgstr "in partition"
+
+#: Step6.class:199
+msgid "Please select only one partition for this purpose"
+msgstr ""
+
+#: Step6.class:280
+#, fuzzy
+msgid "Select which partitions to use for installation"
+msgstr "Scanning system partitions for installation files"
+#: Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step6.class:385
+msgid "No"
+msgstr ""
Modified: branches/speedy/.lang/es.po
==============================================================================
--- branches/speedy/.lang/es.po (original)
+++ branches/speedy/.lang/es.po Wed Feb 11 14:32:23 2009
@@ -10,119 +10,533 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:258 FMain0.class:251
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "Instalador de VectorLinux"
+
+#: FMain.class:245 FMain0.class:233
+msgid "Process Overview"
+msgstr "Resumen del Proceso"
+
+#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr "Regreso"
-#: Step1.class:412
-msgid "Check Installation media before installing"
-msgstr "Verificar archivos de instalacion"
+#: FMain.class:298 FMain0.class:282
+msgid "Next"
+msgstr "Siguiente"
-#: Step1.class:234
-msgid "DISTRIBUTION"
-msgstr "DISTRIBUCION"
+#: FMain.class:309 FMain0.class:293
+msgid "Quit"
+msgstr "Cancelar"
-#: Step0.class:116
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Valores locales"
+
+#: Step0.class:122
+msgid "Spanish"
+msgstr ""
+
+#: Step0.class:125
msgid "English (US)"
msgstr ""
-#: Step1.class:81
-msgid "Found"
-msgstr "Encontre"
+#: Step0.class:253
+msgid "Select your language"
+msgstr "Seleccione su idioma"
-#: Step2.class:37
-msgid "Keep in mind however, that this process can take a while to
complete."
-msgstr "Tenga presente que este proceso podria tomar varios minutos para
terminar"
+#: Step0.class:284
+msgid "Select your keyboard layout"
+msgstr "Seleccione el diseño de su teclado"
-#: Step0.class:20
-msgid "Localization Settings"
-msgstr "Valores locales"
+#: Step0.class:303
+msgid "Select your keyboard model"
+msgstr "Seleccione el model de su teclado"
-#: FMain.class:269 FMain0.class:262
-msgid "Next"
-msgstr "Siguiente"
+#: Step0.class:325
+msgid "Use this box to test your keyboard settings"
+msgstr "Area de prueba"
-#: FMain.class:221 FMain0.class:220
-msgid "Process Overview"
-msgstr "Resumen del Proceso"
+#: Step1.class:33
+msgid "on"
+msgstr "en"
-#: FMain.class:280 FMain0.class:273
-msgid "Quit"
-msgstr "Cancelar"
+#: Step1.class:130
+msgid "Scanning system partitions for installation files"
+msgstr "Buscando medios de instalacion en particiones del sistema"
-#: Step1.class:122
-msgid "Scanning"
-msgstr "Buscando en"
+#: Step1.class:149
+msgid "Found"
+msgstr "Encontre"
+
+#: Step1.class:149
+msgid "in partition"
+msgstr "en particion"
-#: Step1.class:109
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr "Buscando medios de instalacion en CDROM. Por favor espere"
-#: Step1.class:156
+#: Step1.class:203
+msgid "Scanning"
+msgstr "Buscando en"
+
+#: Step1.class:213
+msgid "in"
+msgstr "en"
+
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr "Buscando medios de instalacion en imagenes ISO."
-#: Step1.class:62
-msgid "Scanning system partitions for installation files"
-msgstr "Buscando medios de instalacion en particiones del sistema"
+#: Step1.class:334
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUCION"
-#: Step1.class:388
-msgid "Search Again"
-msgstr "Buscar Nuevamente"
+#: Step1.class:337
+msgid "VERSION"
+msgstr "VERSION"
+
+#: Step1.class:414
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr ""
-#: Step1.class:349
+#: Step1.class:414
+msgid "WARNING:"
+msgstr ""
+
+#: Step1.class:414
+#, fuzzy
+msgid "This process can take a long time to complete."
+msgstr ""
+"Tenga presente que este proceso podria tomar varios minutos para terminar"
+
+#: Step1.class:466
msgid "Select Installation Source"
msgstr "Seleccione el medio de instalacion"
-#: Step1.class:367
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr "Seleccione la fuente instalacion de esta lista"
-#: Step0.class:272
-msgid "Select your keyboard layout"
-msgstr "Seleccione el diseño de su teclado"
+#: Step1.class:505
+msgid "Search Again"
+msgstr "Buscar Nuevamente"
-#: Step0.class:291
-msgid "Select your keyboard model"
-msgstr "Seleccione el model de su teclado"
+#: Step1.class:529
+msgid "Check Installation media before installing"
+msgstr "Verificar archivos de instalacion"
-#: Step0.class:241
-msgid "Select your language"
-msgstr "Seleccione su idioma"
+#: Step2.class:27
+msgid "Verify Installation Files"
+msgstr "Verificar archivos de instalacion antes de instalar"
-#: Step0.class:113
-msgid "Spanish"
+#: Step2.class:46
+msgid ""
+"This installation media has already been checked. Would you like to check
it "
+"again?"
msgstr ""
-#: Step0.class:317
-msgid "Use this box to test your keyboard settings"
-msgstr "Area de prueba"
+#: Step2.class:78
+msgid "Verifying data on compressed package"
+msgstr ""
-#: Step1.class:237
-msgid "VERSION"
-msgstr "VERSION"
+#: Step2.class:82
+msgid "Testing file"
+msgstr ""
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
+#: Step2.class:82
+msgid "of"
+msgstr ""
-#: Step2.class:22
-msgid "Verify Installation Files"
-msgstr "Verificar archivos de instalacion antes de instalar"
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
+msgid "FAILED"
+msgstr ""
+
+#: Step2.class:117
+msgid "The following"
+msgstr ""
-#: Step2.class:37
-msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
+#: Step2.class:117
+msgid "required"
+msgstr ""
+
+#: Step2.class:117
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+
+#: Step2.class:118
+msgid "Integrity test"
+msgstr ""
+
+#: Step2.class:124
+msgid "PASSED"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"has failed the data integrity test. All required packages have passed
this "
+"test"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"Possible causes for this are a corrupted download or a badly burnt cd.
You "
+"can try the following options"
+msgstr ""
+
+#: Step2.class:154
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr ""
+
+#: Step2.class:154
+msgid "Burn the image at a lower speed rate"
+msgstr ""
+
+#: Step2.class:174
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+
+#: Step2.class:181
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+
+#: Step2.class:198
+msgid ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
msgstr "Este proceso puede ayudar a asegurar que la instalacion sea
exitosa."
-#: Step1.class:132
-msgid "in"
-msgstr "en"
+#: Step2.class:198
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr ""
+"Tenga presente que este proceso podria tomar varios minutos para terminar"
-#: Step1.class:81
-msgid "in partition"
+#: Step2.class:198
+msgid "Click"
+msgstr ""
+
+#: Step2.class:198
+msgid "to abort this process at any time"
+msgstr ""
+
+#: Step2.class:352
+msgid "TextLabel2"
+msgstr ""
+
+#: Step2.class:366
+msgid "Stop"
+msgstr ""
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:132 Step3a.class:110
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3.class:150
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:160
+msgid ""
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
+msgstr ""
+
+#: Step3.class:167
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:177
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:184
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:194
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr ""
+
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:121
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:142
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr ""
+
+#: Step3a.class:163
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
+#: Step3a2.class:25
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:45
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "Another partitioning option"
+msgstr ""
+
+#: Step3a2.class:92
+msgid "(Recomended)"
+msgstr ""
+
+#: Step3a2.class:102
+msgid "of free space"
+msgstr ""
+
+#: Step3a2.class:143
+msgid ""
+"Select the location on your hard drive where you would like to install "
+"VectorLinux"
+msgstr ""
+
+#: Step3a2.class:189
+msgid "Please wait while your hard drive is being partitioned"
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:204
+msgid ""
+"Unable to find enough un-used space to perform auto-partition. Please "
+"consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:309
+msgid "Partitioning stage complete... Click next to continue"
+msgstr ""
+
+#: Step3a2.class:422
+msgid "RadioButton1"
+msgstr ""
+
+#: Step3a3.class:6
+msgid "Claim free space from existing partitions"
+msgstr ""
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:174
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
+msgstr ""
+
+#: Step6.class:58
+#, fuzzy
+msgid "Partition"
msgstr "en particion"
-#: Step1.class:80
-msgid "on"
-msgstr "en"
+#: Step6.class:59
+msgid "Size"
+msgstr ""
+
+#: Step6.class:60
+msgid "Mount Point"
+msgstr ""
+
+#: Step6.class:61
+msgid "File System"
+msgstr ""
+#: Step6.class:133
+msgid "Not Used"
+msgstr ""
+
+#: Step6.class:154
+msgid "Do not format"
+msgstr ""
+
+#: Step6.class:199
+msgid "You have already selected"
+msgstr ""
+
+#: Step6.class:199
+msgid "as your"
+msgstr ""
+
+#: Step6.class:199
+#, fuzzy
+msgid "partition."
+msgstr "en particion"
+
+#: Step6.class:199
+msgid "Please select only one partition for this purpose"
+msgstr ""
+
+#: Step6.class:280
+#, fuzzy
+msgid "Select which partitions to use for installation"
+msgstr "Buscando medios de instalacion en particiones del sistema"
+
+#: Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step6.class:385
+msgid "No"
+msgstr ""
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Wed Feb 11 14:32:23 2009
@@ -28,3 +28,12 @@
STATIC PUBLIC sToScan AS String
STATIC PUBLIC sLastScanned AS String
+
+' Partition method used
+
+STATIC PUBLIC bAutoPartition AS Boolean
+STATIC PUBLIC sTargetRoot AS String ' we know by default this is a
reiserfs partition
+STATIC PUBLIC sTargetSwap AS String
+
+STATIC PUBLIC sFullDiscToWipe AS String
+
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Wed Feb 11 14:32:23 2009
@@ -44,8 +44,10 @@
IF ME.rbEntireDisk.Value = TRUE THEN
RETURN "Step3a1"
- ELSE IF ME.rbunpartitioned THEN
+ ELSE IF ME.rbunpartitioned.Value = TRUE THEN
RETURN "Step3a2"
+ ELSE IF ME.rbResizeParts.Value = TRUE THEN
+ RETURN "Step3a3"
END IF
Modified: branches/speedy/Step3a.form
==============================================================================
--- branches/speedy/Step3a.form (original)
+++ branches/speedy/Step3a.form Wed Feb 11 14:32:23 2009
@@ -48,19 +48,23 @@
}
{ rbResizeParts RadioButton
MoveScaled(1,8,56,3)
+ Visible = False
Expand = True
Text = ("Use free space on existing partitions for VectorLinux")
}
{ Panel3 Panel
MoveScaled(2,11,3,3)
+ Visible = False
}
{ tlFreeSpace2 TextLabel
MoveScaled(5,11,19,4)
+ Visible = False
Expand = True
Text = ("")
}
{ HBox3 HBox
MoveScaled(1,14,6,2)
+ Visible = False
Expand = True
}
{ rbEntireDisk RadioButton
Modified: branches/speedy/Step3a1.class
==============================================================================
--- branches/speedy/Step3a1.class (original)
+++ branches/speedy/Step3a1.class Wed Feb 11 14:32:23 2009
@@ -14,19 +14,90 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PUBLIC objPosTargets AS Object[]
PUBLIC SUB Form_Open()
- ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk") & "</H2>"
+ ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk for VectorLinux")
& "</H2>"
+ ME.TLwARNING.Text = "<b><u>" & ("WARNING:") & "</u></b><br>" &
+ "<i>" & ("All existing data in the device you select here will be
destroyed.") & "</i>"
+
+ objPosTargets = NEW Object[]
+
+ ME.DISPLAY_POSSIBLE_DISK_TARGETS
+END
+PUBLIC SUB DISPLAY_POSSIBLE_DISK_TARGETS()
+
+ DIM sDiskList AS String[]
+ DIM sDisks, sDisk, sSizeDump AS String
+ DIM i AS Integer
+
+ PRINT " --\\__ Auto partition using full disk"
+ PRINT " --\\- Possible Targets: "
+ SHELL "probedisk | grep -v -i \"cdrom\" | cut -f 1 -d \"|\" " TO sDisks
+
+ sDiskList = Split(Trim(sDisks), "\n")
+ FOR i = 0 TO sDiskList.Max
+ sDisk = Trim(sDiskList[i])
+ IF InStr(ClsGlobal.sSourceAddr, sDisk) = FALSE THEN
+ 'Message(sDisk)
+ ' root:# parted /dev/hda print | grep "^Disk" | tr -s ' ',""
| cut -f 2 -d ':'
+ SHELL "parted " & sDisk & " print | grep \"^Disk\" | tr -s
\' \',\"\" | cut -f 2 -d \':\'" TO sSizeDump
+ sSizeDump = Trim(sSizeDump)
+
+ PRINT " --\\+ " & sDisk & " ( " & sSizeDump & " )"
+ ' do the gui representation
+ rb = NEW RadioButton(hpanel2) AS "PossTargets"
+
+ WITH rb
+ .Height = 21
+ .Expand = TRUE
+ .Text = sDisk
+ .Tag = sDisk
+ END WITH
+ IF objPosTargets.Find(rb) = -1 THEN objPosTargets.Add(rb)
+
+ pn = NEW Panel(hpanel2)
+ WITH pn
+ .Expand = FALSE
+ .Width = 30
+ .Height = 30
+ END WITH
+ tl = NEW TextLabel(hpanel2) ' Hard disk information
+ WITH tl
+ .Text = "<b>" & ("Total Disc Size") & "</b>" &
Space(1) & sSizeDump
+ .Expand = TRUE
+ .Height = 21
+ .Alignment = Align.Left
+ END WITH
+ hb = NEW HBox(hpanel2)
+ WITH hb
+ .Height = 10
+ .Expand = TRUE
+ END WITH
+
+
+ END IF
+ NEXT
+
END
+
+
+
+
PUBLIC FUNCTION GETNEXT() AS String
-
+ RETURN "Step3a1a"
END
PUBLIC SUB ONEXIT()
-
+ DIM rb AS RadioButton
+ FOR EACH rb IN objPosTargets
+ IF rb.Value = TRUE THEN
+ ClsGlobal.sFullDiscToWipe = rb.Tag
+ END IF
+ NEXT
END
PUBLIC SUB STARTUP()
Modified: branches/speedy/Step3a1.form
==============================================================================
--- branches/speedy/Step3a1.form (original)
+++ branches/speedy/Step3a1.form Wed Feb 11 14:32:23 2009
@@ -17,4 +17,44 @@
Expand = True
}
}
+ { HBox1 HBox
+ MoveScaled(1,5,6,1)
+ Expand = True
+ }
+ { TLwARNING TextLabel
+ MoveScaled(1,8,35,4)
+ Expand = True
+ Text = ("TextLabel1")
+ Alignment = Align.Normal
+ }
+ { HBox2 HBox
+ MoveScaled(1,12,6,3)
+ Expand = True
+ { Separator2 Separator
+ MoveScaled(1,1,3,1)
+ Expand = True
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,15,65,23)
+ Expand = True
+ }
+ { rb RadioButton
+ MoveScaled(4,39,12,2)
+ Visible = False
+ Text = ("RadioButton1")
+ }
+ { hb HBox
+ MoveScaled(18,40,7,2)
+ Visible = False
+ }
+ { pn Panel
+ MoveScaled(28,41,5,2)
+ Visible = False
+ }
+ { tl TextLabel
+ MoveScaled(38,41,9,2)
+ Visible = False
+ Text = ("TextLabel1")
+ }
}
Added: branches/speedy/Step3a1a.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1a.class Wed Feb 11 14:32:23 2009
@@ -0,0 +1,106 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PRIVATE hproc AS Process
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Create Linux Partition Scheme in") &
Space(1) & ClsGlobal.sFullDiscToWipe & "</h2>"
+
+
+
+END
+
+PUBLIC SUB DESTROY_CURRENT_DATA()
+
+ DIM sDrive AS String = Trim(ClsGlobal.sFullDiscToWipe)
+ DIM sPartitions, sPart AS String
+ DIM sPartList AS String[]
+ DIM i AS Integer
+
+ PRINT " --\\\\-- Selected target : " & sDrive
+ 'SHELL "parted " & sDrive & " print | grep \"^ [0-9]\" | tr -s \'
\',\"\" | cut -f 1-2 -d \"\"" TO sPartitions
+ SHELL "parted " & sDrive & " print | grep \"^ [0-9]\" | tr -s \'
\',\"\" | cut -f 1-2 -d \' \'" TO sPartitions
+ sPartitions = Trim(sPartitions)
+
+ IF NOT sPartitions THEN
+ PRINT " --\\__ Target device is empty (no partitions found) "
+ RETURN
+ END IF
+ sPartList = Split(sPartitions, "\n")
+ FOR i = 0 TO sPartList.Max
+ sPart = Trim(sPartList[i])
+ ' remove this partition
+ PRINT " \\__- Deleting partition " & sPart
+ hproc = SHELL "parted " & sDrive & " rm " & sPart & "
1>/dev/null " WAIT
+ IF hproc.Value > 0 THEN
+ Message.Error(("There has been an error deleting") &
Space(1) & sDrive & sPart & "." & "<br>" &
+ ("Please make sure the drive or partition is not being
used by some other program"))
+ 'BREAK
+ PRINT " \\- FAILED!"
+ RETURN
+ END IF
+
+ PRINT " \\- Done"
+ NEXT
+
+END
+
+
+PUBLIC SUB CREATE_NEW_PARTITIONS()
+
+ DIM lRunningSwap, lNeededSwap, lTotalRAM AS Long
+ DIM sDump AS String
+
+ ' First determine how much swap we need
+ SHELL "free | grep \"^Swap\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
+ sDump = Trim(sDump)
+ Message("Total RAM " & sDump)
+
+
+END
+
+
+
+PUBLIC SUB StartUp()
+
+ SELECT CASE Message.Warning("<b>" & ("WARNING:") & "</b>" & Space(1) &
("All existing data in") & Space(1) & ClsGlobal.sFullDiscToWipe & Space(1)
& ("is about to be deleted.") & "<br>" &
+ ("This step cannot be undone. Are you sure you want to continue?"),
("Yes"), ("No"))
+ CASE 1
+ 'Message("Yes")
+ ME.tlWarning.Text = ("Preparing hard disk for new partitioning
structure. Please wait")
+ ME.DESTROY_CURRENT_DATA()
+ ME.CREATE_NEW_PARTITIONS()
+ CASE 2
+ 'Message("No")
+ ME.tlWarning.Text = ("Operation cancelled by user. No changes have
been made to the system")
+ END SELECT
+
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+
+
+END
Added: branches/speedy/Step3a1a.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1a.form Wed Feb 11 14:32:23 2009
@@ -0,0 +1,36 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,72,45)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(2,5,5,1)
+ Expand = True
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,6,69,36)
+ { tlWarning TextLabel
+ MoveScaled(1,1,12,3)
+ Expand = True
+ Text = ("")
+ }
+ { MovieBox1 MovieBox
+ MoveScaled(19,7,25,19)
+ Expand = True
+ }
+ }
+}
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Wed Feb 11 14:32:23 2009
@@ -182,7 +182,9 @@
DIM sDrive, sPartedRes, sFreeStart, sFreeEnd, sFreeSize, sDump AS String
DIM sOutLine, sDumparr AS String[]
DIM lFreeKB, lFreeStart, lFreeEnd AS Long
-
+ DIM sRootPart, sSwapPart AS String
+
+
ME.HPanel3.Visible = FALSE
ME.HPanel4.Visible = TRUE
ME.MovieBox1.Playing = TRUE
@@ -224,15 +226,18 @@
'Message(sDump)
sDump = Trim(sDump)
IF NOT sDump THEN 'The entire disc IS not
partitioned. 'Message("No partitions found ont his disk")
+ iLastPartNo = 0
' create new partitions on raw space.
' root:# parted /dev/hda --script "mkpartfs primary
linux-swap -512kb -1kb" ' SAMPLE PARTED LINE
SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
reiserfs 0kb -" & lNeededSwap & "kb\"" WAIT ' partition 1
'WAIT 1
SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
linux-swap -" & lNeededSwap & "kb -1kb\"" WAIT ' partition 2
- SHELL "mkswap " & Trim(sDrive) & 2 WAIT ' make the swap
partition
- EXEC ["swapon", Trim(sDrive) & 2] WAIT
+ SHELL "mkswap " & Trim(sDrive) & (iLastPartNo + 2) WAIT '
make the swap partition
+ EXEC ["swapon", Trim(sDrive) & (iLastPartNo + 2)] WAIT
+ sRootPart = Trim(sdrive) & (iLastPartNo + 1)
+ sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
' Ready to start setting defined target partitions.
'###################################################################################################################
@@ -261,6 +266,10 @@
PRINT " --- Created swap partition " &
Trim(sdrive) & (iLastPartNo + 2)
SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +
2) WAIT
SHELL "swapon " & Trim(sdrive) & (iLastPartNo +
2) WAIT
+
+ sRootPart = Trim(sdrive) & (iLastPartNo + 1)
+ sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
+
ELSE ' this method skips one number I think
' BEGIN BY CREATING AN EXTENDED PARTITION TO HOLD
LOGICAL PARTITIONS IN IT
' THIS WILL ADD 1 TO THE iLastPartition number
@@ -292,6 +301,8 @@
sFreeEnd = sOutLine[1]
sFreeSize = sOutLine[2]
SHELL "parted " & Trim(sdrive) & " mkpart
logical linux-swap " & sFreeStart & " " & sFreeEnd WAIT
+
+
' ^^^^^^^^ IN CASE THE ABOVE LINE DOESN'T
WORK, THE FOLLOWING CODE MAY BE USED TO PERFORM THE SAME OPERATION
^^^^^^^^^^
' ' ' ' ' sDump = "#!/bin/bash \n" &
@@ -301,6 +312,8 @@
' ' ' ' ' "EOF"
' ' ' ' ' File.Save("/tmp/swapmaker", sDump)
' ' ' ' ' SHELL "sh /tmp/swapmaker" WAIT
+ sRootPart = Trim(sdrive) & (iLastPartNo + 2)
+ sRootPart = Trim(sdrive) & (iLastPartNo + 3)
END IF
END IF
@@ -308,6 +321,14 @@
ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
ME.MovieBox1.Playing = FALSE
+
+ ' set the flaf for partition reading
+ ClsGlobal.bAutoPartition = TRUE
+ ClsGlobal.sTargetRoot = sRootPart
+ ClsGlobal.sTargetSwap = sSwapPart
+
+
+
END
@@ -321,6 +342,18 @@
PUBLIC SUB STARTUP()
'ME.LIST_FREE_SPACE()
+ DIM i AS Integer
+ FOR EACH RadioButton1 IN objTargetOptions
+ IF RadioButton1.Enabled = TRUE THEN INC i
+ NEXT
+
+ IF i < 1 THEN
+ Message.Error(("We are unable to find any hard disks with enough
unpartitioned space for this operation.") & "<br>" &
+ ("Please consider using another partitioning method."))
+
+ ME.tlSelAutoTarget.Text = ("Unable to find any hard drives with enough
unpartitioned space. Please go back and select another partitioning
method")
+ END IF
+
END
Added: branches/speedy/Step3a3.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a3.class Wed Feb 11 14:32:23 2009
@@ -0,0 +1,93 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+
+PRIVATE sMountedList AS String
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Claim free space from existing
partitions") & "</h2>"
+ ME.DISPLAY_RESIZABLE_PARTITIONS()
+
+END
+
+PUBLIC SUB DISPLAY_RESIZABLE_PARTITIONS()
+
+ DIM sDump, sPreMountList, sDfDump, sDrives, sPartition, sPartShort AS
String
+ DIM sResults, sDumparr AS String[]
+ DIM i, n AS Integer
+
+ SHELL "df -Th | grep \"/dev\" | tr -s \' \',\"\"" TO sPreMountList
+ 'Message(sPreMountList)
+ SHELL "probepart | grep \"^/dev\" | tr -s \' \',\"\" | cut -f 1 -d \'
\'" TO sDump
+ sDump = Trim(sDump)
+ sDumparr = Split(sDump, "\n")
+ FOR i = 0 TO sDumparr.Max
+ sPartition = Trim(sDumparr[i])
+ sPartShort = Right(sPartition, Len(sPartition) -
RInStr(sPartition, "/"))
+ 'Message(sPartShort)
+ sMountedList = sMountedList & sPartition & " "
+ IF InStr(sMountedList, sPartition) = FALSE THEN
+ SHELL "mkdir -p /mnt" &/ sPartShort & " 2> /dev/null" WAIT
+ SHELL "mount -o ro " & sPartition & Space(1) & "/mnt" &/
sPartShort & " 2> /dev/null" WAIT
+ END IF
+
+ NEXT
+
+ ' now that they're all mounted, get the free space on each one of
them
+ SHELL "df -Th | grep \"^/dev\" | tr -s \' \',\"\"" TO sDfDump
+ 'Message(sMountedList)
+ sDfDump = Trim(sDfDump)
+ Message(sDfDump)
+
+ FOR i = 0 TO sDumparr.Max
+ sPartition = Trim(sDumparr[i])
+ sPartShort = Right(sPartition, Len(sPartition) -
RInStr(sPartition, "/"))
+ IF sPartition <> ClsGlobal.sSourceAddr THEN
+ SHELL "umount -f /mnt" &/ sPartShort & " 2> /dev/null" WAIT
+ END IF
+ NEXT
+
+
+
+
+ ' Filesystem Type Size Used Avail Use% Mounted on
+
+
+
+
+
+END
+
+
+
+
+
+PUBLIC FUNCTION GetNExt() AS String
+
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
Added: branches/speedy/Step3a3.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a3.form Wed Feb 11 14:32:23 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,75,51)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
|
