|
From: <cod...@go...> - 2009-02-11 16:57:09
|
Author: M0...@gm...
Date: Wed Feb 11 08:56:22 2009
New Revision: 490
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/Step3.form
branches/speedy/Step3a.class
branches/speedy/Step3a.form
Log:
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 11 08:56:22 2009
@@ -242,7 +242,7 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:102
+#: Step3.class:132 Step3a.class:108
msgid "TextLabel1"
msgstr ""
@@ -252,8 +252,8 @@
#: Step3.class:160
msgid ""
-"Automatically resize your partitions to make size for your VectorLinux "
-"installation"
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
msgstr ""
#: Step3.class:167
@@ -289,18 +289,33 @@
msgstr ""
#: Step3a.class:24
-msgid "Locate free space on hard disk and install VectorLinux there."
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
msgstr ""
#: Step3a.class:24
-msgid "This option will not erase any data off your hard drive"
+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:119
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:113
-msgid "Use Free space on my hard disk"
+#: Step3a.class:140
+msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:134
+#: Step3a.class:161
msgid "Use entire disk"
msgstr ""
@@ -356,11 +371,11 @@
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:361
+#: Step3a2.class:309
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:474
+#: Step3a2.class:422
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Wed Feb 11 08:56:22 2009
@@ -31,7 +31,7 @@
msgstr ""
#: Step3.class:160
-msgid "Automatically resize your partitions to make size for your
VectorLinux installation"
+msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
msgstr ""
#: Step3.class:167
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Wed Feb 11 08:56:22 2009
@@ -31,22 +31,34 @@
msgstr ""
#: Step3a.class:24
-msgid "Locate free space on hard disk and install VectorLinux there."
+msgid "Locate free (unpartitioned) space on hard disk and install
VectorLinux there."
msgstr ""
#: Step3a.class:24
-msgid "This option will not erase any data off your hard drive"
+msgid "This option will not harm any data on your hard drive"
msgstr ""
-#: Step3a.class:102
+#: 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:108
msgid "TextLabel1"
msgstr ""
-#: Step3a.class:113
-msgid "Use Free space on my hard disk"
+#: Step3a.class:119
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:140
+msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:134
+#: Step3a.class:161
msgid "Use entire disk"
msgstr ""
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Wed Feb 11 08:56:22 2009
@@ -58,11 +58,11 @@
msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:361
+#: Step3a2.class:309
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:474
+#: Step3a2.class:422
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/Step3.form
==============================================================================
--- branches/speedy/Step3.form (original)
+++ branches/speedy/Step3.form Wed Feb 11 08:56:22 2009
@@ -50,7 +50,7 @@
{ tlautopart TextLabel
MoveScaled(4,6,55,4)
Expand = True
- Text = ("Automatically resize your partitions to make size for your
VectorLinux installation")
+ Text = ("Automatically resize your partitions and / or create the
correct disk space for VectorLinux.")
}
{ rbCustomPart RadioButton rbGroup
Name = "rbCustomPart"
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Wed Feb 11 08:56:22 2009
@@ -20,8 +20,10 @@
ME.tlActionExp.Text = ("Select one of the following options")
ME.tlEntireDisc.Text = ("Allow VectorLinux to use an entire hard disk in
your system.") & "<br>" &
"<b>" & ("This option will wipe out any data on the disk you select.")
& "</b>"
- ME.tlFreeSpace.Text = ("Locate free space on hard disk and install
VectorLinux there.") & "<br>" &
- "<i>" & ("This option will not erase any data off your hard drive")
& "</i>"
+ ME.tlFreeSpace.Text = ("Locate free (unpartitioned) space on hard disk
and install VectorLinux there.") & "<br>" &
+ "<i>" & ("This option will not harm any data on your hard drive")
& "</i>"
+ ME.tlFreeSpace2.Text = ("Resize your existing partitions to make room
for a VectorLinux partition scheme") & "<br>" &
+ "<i>" & ("This option will not harm any existing data on your hard
drive") & "</i>"
END
@@ -41,8 +43,8 @@
PUBLIC FUNCTION GetNext() AS String
IF ME.rbEntireDisk.Value = TRUE THEN
- RETURN "Step3a1"
- ELSE
+ RETURN "Step3a1"
+ ELSE IF ME.rbunpartitioned THEN
RETURN "Step3a2"
END IF
Modified: branches/speedy/Step3a.form
==============================================================================
--- branches/speedy/Step3a.form (original)
+++ branches/speedy/Step3a.form Wed Feb 11 08:56:22 2009
@@ -27,12 +27,12 @@
}
}
{ HPanel2 HPanel
- MoveScaled(1,13,79,20)
+ MoveScaled(1,13,79,32)
Expand = True
- { rbFreeSpace RadioButton
+ { rbunpartitioned RadioButton
MoveScaled(1,1,22,3)
Expand = True
- Text = ("Use Free space on my hard disk")
+ Text = ("Use unpartitioned space on my hard disk (creates new
partitions)")
}
{ Panel2 Panel
MoveScaled(2,4,3,3)
@@ -46,16 +46,33 @@
MoveScaled(1,6,6,2)
Expand = True
}
+ { rbResizeParts RadioButton
+ MoveScaled(1,8,56,3)
+ Expand = True
+ Text = ("Use free space on existing partitions for VectorLinux")
+ }
+ { Panel3 Panel
+ MoveScaled(2,11,3,3)
+ }
+ { tlFreeSpace2 TextLabel
+ MoveScaled(5,11,19,4)
+ Expand = True
+ Text = ("")
+ }
+ { HBox3 HBox
+ MoveScaled(1,14,6,2)
+ Expand = True
+ }
{ rbEntireDisk RadioButton
- MoveScaled(2,9,34,3)
+ MoveScaled(2,17,34,3)
Expand = True
Text = ("Use entire disk")
}
{ Panel1 Panel
- MoveScaled(2,12,3,3)
+ MoveScaled(2,20,3,3)
}
{ tlEntireDisc TextLabel
- MoveScaled(6,12,32,4)
+ MoveScaled(6,20,32,4)
Expand = True
Text = ("")
}
|