Menu
▾
▴
vectorlinux-devel — Vector Linux developer's list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(40) |
Apr
(76) |
May
(31) |
Jun
(39) |
Jul
(44) |
Aug
(87) |
Sep
(32) |
Oct
(23) |
Nov
(36) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(49) |
Sep
(14) |
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(63) |
Aug
(95) |
Sep
(39) |
Oct
(61) |
Nov
(75) |
Dec
(118) |
| 2009 |
Jan
(25) |
Feb
(37) |
Mar
(20) |
Apr
(15) |
May
(14) |
Jun
(48) |
Jul
(82) |
Aug
(160) |
Sep
(94) |
Oct
(55) |
Nov
(59) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(17) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <cod...@go...> - 2008-10-10 20:42:23
|
Author: m0e.lnx
Date: Fri Oct 10 13:41:14 2008
New Revision: 222
Modified:
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FrmRootPass.class
branches/iVL/FrmUserAdd.class
branches/iVL/installer.gambas
Log:
- Added binded mount of /sys, /dev, /proc, /tmp to target dir to allow
password changing / setting of root
and user passwords
- Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Oct 10 13:41:14 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.104
+Version=0.0.105
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Fri Oct 10 13:41:14 2008
@@ -1,5 +1,3 @@
-- Fixed object position issues on LIlo config window and optimized it for
800x600 resolution
-- Implemented keyboard shortcuts for language selection window
-- Fixed problem in full install procedure (some packages (optional) were
getting ommitted)
-- Fixed object position / resizing issue with User add form.
-- Updated Binary
\ No newline at end of file
+- Added binded mount of /sys, /dev, /proc, /tmp to target dir to allow
password changing / setting of root
+ and user passwords
+- Updated binary
\ No newline at end of file
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Fri Oct 10 13:41:14 2008
@@ -35,6 +35,11 @@
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
'Message("chroot /mnt/target /sbin/passwdx root " &
ME.tbPasswd1.Text)
+ ' bind mounting necessary here
+ SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
+ SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc"
WAIT
+ SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+ SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
SHELL "chroot /mnt/target /sbin/passwdx root " & ME.tbPasswd1.Text
WAIT
'Message("Root password Set.")
ME.tbPasswd1.Clear
@@ -46,6 +51,10 @@
ME.tbPasswd1.SetFocus
ENDIF
ENDIF
+ SHELL "umount " & ClsGlobal.sTargetMnt &/ "sys" WAIT
+ SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
+ SHELL "umount " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+ SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Fri Oct 10 13:41:14 2008
@@ -121,6 +121,12 @@
+ ' need to do some binding for this to work
+ SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys"
WAIT
+ SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp"
WAIT
+ SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc"
WAIT
+ SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev"
WAIT
+
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text & " &> /dev/null" WAIT
'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
SHELL "chroot /mnt/target /usr/sbin/groupadd " &
ME.tbUsername.Text & " &> /dev/null" WAIT
@@ -146,8 +152,20 @@
ENDIF
SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
- Message("Vectorlinux has been installed click OK to reboot")
- 'SHELL "reboot"
+ SHELL "umount " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+ SHELL "umount " & ClsGlobal.sTargetMnt &/ "sys" WAIT
+
+ SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has been
installed on your computer.") & "<br>" &
+ ("Would you like to reboot your computer now?"), ("Yes"), ("No"))
+ CASE 1
+ SHELL "shutdown -r now"
+ CASE ELSE
+ RETURN
+ 'STOP EVENT
+ END SELECT
+
+
+
END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-10 20:20:18
|
Author: m0e.lnx
Date: Fri Oct 10 13:18:39 2008
New Revision: 221
Modified:
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FrmLangSel.class
branches/iVL/FrmLilo.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmSelISO.class
branches/iVL/FrmSelISO.form
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlUsrAdd.module
branches/iVL/installer.gambas
Log:
- Fixed object position issues on LIlo config window and optimized it for
800x600 resolution
- Implemented keyboard shortcuts for language selection window
- Fixed problem in full install procedure (some packages (optional) were
getting ommitted)
- Fixed object position / resizing issue with User add form.
- Updated Binary
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Fri Oct 10 13:18:39 2008
@@ -14,39 +14,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartScheme.class:59
+#: FrmPartScheme.class:61
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:59
+#: FrmPartScheme.class:61
msgid "This option will overwrite any existing data in the selected
partitions"
msgstr ""
-#: FrmPartScheme.class:59
+#: FrmPartScheme.class:61
msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
msgstr ""
-#: FrmPartScheme.class:68
+#: FrmPartScheme.class:70
msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
msgstr ""
-#: FrmPartScheme.class:68
+#: FrmPartScheme.class:70
msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
msgstr ""
-#: FrmPartScheme.class:110
+#: FrmPartScheme.class:112
msgid "Disk Partitioning Options"
msgstr ""
-#: FrmPartScheme.class:115
+#: FrmPartScheme.class:117
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:120
+#: FrmPartScheme.class:122
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:125
+#: FrmPartScheme.class:127
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Oct 10 13:18:39 2008
@@ -34,19 +34,19 @@
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:232
+#: FrmSelISO.class:236
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:238
+#: FrmSelISO.class:242
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:243
+#: FrmSelISO.class:247
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:248
+#: FrmSelISO.class:252
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Oct 10 13:18:39 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.103
+Version=0.0.104
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Fri Oct 10 13:18:39 2008
@@ -1,4 +1,5 @@
-- Implemented keyboard shortcuts for zoneset list
-- Some fixes to the Install window (stalls for a second before the process
begins, objects are out of place
- as the form loads, but then snap into place when the install begins
-
\ No newline at end of file
+- Fixed object position issues on LIlo config window and optimized it for
800x600 resolution
+- Implemented keyboard shortcuts for language selection window
+- Fixed problem in full install procedure (some packages (optional) were
getting ommitted)
+- Fixed object position / resizing issue with User add form.
+- Updated Binary
\ No newline at end of file
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Fri Oct 10 13:18:39 2008
@@ -56,9 +56,21 @@
END
-PUBLIC SUB lbLangSel_KeyRelease()
-
-
+
+PUBLIC SUB lbLangSel_KeyPress()
+
+ DIM i AS Integer
+ IF Key.text > "z" OR Key.text < " " THEN RETURN
+ i = LAST.index
+ DO
+ INC i
+ IF i > LAST.count - 1 THEN i = 0
+ IF i = LAST.index THEN RETURN
+ IF LAST[i].text LIKE Key.Text & "*" THEN
+ LAST.index = i
+ RETURN
+ END IF
+ LOOP
END
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Oct 10 13:18:39 2008
@@ -83,6 +83,8 @@
PUBLIC SUB Form_Resize()
DIM cbleft, cbwidth AS Integer
+ DIM tb AS TextBox
+ DIM tl AS TextLabel
WITH ME
.tlTarGet.Alignment = Align.Normal
@@ -107,9 +109,18 @@
.tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height +
12, .tlBanner.Width)
- .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height
* 8))
+ '.TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height
* 8))
+ .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.TabStrip1.top) -
(.YNLiloBox.Height * 10))
+ '.TabStrip1.Move(4, .tlList.top + .tlList.Height + 8, .ClientWidth -
(.TabStrip1.Left * 2), .ClientHeight - (.TabStrip1.top + (.YNLiloBox.height
* 3)))
END WITH
+ FOR EACH tb IN MdlLiloOsList.txtAppends
+ FOR EACH tl IN MdlLiloOsList.tlappends
+ IF tb.tag = tl.tag THEN
+ tb.Move(tl.left + tl.Width + 4, tl.top, ME.TabStrip1.Width -
tb.left - 8)
+ END IF
+ NEXT
+ NEXT
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Fri Oct 10 13:18:39 2008
@@ -25,7 +25,9 @@
.hrsep.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height -
(.hrsep.Height), .tlBanner.Width)
.rbUseExisting.Move(.tlBanner.Left, .tlBanner.Top + .tlBanner.Height +
8)
.rbEditPartitions.Move(.rbUseExisting.Left, .rbUseExisting.Top
+ .rbUseExisting.Height + 4)
- .tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top
+ .rbEditPartitions.Height * 4, .tlBanner.Width - 10)
+ .tlChoiceExp.MOVE(4, .rbEditPartitions.top + .rbEditPartitions.Height
+ 8, .ClientWidth - (.tlChoiceExp.Left * 2), .ClientHeight
- .tlChoiceExp.top - .rbEditPartitions.height)
+
+ '.tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top
+ .rbEditPartitions.Height * 4, .tlBanner.Width - 10)
END WITH
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Fri Oct 10 13:18:39 2008
@@ -175,13 +175,17 @@
WITH ME
'.Reparent(.Parent)
'.Resize(.Parent.Width, .Parent.Height)
-
+ .btResCan.Width = MdlObjSizer.get_object_width(.btResCan.text) + 36
' .btNext.Move(.Left + .Width - .btNext.Width - 8, .top + ME.Height
- .btNext.Height - 8)
.tlBanner.Move(4, 8, MdlObjSizer.get_object_width(.tlBanner.text))
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height
- .hrSep.Height, .ClientWidth - (.hrSep.x * 2))
- .btResCan.Move(.Left + .Width - .btResCan.Width - 8, .top
+ .tlBanner.Height + 48, MdlObjSizer.get_object_width(.btResCan.text) + 36)
- .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width -
(.btResCan.Width + 24), 21)
- .tlDistroDesc.Move(.lstInstallableImg.Left * 2, .lstInstallableImg.top
+ .lstInstallableImg.Height + 48)
+ .btResCan.Move(.ClientWidth - (.btResCan.Width + 4), .hrSep.top
+ .hrSep.Height + 24) ', MdlObjSizer.get_object_width(.btResCan.text) + 36)
+ .lstInstallableImg.Move(4, .btResCan.top, .btResCan.Left -
(.lstInstallableImg.left * 2))
+ '.btResCan.Move(.Left + .Width - .btResCan.Width - 8, .top
+ .tlBanner.Height + 48, MdlObjSizer.get_object_width(.btResCan.text) + 36)
+ '.lstInstallableImg.Move(4, .btResCan.top, .ClientWidth -
((.lstInstallableImg.Left * 2) + .btResCan.Left))
+ ' .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width -
(.btResCan.Width + 24), 21)
+ '.tlDistroDesc.Move(.lstInstallableImg.Left *
2, .lstInstallableImg.top + .lstInstallableImg.Height + 48)
+ .tlDistroDesc.Move(4, .lstInstallableImg.top
+ .lstInstallableImg.Height + 24, .ClientWidth - (.tlDistroDesc.left *
2), .ClientHeight - (.tldistrodesc.top + .btrescan.height))
'.FullScreen = TRUE
END WITH
Modified: branches/iVL/FrmSelISO.form
==============================================================================
--- branches/iVL/FrmSelISO.form (original)
+++ branches/iVL/FrmSelISO.form Fri Oct 10 13:18:39 2008
@@ -5,7 +5,7 @@
Text = ("")
FullScreen = True
{ lstInstallableImg ComboBox
- MoveScaled(1,10,45,3.1429)
+ MoveScaled(1,10,45,3)
Text = ("No installable images found.")
ReadOnly = True
}
@@ -14,11 +14,11 @@
Text = ("Select which VectorLinux version you wish to install from the
list below")
}
{ tlDistroDesc TextLabel
- MoveScaled(1,16,60,22)
+ MoveScaled(1,16,60,23)
Text = ("TextLabel1")
}
{ btResCan Button
- MoveScaled(49,10,13,3.1429)
+ MoveScaled(49,10,13,3)
Text = ("Search Again")
Picture = Picture["icon:/16/refresh"]
}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Fri Oct 10 13:18:39 2008
@@ -19,6 +19,10 @@
PUBLIC iUID AS Integer = 1000
+PRIVATE otl AS Object[]
+PRIVATE otb AS Object[]
+
+
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
@@ -34,7 +38,22 @@
.btBrowse.Visible = FALSE
END WITH
'WAIT 3
-
+ otl = NEW Object[]
+ otb = NEW Object[]
+ WITH otl
+ .Add(ME.TextLabel2)
+ .Add(ME.tlRealName)
+ .Add(ME.TextLabel3)
+ .Add(ME.TextLabel4)
+ '.Add(ME.tlRealName)
+ END WITH
+ WITH otb
+ .Add(ME.tbPasswd1)
+ .Add(ME.tbPasswd2)
+ .Add(ME.tbRealname)
+ .Add(ME.tbUsername)
+ END WITH
+
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
END
@@ -135,44 +154,98 @@
PUBLIC SUB Form_Resize()
DIM iboxleft AS Integer
- DIM iboxwidth AS Integer
-
+ DIM iboxwidth AS Integer = 250
+ DIM cb AS CheckBox
+ DIM icbspace AS Integer
+ DIM icby AS Integer
+ DIM tl AS TextLabel
+ DIM tb AS TextBox
+ DIM itltop, itlbottom AS Integer
+ 'iboxleft = 0
+
+ itltop = tlExp.top + tlExp.Height + 8
+
+ FOR EACH tl IN otl
+ tl.Move(4, itltop, MdlObjSizer.get_object_width(tl.text))
+ IF tl.Width > iboxleft THEN iboxleft = tl.Left + tl.Width + 8
+ itltop = itltop + tl.Height + 4
+ 'itlbottom = itltop + tl.Height + 4
+ NEXT
+ FOR EACH tl IN otl
+ FOR EACH tb IN otb
+ IF tb.tag = tl.tag THEN tb.Move(iboxleft, tl.top, iboxwidth)
+ NEXT
+ NEXT
+
+ FOR EACH tb IN otb
+ IF tb.tag = "line4" THEN itlbottom = tl.top + tl.Height + 8
+ NEXT
+
WITH ME
.tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
.tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width)
- .TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2.5)
- .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.25)
+
- iboxleft = .tbUsername.Left
- iboxwidth = .tbUsername.Width
- .tlRealName.Move(4, .TextLabel2.top + .TextLabel2.Height +
2, .TextLabel2.Width)
- .tbRealname.Move(iboxleft, .tlRealName.top, iboxwidth)
- .TextLabel3.Move(4, .tlRealName.top + .tlRealName.Height +
2, .TextLabel2.Width)
- .tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth)
- .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height + 2,
MdlObjSizer.get_object_width(.TextLabel4.text))
- .tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth)
- '.tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
2, .TextLabel2.Width)
- '.cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
- '.tbUsrID.Move(.cbUserID.Left + .cbUserID.Width + 4, .cbUserID.top,
iboxwidth - (.cbUserID.Width + 4))
- .bUsePic.Move(4, .tbPasswd2.top + .tbPasswd2.Height + 4,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
- '.tbPicPath.Move(4,.tb
- '.bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 8,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
+ .bUsePic.Move(4, itlbottom,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
+
.tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height +
2, .TextLabel2.Width + iboxwidth + 8)
'.tbPicPath.Move(4, .bUsePic.top + .bUsePic.height +
2, .tlBanner.Width - (.btBrowse.Width + 4))
.btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top,
MdlObjSizer.get_object_width(.btBrowse.text) + 36)
- .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + .Button1.Height))
+ .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + (.Button1.Height)))
.Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8,
MdlObjSizer.get_object_width(.Button1.Text) + 36)
.btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
'.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
+ icby = 4
+ icbspace = 24
+
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ 'icbspace = icbspace + cb.Height + 4
+ IF icbspace >= .fGroupSel.Height * 0.75 THEN
+ icby = icby + 128
+ icbspace = 24
+ END IF
+ cb.Move(icby, icbspace)
+ icbspace = icbspace + cb.Height + 4
+ NEXT
+
+
+
+
+
+
+ ' FOR EACH tl IN otl
+ ' IF tl.width > iboxleft THEN
+ ' iboxleft = tl.Left + tl.Width + 8
+ ' END IF
+ ' NEXT
+
+
+ 'FOR EACH tb IN otb
+
+ ' ' ' FOR EACH cb IN MdlUsrAdd.objGrps
+ ' ' '
+ ' ' ' 'icbspace = icbspace + cb.Width + 4
+ ' ' ' IF icbspace >= .fGroupSel.Width * 0.75 THEN
+ ' ' ' icby = icby + cb.Height * 2
+ ' ' ' icbspace = 4
+ ' ' ' END IF
+ ' ' ' cb.Move(icbspace, icby)
+ ' ' ' icbspace = icbspace + cb.Width + 4
+ ' ' '
+ ' ' ' NEXT
+
+
+
+
- END WITH
+END WITH
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Fri Oct 10 13:18:39 2008
@@ -9,26 +9,26 @@
}
{ tbUsername TextBox
MoveScaled(16,18,15,3)
+ Tag = "line1"
Text = ("")
}
{ tbRealname TextBox
MoveScaled(17,21,15,3)
+ Tag = "line2"
Text = ("")
}
{ tbPasswd1 TextBox
MoveScaled(16,24,16,3)
+ Tag = "line3"
Text = ("")
Password = True
}
{ tbPasswd2 TextBox
MoveScaled(16,27,16,3)
+ Tag = "line4"
Text = ("")
Password = True
}
- { bUsePic CheckBox
- MoveScaled(2,35,45,3)
- Text = ("Use Picture ID for Login greeting")
- }
{ tbPicPath TextBox
MoveScaled(2,39,55,3)
Visible = False
@@ -40,6 +40,10 @@
Text = ("Select")
Picture = Picture["icon:/16/directory"]
}
+ { bUsePic CheckBox
+ MoveScaled(2,35,45,3)
+ Text = ("Use Picture ID for Login greeting")
+ }
{ fGroupSel Frame
MoveScaled(2,44,69,17)
Text = ("User Rights Management")
@@ -61,16 +65,19 @@
}
{ TextLabel2 TextLabel
MoveScaled(2,18,12,3)
+ Tag = "line1"
Text = ("Login Name")
Alignment = Align.Normal
}
{ TextLabel3 TextLabel
MoveScaled(2,24,16,3)
+ Tag = "line3"
Text = ("Enter Password")
Alignment = Align.Normal
}
{ TextLabel4 TextLabel
MoveScaled(2,27,14,3)
+ Tag = "line4"
Text = ("ReEnter Password")
Alignment = Align.Normal
}
@@ -87,6 +94,7 @@
}
{ tlRealName TextLabel
MoveScaled(2,21,12,3)
+ Tag = "line2"
Text = ("Real Name")
Alignment = Align.Normal
}
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Oct 10 13:18:39 2008
@@ -381,6 +381,8 @@
DIM sPkgName AS String
DIM vTargetSize AS Variant
+
+ 'Message("Installing packages")
arrFile = Split(sFile, "\n")
FOR i = 0 TO arrFile.Count - 1
FrmInstallSys.pbInstallProg.Value = 0
@@ -411,7 +413,7 @@
PRINT sPkgName & " failed to install "
RETURN 1
ELSE
- RETURN 0
+ 'RETURN 0
END IF
END IF
FrmInstallSys.pbInstallProg.Value = 1
@@ -424,8 +426,9 @@
PRINT sPkgName & " failed to install "
RETURN 1
ELSE
- RETURN 0
+ 'RETURN 0
END IF
+ 'Message("End Installing Packages")
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Oct 10 13:18:39 2008
@@ -18,6 +18,7 @@
PRIVATE cbarr AS Object[]
PRIVATE sText AS String
PUBLIC txtAppends AS Object[]
+PUBLIC tlappends AS Object[]
PUBLIC txtNames AS Object[]
PUBLIC txtInitrds AS Object[]
PUBLIC iAppendLeft AS Integer
@@ -223,6 +224,7 @@
DIM cbInclude AS CheckBox
DIM tl AS TextLabel
DIM sShortAddr AS String
+ DIM iwidth AS Integer = FrmLilo.TabStrip1.Width
x = 4
y = 4
@@ -231,6 +233,7 @@
txtNames = NEW Object[]
txtInitrds = NEW Object[]
bIncluded = NEW Object[]
+tlappends = NEW Object[]
'FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
@@ -331,6 +334,7 @@
.text = "initrd-" & sShortAddr
END IF
.Visible = FALSE
+ iwidth = .Width
END WITH
ME.txtInitrds.Add(txtAppnd)
@@ -341,16 +345,19 @@
.Height = 27
.Alignment = Align.Normal
.Background = Color.Background
-
+ .tag = arrLinux[i]
ME.iAppendLeft = .x + .Width + 4
END WITH
-
+ tlappends.Add(tl)
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
- .Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25)
-
+ '.Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25)
+ '.Move(iAppendLeft, tl.top, iwidth - iAppendLeft - 4)
+ '.Move(4, tl.top + tl.Height + 4, FrmLilo.TabStrip1.Width
- (.left * 2))
+ '.Move(tl.left + tl.Width + 4, tl.top, tl.Width)
+ .Move(tl.left + tl.Width + 4, tl.top, tl.Width * 0.5)
.Height = 27
.tag = arrLinux[i]
txtAppends.Add(txtAppnd)
@@ -367,7 +374,8 @@
.text = ("Add option to boot this Operating system
into Text mode")
.Width = MdlObjSizer.get_object_width(.text) + 36
.Height = 27
- .Move(4, tl.top + tl.Height + 12)
+ .Move(4, tl.top + tl.Height + 4)
+
.tag = arrLinux[i]
.Background = Color.Background
END WITH
@@ -390,7 +398,6 @@
NEXT
-
END
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Fri Oct 10 13:18:39 2008
@@ -28,10 +28,8 @@
objGrps = NEW Object[]
sGrpArr = Split(sGrpList, ",")
-'try to resize the window because the frame is too narrow
- WITH FrmUserAdd
- .Resize(.Parent.Width, .Parent.Height)
- END WITH
+
+
y = 24
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-09 23:08:41
|
Author: m0e.lnx
Date: Thu Oct 9 14:31:16 2008
New Revision: 220
Removed:
branches/iVL/adduser.gambas
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmZoneSet.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlSetup.module
Log:
- Implemented keyboard shortcuts for zoneset list
- Some fixes to the Install window (stalls for a second before the process
begins, objects are out of place
as the form loads, but then snap into place when the install begins
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/.project
+# /home/remote/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsGlobal.class
+# /home/remote/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsPartSel.class
+# /home/remote/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsWinDrives.class
+# /home/remote/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FMain.class
+# /home/remote/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -34,23 +34,23 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:409
+#: FMain.class:416
msgid "Process Overview"
msgstr ""
-#: FMain.class:429
+#: FMain.class:436
msgid "Next"
msgstr ""
-#: FMain.class:435
+#: FMain.class:442
msgid "Back"
msgstr ""
-#: FMain.class:441
+#: FMain.class:448
msgid "Exit Installation"
msgstr ""
-#: FMain.class:457
+#: FMain.class:464
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmDiskPart.class
+# /home/remote/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmLicense.class
+# /home/remote/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartScheme.class
+# /home/remote/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmPartSel.class
+# /home/remote/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPkgSel.class
+# /home/remote/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSelISO.class
+# /home/remote/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSummary.class
+# /home/remote/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmWinDrives.class
+# /home/remote/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlCore.module
+# /home/remote/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlDiskPart.module
+# /home/remote/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlObjSizer.module
+# /home/remote/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlPartSel.module
+# /home/remote/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPkgSel.module
+# /home/remote/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSetup.module
+# /home/remote/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,11 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:261
+#: MdlSetup.module:247
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:263
+#: MdlSetup.module:249
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSummarize.module
+# /home/remote/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlWinDrives.module
+# /home/remote/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Oct 9 14:31:16 2008
@@ -1,5 +1,4 @@
-- Optimized the following windows for 800x600 resolution (failsafe)
- + Lilo Config window
- + Root Password setting
-- Other acheivements
- + Managed to break the FrmInstallSys window
\ No newline at end of file
+- Implemented keyboard shortcuts for zoneset list
+- Some fixes to the Install window (stalls for a second before the process
begins, objects are out of place
+ as the form loads, but then snap into place when the install begins
+
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Oct 9 14:31:16 2008
@@ -41,7 +41,7 @@
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -75,8 +75,8 @@
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
- '.Width = 800
- '.Height = 600
+ .Width = 800
+ .Height = 600
END WITH
@@ -348,7 +348,14 @@
' IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
ClsGlobal.sBackNav.Add(FrmCurr)
END IF
END IF
- frmNext.Show
+ IF frmNext.name <> "FrmInstallSys" THEN
+ frmNext.Show
+ ELSE
+ frmNext.Show
+ WAIT 1
+ MdlSetup.BEGIN_INSTALLATION()
+ END IF
+
END
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Thu Oct 9 14:31:16 2008
@@ -38,57 +38,27 @@
PUBLIC SUB Form_Open()
-
- ' ' ' DIM iMinFrameH AS Integer
- ' ' ' iMinFrameH = ME.tlCurrPkg.Height + ME.tlCurrPkg2.Height +
ME.tlCurrStepLbl.Height + ME.pbInstallProg2.Height +
ME.tlCurrStepLbl.Height + 36
- ' ' ' WITH ME
- ' ' ' .FrmProg.Move(4, .tlBanner.top + .tlBanner.Height +
8, .ClientWidth - (.FrmProg.Left * 2), iMinFrameH)
- ' ' ' .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
- ' ' ' .hrsep.Move(4, .tlBanner.top + .tlBanner.Height
- .hrsep.Height, .tlBanner.Width)
- ' ' ' '.tlBanner.Border = Border.Plain
- ' ' ' .FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
36), .ClientWidth - (.FrmProg.Left * 2))
- ' ' ' .tlCurrPkg.move(8, 32, .FrmProg.Width - (.tlCurrPkg.Left * 2))
- ' ' ' .tlCurrStepLbl.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 4), MdlObjSizer.get_object_width(.tlCurrStepLbl.Text)
+ 8, 27)
- ' ' ' .pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
- ' ' ' .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
- ' ' ' .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
- ' ' '
- ' ' ' .scrlCredits.Move(.FrmProg.left, .FrmProg.top + FrmProg.Height
+ 24, .FrmProg.Width)
- ' ' '
- ' ' ' .tlCredits.Move(8, 4)
- ' ' ' END WITH
- ' ' '
-
-FMain.FrmCurr = ME
+
+
FMain.FrmCurr = ME
-FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-FMain.tvPlan["Inst1"].Selected = TRUE
+' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
-
-'MdlSetup.RUN_CREDITS
- 'ClsGlobal.sSourceMnt = "/mnt/cdrom"
- 'ME.FrmProg.Text = " Preparing system for installation "
ME.tlCurrStepLbl.Text = ("Current Step")
- 'ME.show_credits
- 'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
- 'ME.tmCredits.Enabled = TRUE
-
-'STOP EVENT
-'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
-'WAIT
-ME.ResizeScaled(ME.Parent.Width, ME.Parent.Height)
-ME.scrlCredits.Border = Border.Sunken
+'ME.ResizeScaled(ME.Parent.Width, ME.Parent.Height)
+'ME.scrlCredits.Border = Border.Sunken
WAIT 1
-Message("Window has been resized")
+'Message("Window has been resized")
'ME.scrlCredits.Border = Border.Plain
WAIT 2
'ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
-MdlSetup.BEGIN_INSTALLATION()
+PRINT "Begin installation process"
+' ' ' MdlSetup.BEGIN_INSTALLATION()
@@ -146,36 +116,6 @@
-PUBLIC SUB tmCredits_Timer()
-
- ' ' ' DIM i AS Integer = ME.FrmProg.left + 20
- ' ' '
- ' ' ' IF ME.tlCredits.x < (i) - (ME.tlCredits.Width) THEN ME.tlCredits.x
= (frmCredits.Width - 12)
- ' ' ' tlCredits.x = frmCredits.left + 4 + (tlCredits.x - 10)
- ' ' '
- ' ' '
-
-
-
-
- DIM X AS Integer
- X = ME.scrlCredits.ScrollX
- REPEAT
- INC ME.scrlCredits.ScrollX
- IF X = ME.scrlCredits.Scrollx THEN
- ME.scrlCredits.scrollx = 0
- ME.tmCredits.Enabled = FALSE
- END IF
- UNTIL tmCredits.Enabled = FALSE
-
-
- '
- ' IF ME.sclCredits.ScrollX < - ME.tlCredits.Width + ME.tlCredits.x THEN
- ' ME.sclCredits.Scrollx = ME.sclCredits.Width
- ' ENDIF
-
-END
-
@@ -184,13 +124,23 @@
WITH ME
.tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.x * 2))
.hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
- .FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientw - (.FrmProg.x * 2), .clienth - (.FrmProg.y
+ .tlBanner.h))
+ '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientwidth - (.FrmProg.left * 2), (.tlBanner.Height *
4))
' items inside the frame
- .tlCurrPkg.Move(8, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
- .tlCurrStepLbl.Move(8, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
- .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
- .tlCurrPkg2.Move(8, .pbInstallProg.top + .pbInstallProg.Height +
4, .ClientW - (.tlCurrPkg2.x * 2))
- .pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
+ .tlCurrPkg.Move(4, .hrsep.top + .hrsep.Height + 48, .hrsep.Width)
+
+ '.tlCurrPkg.Move(4, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+ '.pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
+ .pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width + 4,
tlCurrStepLbl.top, .hrsep.Width - (pbInstallProg.Left))
+ .tlCurrPkg2.Move(4, .pbInstallProg.top + .pbInstallProg.Height + 24,
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
+ '.pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
+ .pbInstallProg2.Move(4, tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .hrsep.Width)
END WITH
+
+END
+
+PUBLIC SUB Form_Activate()
+
+
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Thu Oct 9 14:31:16 2008
@@ -3,7 +3,6 @@
{ Form Form
MoveScaled(0,0,96,74)
Text = ("")
- Maximized = True
{ tlBanner TextLabel
MoveScaled(1,1,63,7)
Text = ("Vectorlinux is currently being installed to your system...
Please wait")
@@ -11,41 +10,23 @@
{ hrsep Separator
MoveScaled(2,8,48,2)
}
- { FrmProg Frame
- MoveScaled(1,11,76,34)
- Text = ("")
- { pbInstallProg2 ProgressBar
- MoveScaled(0,18,44,3)
- }
- { tlCurrPkg2 TextLabel
- MoveScaled(1,14,45,3)
- Text = ("Total progress")
- }
- { pbInstallProg ProgressBar
- MoveScaled(13,10,31,2)
- Label = False
- }
- { tlCurrStepLbl TextLabel
- MoveScaled(1,9,11,3)
- Text = ("Current Step ")
- }
- { tlCurrPkg TextLabel
- MoveScaled(1,0,73,6)
- Text = ("Installing ...")
- }
- }
- { tmCredits #Timer
- #X = 560
- #Y = 77
- Delay = 50
- }
- { scrlCredits ScrollView
- MoveScaled(2,56,84,5)
- Border = False
- ScrollBar = Scroll.None
- { tlCredits TextLabel
- MoveScaled(-2,0,46,3.375)
- Text = ("")
- }
+ { pbInstallProg2 ProgressBar
+ MoveScaled(2,35,44,3)
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(3,31,45,3)
+ Text = ("Total progress")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(15,27,31,2)
+ Label = False
+ }
+ { tlCurrPkg TextLabel
+ MoveScaled(3,17,73,6)
+ Text = ("Installing ...")
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(3,26,11,3)
+ Text = ("Current Step ")
}
}
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Thu Oct 9 14:31:16 2008
@@ -74,3 +74,58 @@
END
+
+PUBLIC SUB lbTmZone_KeyPress()
+
+
+
+ DIM i AS Integer
+
+ 'i = 0
+ IF Key.text > "z" OR Key.text < " " THEN RETURN ' not searchable
+
+ i = lbTmZone.Index
+ DO
+ INC i
+ IF i >= lbTmZone.Count THEN i = 0 'back to top
+ IF i = lbTmZone.Index THEN RETURN ' no other match found
+ IF lbTmZone[i].text LIKE Key.Text & "*" THEN
+ lbTmZone.Index = i
+ RETURN
+ END IF
+ LOOP
+' ' ' ' '
+' ' ' ' '
+' ' ' ' '
+' ' ' ' ' 'Message(lbTmZone[2].text)
+' ' ' ' '
+' ' ' ' ' lbTmZone.Index = 0
+' ' ' ' ' REPEAT
+' ' ' ' ' 'INC lbTmZone.Index
+' ' ' ' '
+' ' ' ' ' IF lbTmZone[lbTmZone.Index].text LIKE Key.Text & "*" THEN
+' ' ' ' '
+' ' ' ' ' 'Message.Info(lbTmZone.text)
+' ' ' ' ' BREAK
+' ' ' ' ' END IF
+' ' ' ' ' INC lbTmZone.Index
+' ' ' ' ' IF lbTmZone.Index = lbTmZone.Count THEN RETURN ' nothing
found
+' ' ' ' ' UNTIL lbTmZone.Index = lbTmZone.Count
+' ' ' ' '
+
+ ' DIM iScan AS Integer
+ ' IF Key.text > "z" OR Key.text < " " THEN RETURN ' not scannable
+ '
+ ' iScan = lbTmZone.Index
+ ' DO
+ ' INC iScan
+ ' IF iScan >= lbTmZone.Count THEN iScan = 0 ' back to top
+ ' IF iScan = lbTmZone.Index THEN RETURN ' went back to were we
started
+ ' IF lbTmZone[iScan].text LIKE Key.text & "*[*]*" THEN ' found
a match
+ ' lbTmZone.Index = iScan
+ ' END IF
+ ' RETURN
+ ' LOOP
+
+
+END
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Oct 9 14:31:16 2008
@@ -28,6 +28,7 @@
PUBLIC SUB PERFORM_CUSTOM_INSTALL()
DIM iRet AS Integer = 0
+
WITH FMain
.tvPlan["Inst1"].Selected = TRUE
.tvPlan["Inst1"].Picture = MdlCore.sNowPic
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Oct 9 14:31:16 2008
@@ -72,7 +72,7 @@
'MdlSetup.RUN_CREDITS() ' Begin scrolling credits
IF ClsPkgSel.bCustom = TRUE THEN
- MdlInstallCustom.PERFORM_CUSTOM_INSTALL
+ MdlInstallCustom.PERFORM_CUSTOM_INSTALL()
ELSE
MdlInstallSys.PERFORM_FULL_INSTALL()
END IF
@@ -861,6 +861,6 @@
PUBLIC SUB process_error(msg AS String)
- sErr = sErr & gb.NewLine & sErr
+' sErr = sErr & gb.NewLine & sErr
PRINT MSG
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Oct 9 14:31:16 2008
@@ -223,6 +223,7 @@
DIM cbInclude AS CheckBox
DIM tl AS TextLabel
DIM sShortAddr AS String
+
x = 4
y = 4
@@ -348,7 +349,7 @@
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
- .Move(tl.Left + tl.Width + 8, tl.top,
FrmLilo.TabStrip1.Width - (tl.Width * 1.5))
+ .Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25)
.Height = 27
.tag = arrLinux[i]
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Thu Oct 9 14:31:16 2008
@@ -80,25 +80,7 @@
CASE "swap"
sCommand = "mkswap -L swap-space " & sAddr
END SELECT
-
- ' fix the form
-
- iMinFrameH = FrmInstallSys.tlCurrPkg.Height +
FrmInstallSys.tlCurrPkg2.Height + frminstallsys.tlCurrStepLbl.Height +
FrmInstallSys.pbInstallProg2.Height + FrmInstallSys.tlCurrStepLbl.Height +
36
- WITH FrmInstallSys
- .FrmProg.Move(4, .tlBanner.top + .tlBanner.Height + 8, .ClientWidth
- (.FrmProg.Left * 2), iMinFrameH)
- .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
- '.tlBanner.Border = Border.Plain
- .FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
8), .ClientWidth - (.FrmProg.Left * 2))
- .tlCurrPkg.move(8, 32, .FrmProg.Width - (.tlCurrPkg.Left * 2))
- .tlCurrStepLbl.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 4), MdlObjSizer.get_object_width(.tlCurrStepLbl.Text)
+ 8, 27)
- .pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
- .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
- .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
-
- '.pbInstallProg.Move(.tlCurrStepLbl.Left + (.tlCurrStepLbl.Width +
2), .FrmProg.Width - (.tlCurrStepLbl.Width + (.tlCurrStepLbl.left * 2))) '
- '.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 2), .tlCurrPkg.Width)
-
- END WITH
+
PRINT "Formatting " & sAddr & " to " & sFS
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Oct 9 14:31:16 2008
@@ -241,21 +241,7 @@
END
PUBLIC SUB BEGIN_INSTALLATION()
-
-
- WITH FrmInstallSys
- .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
- .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
- .frmProg.Move(4, .hrsep.top + .hrsep.Height + (.tlBanner.Height *
2), .ClientWidth - (.frmProg.left * 2), .ClientHeight - (.frmProg.top *
2)) '- .tlBanner.Height))
- .tlCurrPkg.Move(4, 24, .frmProg.Width - (.tlCurrPkg.left * 2))
- .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 8,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
- .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .frmProg.Width - (.pbInstallProg.Left +
(.tlCurrStepLbl.left * 2)))
- .tlCurrPkg2.Move(4, .tlCurrStepLbl.Top + (.tlCurrStepLbl.Height * 2),
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
- .pbInstallProg2.Move(.tlCurrPkg2.left + .tlCurrPkg2.Width +
8, .tlCurrPkg2.top, .frmProg.Width - (.pbInstallProg2.left +
(.tlCurrPkg2.left * 2)))
- '.pbInstallProg2.Move(4, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .frmProg.Width - (.pbInstallProg2.left * 2))
- END WITH
-
MdlCore.LOCK_GUI()
FrmInstallSys.tlCurrPkg.text = ("Activating swap space")
|
|
From: <cod...@go...> - 2008-10-09 15:47:11
|
Author: rbistolfi
Date: Thu Oct 9 08:45:53 2008
New Revision: 219
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/en_US.po
branches/iVL/.lang/es.mo
branches/iVL/.lang/es.po
Log:
es translation update
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Oct 9 08:45:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FMain.class
+# /home/rbistolfi/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Oct 9 08:45:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartSel.class
+# /home/rbistolfi/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Oct 9 08:45:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPartSel.module
+# /home/rbistolfi/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Oct 9 08:45:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSetup.module
+# /home/rbistolfi/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Oct 9 08:45:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSummarize.module
+# /home/rbistolfi/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Thu Oct 9 08:45:53 2008
@@ -18,19 +18,19 @@
msgid "GUI installer for Vector linux"
msgstr "GUI installer for Vector linux"
-#: FMain.class:229
+#: FMain.class:231
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr "Please wait while setup attempts to run the partitioning utility"
-#: FMain.class:231
+#: FMain.class:233
msgid "Please wait while setup analyses your current partition setup."
msgstr "Please wait while setup analyses your current partition setup."
-#: FMain.class:231
+#: FMain.class:233
msgid "This may take a while ..."
msgstr "This may take a while ..."
-#: FMain.class:245
+#: FMain.class:247
msgid ""
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
@@ -38,27 +38,27 @@
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
-#: FMain.class:301
+#: FMain.class:303
msgid "Skipping lilo setup"
msgstr "Skipping lilo setup per user request"
-#: FMain.class:405
+#: FMain.class:409
msgid "Process Overview"
msgstr "Process Overview"
-#: FMain.class:425
+#: FMain.class:429
msgid "Next"
msgstr "Next"
-#: FMain.class:431
+#: FMain.class:435
msgid "Back"
msgstr "Back"
-#: FMain.class:437
+#: FMain.class:441
msgid "Exit Installation"
msgstr "Exit Installation"
-#: FMain.class:453
+#: FMain.class:457
msgid "Button1"
msgstr "-"
@@ -102,27 +102,32 @@
msgid "TextLabel1"
msgstr "-"
-#: FrmInstallSys.class:70
+#: FrmInstallSys.class:75 FrmInstallSysN.class:72
msgid "Current Step"
msgstr "Current Step"
-#: FrmInstallSys.class:192
+#: FrmInstallSys.class:223
msgid "Vectorlinux is currently being installed to your system... Please
wait"
msgstr "Vectorlinux is currently being installed to your system... Please
wait"
-#: FrmInstallSys.class:201
-msgid "Installing ..."
-msgstr "Installing ..."
-
-#: FrmInstallSys.class:215
+#: FrmInstallSys.class:240
msgid "Total progress"
msgstr "Total progress"
-#: FrmInstallSys.class:220
+#: FrmInstallSys.class:250
msgid "Current Step "
msgstr "Current Step "
-#: FrmLangSel.class:81
+#: FrmInstallSys.class:255
+msgid "Installing ..."
+msgstr "Installing ..."
+
+#: FrmInstallSysN.class:82
+#, fuzzy
+msgid "Total Progress"
+msgstr "Total progress"
+
+#: FrmLangSel.class:88
msgid "Select your language"
msgstr "Select your language"
@@ -383,7 +388,7 @@
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
-#: FrmPartSel.class:189
+#: FrmPartSel.class:189 FrmUserAdd.class:348
msgid "Help"
msgstr "Help"
@@ -435,12 +440,17 @@
msgid "About the root account"
msgstr ""
+#: FrmRootPass.class:34
+#, fuzzy
+msgid "Enter a Password for root."
+msgstr "Enter Password"
+
#: FrmRootPass.class:43
msgid ""
"Passwords do not match. Please enter the same password twice for
accuracy."
msgstr ""
-#: FrmRootPass.class:101
+#: FrmRootPass.class:102
msgid ""
"The linux root account is pre-assigned to be used as the system "
"administrator's account. This account is used to perform system-wide
changes "
@@ -460,21 +470,21 @@
"a root password, think of something easy for you to remember, but hard
for "
"others to guess."
-#: FrmRootPass.class:107 MdlCore.module:512
+#: FrmRootPass.class:108 MdlCore.module:512
msgid "System Administrator"
msgstr "System Administrator"
-#: FrmRootPass.class:118
-msgid "Re-Enter Password"
-msgstr "Re-Enter Password"
+#: FrmRootPass.class:117
+msgid "Set Password"
+msgstr "Set Password"
-#: FrmRootPass.class:129 FrmUserAdd.class:131
+#: FrmRootPass.class:134 FrmUserAdd.class:373
msgid "Enter Password"
msgstr "Enter Password"
-#: FrmRootPass.class:134
-msgid "Set Password"
-msgstr "Set Password"
+#: FrmRootPass.class:139
+msgid "Re-Enter Password"
+msgstr "Re-Enter Password"
#: FrmSelISO.class:29 MdlCore.module:250
msgid "No Installable Media Found"
@@ -510,11 +520,62 @@
msgid "Search Again"
msgstr "Search Again"
-#: FrmUserAdd.class:112
-msgid "Add Users"
-msgstr "Add Users"
+#: FrmUserAdd.class:32
+#, fuzzy
+msgid "Create User Accounts"
+msgstr "User Accounts"
-#: FrmUserAdd.class:116
+#: FrmUserAdd.class:55
+msgid "Enter the login name that this user will use to login to this
system."
+msgstr ""
+
+#: FrmUserAdd.class:60
+msgid ""
+"Login name field contains illegal characters. Please use only lowercase "
+"letters and numbers"
+msgstr ""
+
+#: FrmUserAdd.class:71
+msgid "Username contains illegal characters"
+msgstr ""
+
+#: FrmUserAdd.class:74
+msgid "Username already exists"
+msgstr ""
+
+#: FrmUserAdd.class:78
+#, fuzzy
+msgid "Enter a Password."
+msgstr "Enter Password"
+
+#: FrmUserAdd.class:205
+msgid "Select picture for user Login"
+msgstr ""
+
+#: FrmUserAdd.class:237
+msgid ""
+"Your password selections do not match. Please enter the same password
twice"
+msgstr ""
+
+#: FrmUserAdd.class:262
+msgid ""
+"Groups are a way of administering permissions for your users. You grant
the "
+"user"
+msgstr ""
+
+#: FrmUserAdd.class:262
+msgid "permission to do certain things by adding them to certain groups."
+msgstr ""
+
+#: FrmUserAdd.class:262
+msgid "Select which groups you want this user to be a part of here"
+msgstr ""
+
+#: FrmUserAdd.class:263
+msgid "OK"
+msgstr ""
+
+#: FrmUserAdd.class:299
msgid ""
"Choose a unique name for each user. Enter the password for twice for "
"accuracy. You can make as many users as you want, and when you are
finished "
@@ -524,18 +585,39 @@
"accuracy. You can make as many users as you want, and when you are
finished "
"click next to continue."
-#: FrmUserAdd.class:121
-msgid "Username"
-msgstr "Username"
+#: FrmUserAdd.class:326
+msgid "Use Picture ID for Login greeting"
+msgstr ""
-#: FrmUserAdd.class:142
-msgid "ReEnter Password"
-msgstr "ReEnter Password"
+#: FrmUserAdd.class:338
+msgid "Select"
+msgstr ""
-#: FrmUserAdd.class:153
+#: FrmUserAdd.class:344
+msgid "User Rights Management"
+msgstr ""
+
+#: FrmUserAdd.class:355
msgid "Create User"
msgstr "Create User"
+#: FrmUserAdd.class:361
+msgid "Clear Form"
+msgstr ""
+
+#: FrmUserAdd.class:367
+msgid "Login Name"
+msgstr ""
+
+#: FrmUserAdd.class:379
+msgid "ReEnter Password"
+msgstr "ReEnter Password"
+
+#: FrmUserAdd.class:399
+#, fuzzy
+msgid "Real Name"
+msgstr "Name"
+
#: FrmWinDrives.class:72
msgid "Select the windows partitions you would like to mount during boot"
msgstr "Select the windows partitions you would like to mount during boot"
@@ -544,27 +626,23 @@
msgid "Timezone configuration"
msgstr "Timezone configuration"
-#: FrmZoneSet.class:99
-msgid "Set TimeZone"
-msgstr "Set TimeZone"
-
-#: FrmZoneSet.class:108
+#: FrmZoneSet.class:101
msgid "Choose the correct timezone for the area in which you live."
msgstr "Choose the correct timezone for the area in which you live."
-#: FrmZoneSet.class:113
+#: FrmZoneSet.class:106
msgid "ComboBox1"
msgstr "-"
-#: FrmZoneSet.class:115
+#: FrmZoneSet.class:108
msgid "LocalTime"
msgstr "LocalTime"
-#: FrmZoneSet.class:115
+#: FrmZoneSet.class:108
msgid "UTC"
msgstr "UTC"
-#: FrmZoneSet.class:120
+#: FrmZoneSet.class:113
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -729,19 +807,19 @@
"There has been an error while installing optional software to your
system."
msgstr ""
-#: MdlInstallCustom.module:67
+#: MdlInstallCustom.module:71
msgid "Error while installing required system software. "
msgstr "Error while installing required system software. "
-#: MdlInstallCustom.module:76
+#: MdlInstallCustom.module:80
msgid "Error while installing system configuration. "
msgstr "Error while installing system configuration. "
-#: MdlInstallCustom.module:83
+#: MdlInstallCustom.module:87
msgid "Unable to install kernels. "
msgstr "Unable to install kernels. "
-#: MdlInstallCustom.module:94
+#: MdlInstallCustom.module:98
msgid ""
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
@@ -749,7 +827,7 @@
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
-#: MdlInstallCustom.module:95
+#: MdlInstallCustom.module:99
msgid ""
"packages have been Installed. Please click next to move on to System "
"Configuration."
@@ -757,15 +835,20 @@
"packages have been Installed. Please click next to move on to System "
"Configuration."
-#: MdlInstallCustom.module:376
+#: MdlInstallCustom.module:268
+#, fuzzy
+msgid "Installing user-selected package"
+msgstr "Installing Required Packages ..."
+
+#: MdlInstallCustom.module:458
msgid "Calculating package count ... Please wait"
msgstr "Calculating package count ... Please wait"
-#: MdlInstallCustom.module:424
+#: MdlInstallCustom.module:506
msgid "Total packages to be installed = "
msgstr "Total packages to be installed = "
-#: MdlInstallCustom.module:456
+#: MdlInstallCustom.module:538
msgid "Error while installing "
msgstr "Error while installing "
@@ -773,11 +856,11 @@
msgid "Writing new /etc/fstab to system"
msgstr "Writing new /etc/fstab to system"
-#: MdlInstallSys.module:142 MdlPartSel.module:148
+#: MdlInstallSys.module:142 MdlPartSel.module:139
msgid "Not Used"
msgstr "Not Used"
-#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:137
msgid "Do not format"
msgstr "Do not format"
@@ -836,7 +919,7 @@
msgid "Failed to install"
msgstr "Unable to install kernels. "
-#: MdlInstallSys.module:822
+#: MdlInstallSys.module:823
msgid "Installing Final configuration files..."
msgstr "Installing final configuration files ..."
@@ -976,22 +1059,30 @@
msgid "PARTITION"
msgstr "PARTITION"
-#: MdlPartSel.module:77
+#: MdlPartSel.module:78
msgid "MOUNT POINT"
msgstr "MOUNT POINT"
-#: MdlPartSel.module:86
+#: MdlPartSel.module:88
msgid "FILESYSTEM"
msgstr "FYLESYSTEM"
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "Please select only one "
msgstr "Please select only one "
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "partition"
msgstr ""
+#: MdlSetup.module:261
+msgid "Activating swap space"
+msgstr ""
+
+#: MdlSetup.module:263
+msgid "Preparing filesystems"
+msgstr ""
+
#: MdlSummarize.module:28
msgid "PARTITIONING LAYOUT"
msgstr "PARTITION LAYOUT"
@@ -1020,6 +1111,56 @@
msgid "Full"
msgstr "Full"
+#: MdlUsrAdd.module:43
+msgid "This user can access CD/DVD devices"
+msgstr ""
+
+#: MdlUsrAdd.module:46
+msgid "This user can access floppy disks"
+msgstr ""
+
+#: MdlUsrAdd.module:49
+msgid "This user is allowed to print"
+msgstr ""
+
+#: MdlUsrAdd.module:52
+msgid "This user can access scanner devices"
+msgstr ""
+
+#: MdlUsrAdd.module:55
+msgid "This user is allowed to change audio settings"
+msgstr ""
+
+#: MdlUsrAdd.module:58
+msgid "This user is allowed to change video settings"
+msgstr ""
+
+#: MdlUsrAdd.module:61
+msgid "This user is allowed to play restricted games"
+msgstr ""
+
+#: MdlUsrAdd.module:64
+#, fuzzy
+msgid "Restricted administrator (backup)"
+msgstr "System Administrator"
+
+#: MdlUsrAdd.module:67
+#, fuzzy
+msgid "This user is a system administrator"
+msgstr "System Administrator"
+
+#: MdlUsrAdd.module:70
+msgid "Elite user"
+msgstr ""
+
+#: MdlUsrAdd.module:73
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
+msgstr ""
+
+#: MdlUsrAdd.module:76
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
+msgstr ""
+
#: MdlWinDrives.module:55
msgid "Windows Partitions Detected"
msgstr "Windows Partitions Detected"
@@ -1039,3 +1180,12 @@
#: MdlZoneSet.module:28
msgid "localtime"
msgstr "localtime"
+
+#~ msgid "Add Users"
+#~ msgstr "Add Users"
+
+#~ msgid "Username"
+#~ msgstr "Username"
+
+#~ msgid "Set TimeZone"
+#~ msgstr "Set TimeZone"
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 Oct 9 08:45:53 2008
@@ -26,14 +26,22 @@
msgid "Access Point"
msgstr "Punto de Accesso (Access Point)"
-#: FrmUserAdd.class:112
-msgid "Add Users"
-msgstr "Agregar Usuarios"
+#: MdlSetup.module:261
+msgid "Activating swap space"
+msgstr "Activando la partición Swap"
#: MdlLiloOsList.module:366
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"
+#: MdlUsrAdd.module:73
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
+msgstr "Permitir al usuario montar o desmontar Pendrives (USB Sticks)"
+
+#: MdlUsrAdd.module:76
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
+msgstr "Permitir al usuario montar o desmontar Dispositivos de
Almacenamiento Externos (HD Storage)"
+
#: MdlNetConf.module:290
msgid "Automatic settings via DHCP."
msgstr "Configuración automática utilizando DHCP"
@@ -46,7 +54,7 @@
msgid "BULK PACKAGES:"
msgstr "Paquetes por categoría"
-#: FMain.class:431
+#: FMain.class:435
msgid "Back"
msgstr "Regresar"
@@ -78,11 +86,11 @@
msgid "Build Date: "
msgstr "Compilado el: "
-#: FMain.class:453
+#: FMain.class:457
msgid "Button1"
msgstr ""
-#: MdlInstallCustom.module:376
+#: MdlInstallCustom.module:458
msgid "Calculating package count ... Please wait"
msgstr "Calculando el número de paquetes ... Por favor espere"
@@ -94,15 +102,15 @@
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr "Selecciona esta casilla si hay una instalación Windows en tu
sistema o otra partición Windows (FAT, FAT32, NTFS) que quieras montar
automáticamente al arrancar el ordenador"
-#: FrmUserAdd.class:116
+#: FrmUserAdd.class:299
msgid "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
msgstr "Elige un nombre único para cada usuario. Es necesario ingresar las
contraseñas dos veces. Puedes crear todas las cuentas de usuarios que
desees"
-#: FrmZoneSet.class:120
+#: FrmZoneSet.class:113
msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
msgstr "Elige como funciona el reloj de esta máquina. Si tienes dudas
elige UTC/GMT"
-#: FrmZoneSet.class:108
+#: FrmZoneSet.class:101
msgid "Choose the correct timezone for the area in which you live."
msgstr "Selecciona la zona horaria del área donde vives"
@@ -114,6 +122,10 @@
msgid "Choose your optional components to install."
msgstr "Selecciona los componentes opcionales a instalar."
+#: FrmUserAdd.class:361
+msgid "Clear Form"
+msgstr "Limpiar Formulario"
+
#: FrmSelISO.class:73
msgid "Click"
msgstr "Haz click en"
@@ -122,7 +134,7 @@
msgid "Click the button below to create a new user account."
msgstr "Presiona el botón para crear una nueva cuenta de usuario."
-#: FrmZoneSet.class:113
+#: FrmZoneSet.class:106
msgid "ComboBox1"
msgstr "-"
@@ -134,10 +146,14 @@
msgid "Configure and install lilo (Linux Boot Loader)"
msgstr "Confuguración de LILO"
-#: FrmUserAdd.class:153
+#: FrmUserAdd.class:355
msgid "Create User"
msgstr "Agregar Usuario"
+#: FrmUserAdd.class:32
+msgid "Create User Accounts"
+msgstr "Limiar cuentas de usuario"
+
#: FrmEmbUsrAdd.class:23
msgid "Create initial user accounts"
msgstr "Crear la cuenta del usuario inicial"
@@ -146,11 +162,11 @@
msgid "Current Status"
msgstr "Estado Actual"
-#: FrmInstallSys.class:70
+#: FrmInstallSys.class:75 FrmInstallSysN.class:72
msgid "Current Step"
msgstr "Este paso"
-#: FrmInstallSys.class:220
+#: FrmInstallSys.class:250
msgid "Current Step "
msgstr "Este paso"
@@ -178,7 +194,7 @@
msgid "Disk Partitioning:"
msgstr "Particionado de disco:"
-#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:137
msgid "Do not format"
msgstr "No Formatear"
@@ -194,6 +210,10 @@
msgid "Dynamic Host Control Protocol"
msgstr "Dynamic Host Control Protocol (DHCP)"
+#: MdlUsrAdd.module:70
+msgid "Elite user"
+msgstr "Usuario Privilegiado"
+
#: MdlNetConf.module:231
msgid "Encryption key"
msgstr "Clave encriptada"
@@ -202,31 +222,43 @@
msgid "Encryption type"
msgstr "Tipo de encriptación"
-#: FrmRootPass.class:129 FrmUserAdd.class:131
+#: FrmRootPass.class:134 FrmUserAdd.class:373
msgid "Enter Password"
msgstr "Ingresa contraseña"
+#: FrmRootPass.class:34
+msgid "Enter a Password for root."
+msgstr "Ingresa una contraseña para root."
+
+#: FrmUserAdd.class:78
+msgid "Enter a Password."
+msgstr "Ingresa una contraseña."
+
+#: FrmUserAdd.class:55
+msgid "Enter the login name that this user will use to login to this
system."
+msgstr "Ingresa el nombre de usuario que será utilizado para registrarse
en el sistema."
+
#: MdlInstallSys.module:506
msgid "Error occurred while installing"
msgstr "Ha ocurrido un error durante la instalación"
-#: MdlInstallCustom.module:456
+#: MdlInstallCustom.module:538
msgid "Error while installing "
msgstr "Error al instalar "
-#: MdlInstallCustom.module:67
+#: MdlInstallCustom.module:71
msgid "Error while installing required system software. "
msgstr "Error al instalar el software base. "
-#: MdlInstallCustom.module:76
+#: MdlInstallCustom.module:80
msgid "Error while installing system configuration. "
msgstr "Error al instalar la configuración del sistema. "
-#: FMain.class:437
+#: FMain.class:441
msgid "Exit Installation"
msgstr "Cancelar Instalación"
-#: MdlPartSel.module:86
+#: MdlPartSel.module:88
msgid "FILESYSTEM"
msgstr "Sistema de archivos"
@@ -266,6 +298,10 @@
msgid "Gparted was not found on this system. Please install gparted and
try again"
msgstr "No se encontró Gparted en el sistema. Por favor, instala Gparted
y prueba de nuevo"
+#: FrmUserAdd.class:262
+msgid "Groups are a way of administering permissions for your users. You
grant the user"
+msgstr "Los Grupos son un método para administrar los permisos de los
usuarios. Le garantizas a cada usuario"
+
#: MdlNetConf.module:126
msgid "Hardware Address"
msgstr "Dirección MAC"
@@ -274,7 +310,7 @@
msgid "Hardware Configuration"
msgstr "Configuración de hardware"
-#: FrmPartSel.class:189
+#: FrmPartSel.class:189 FrmUserAdd.class:348
msgid "Help"
msgstr "Ayuda"
@@ -326,11 +362,11 @@
msgid "Installing"
msgstr "Instalando"
-#: FrmInstallSys.class:201
+#: FrmInstallSys.class:255
msgid "Installing ..."
msgstr "Instalando..."
-#: MdlInstallSys.module:822
+#: MdlInstallSys.module:823
msgid "Installing Final configuration files..."
msgstr "Instalando los últimos ficheros de configuración ..."
@@ -342,6 +378,10 @@
msgid "Installing default system configuration and required software."
msgstr "Instalando el software necesario y las configuraciones por
defecto."
+#: MdlInstallCustom.module:268
+msgid "Installing user-selected package"
+msgstr "Instalando paquetes selecionados por el usuario"
+
#: FrmPkgSel.class:51
msgid "Installs everything in your VectorLinux media to your system"
msgstr "Instalar todo lo que incluye el medio de instalación en tu disco
duro"
@@ -382,15 +422,23 @@
msgid "Loading gparted ... Please wait"
msgstr "Cargando Gparted ... Por favor espere"
-#: FrmZoneSet.class:115
+#: FrmZoneSet.class:108
msgid "LocalTime"
msgstr "Hora Local"
+#: FrmUserAdd.class:367
+msgid "Login Name"
+msgstr "Nombre de usuario"
+
+#: FrmUserAdd.class:60
+msgid "Login name field contains illegal characters. Please use only
lowercase letters and numbers"
+msgstr "Tu nombre de usuario contiene caracteres ilegales. Por favor
utiliza solo letras minúsculas y números"
+
#: MdlCore.module:413
msgid "MINIMUM REQUIREMENTS"
msgstr "Requerimientos mínimos del sistema"
-#: MdlPartSel.module:77
+#: MdlPartSel.module:78
msgid "MOUNT POINT"
msgstr "Punto de montaje"
@@ -438,7 +486,7 @@
msgid "New user accounts can also be created after the install process is
completed."
msgstr "Podras crear nuevas cuentas de usuario también luego del proceso
de instalación."
-#: FMain.class:425
+#: FMain.class:429
msgid "Next"
msgstr "Siguiente"
@@ -462,10 +510,14 @@
msgid "None"
msgstr "Ninguno"
-#: MdlInstallSys.module:142 MdlPartSel.module:148
+#: MdlInstallSys.module:142 MdlPartSel.module:139
msgid "Not Used"
msgstr "Sin usar"
+#: FrmUserAdd.class:263
+msgid "OK"
+msgstr ""
+
#: MdlSummarize.module:61
msgid "OPTIONAL PACKAGES:"
msgstr "Paquetes opcionales"
@@ -494,7 +546,7 @@
msgid "Passwords do not match. Please enter the same password twice for
accuracy."
msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña dos veces para estar seguros de que es la que Usted
verdaderamente desea."
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "Please select only one "
msgstr "Por favor, seleccione solo una"
@@ -502,11 +554,11 @@
msgid "Please select the partitions you wish to use and how to use them"
msgstr "For favor, seleccione las secciones del disco que desea usar, y
también como usarlas"
-#: FMain.class:231
+#: FMain.class:233
msgid "Please wait while setup analyses your current partition setup."
msgstr "Por favor espere mientras el instalador analiza su particonado
actual."
-#: FMain.class:229
+#: FMain.class:231
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr "Por favor espere, el instalador intentará ejecutar la herramienta
de particionado"
@@ -518,11 +570,15 @@
msgid "Preparation"
msgstr "Preparación"
+#: MdlSetup.module:263
+msgid "Preparing filesystems"
+msgstr "Preparando sistemas de archivos"
+
#: FrmNetConf.class:151
msgid "Primary DNS Server"
msgstr "Servidor de nombres primario (DNS)"
-#: FMain.class:405
+#: FMain.class:409
msgid "Process Overview"
msgstr "Resumen del proceso"
@@ -530,18 +586,26 @@
msgid "Prompt Timeout"
msgstr "Esperar"
-#: FrmRootPass.class:118
+#: FrmRootPass.class:139
msgid "Re-Enter Password"
msgstr "Vuelva a ingresar la contraseña"
-#: FrmUserAdd.class:142
+#: FrmUserAdd.class:379
msgid "ReEnter Password"
msgstr "Vuelva a ingresar la contraseña"
+#: FrmUserAdd.class:399
+msgid "Real Name"
+msgstr "Nombre Real"
+
#: MdlCore.module:511
msgid "Regional Settings"
msgstr "Opciones de regionalización"
+#: MdlUsrAdd.module:64
+msgid "Restricted administrator (backup)"
+msgstr ""
+
#: MdlNetConf.module:274
msgid "STATUS:"
msgstr "Estado Actual:"
@@ -562,6 +626,14 @@
msgid "Seconds"
msgstr "Segundos"
+#: FrmUserAdd.class:338
+msgid "Select"
+msgstr "Seleciona"
+
+#: FrmUserAdd.class:205
+msgid "Select picture for user Login"
+msgstr "Selecciona una imagen para el usuario"
+
#: FrmWinDrives.class:72
msgid "Select the windows partitions you would like to mount during boot"
msgstr "Selecciona qué volumenes usados por Windows deseas acceder desde
Linux"
@@ -578,22 +650,22 @@
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr "Selectiona la imagen que deseas instalar de la lista"
+#: FrmUserAdd.class:262
+msgid "Select which groups you want this user to be a part of here"
+msgstr "Selecciona los grupos de los que este usuario será parte"
+
#: FrmPkgsel2.class:21
msgid "Select your indivirual packages to install."
msgstr "Selecciona paquetes individuales para su instalación."
-#: FrmLangSel.class:81
+#: FrmLangSel.class:88
msgid "Select your language"
msgstr "Selecciona tu idioma"
-#: FrmRootPass.class:134
+#: FrmRootPass.class:117
msgid "Set Password"
msgstr "Define tu contraseña"
-#: FrmZoneSet.class:99
-msgid "Set TimeZone"
-msgstr "Configura la Zona Horaria"
-
#: MdlNetConf.module:179
msgid "Setup Mode"
msgstr "Modo de configuración"
@@ -614,7 +686,7 @@
msgid "Several windows found. I will take the first one!"
msgstr "Se han encontrado varios windows. Cogeré el primero!"
-#: FMain.class:301
+#: FMain.class:303
msgid "Skipping lilo setup"
msgstr "Salteando configuración de LILO"
@@ -634,7 +706,7 @@
msgid "Subnet Mask"
msgstr "Máscara de subred"
-#: FrmRootPass.class:107 MdlCore.module:512
+#: FrmRootPass.class:108 MdlCore.module:512
msgid "System Administrator"
msgstr "Administrador del sistema"
@@ -666,7 +738,7 @@
msgid "The following Operating Systems have been detected on this
computer. Choose your desired option"
msgstr "los siguientes Sistemas Operativos han sido detectados en su
ordenador. Selecciona la opción deseada"
-#: FrmRootPass.class:101
+#: FrmRootPass.class:102
msgid "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
msgstr "La cuenta root en los sistemas Linux está diseñada como la cuenta
del administrador del sistema. Es utilizada para realizar tareas de
mantenimiento del sistema globales, tales como actualizaciones de software,
gestionar los permisos o crear nuevos usuarios, etc. \n\nLa mayoría de las
otras operaciones no requieren privilegios de administrador.\nLa contraseña
para el usuario root deberá ser ingresada dos veces para asegurar que es la
contraseña deseada. Al elegir la contraseña de administrador, piensa en
algo fácil de recordar, pero al mismo tiempo difícil de adivinar para los
otros. "
@@ -690,7 +762,7 @@
msgid "There has been an error while trying to format "
msgstr "Ha ocurrido un error mientras se intentaba formatear la partición."
-#: FMain.class:231
+#: FMain.class:233
msgid "This may take a while ..."
msgstr "Esto puede tardar unos minutos ..."
@@ -702,6 +774,38 @@
msgid "This option will overwrite any existing data in the selected
partitions"
msgstr "Esta opción sobreescribirá los datos de las particiones
seleccionadas"
+#: MdlUsrAdd.module:43
+msgid "This user can access CD/DVD devices"
+msgstr "Este usuario puede utilizar dispositivos de CD/DVD"
+
+#: MdlUsrAdd.module:46
+msgid "This user can access floppy disks"
+msgstr "Este usuario puede utilizar dispositivos de disco blando (floppy
disks)"
+
+#: MdlUsrAdd.module:52
+msgid "This user can access scanner devices"
+msgstr "Este usuario puede utilizar dispositivos de scaneado de imágenes"
+
+#: MdlUsrAdd.module:67
+msgid "This user is a system administrator"
+msgstr "Este usuario es administrador del sistema"
+
+#: MdlUsrAdd.module:55
+msgid "This user is allowed to change audio settings"
+msgstr "Este usuario tiene permitido cambiar las configuraciones de audio"
+
+#: MdlUsrAdd.module:58
+msgid "This user is allowed to change video settings"
+msgstr "Este usuario tiene permitido cambiar las configuraciones de video"
+
+#: MdlUsrAdd.module:61
+msgid "This user is allowed to play restricted games"
+msgstr "Este usuario puede jugar juegos restringidos"
+
+#: MdlUsrAdd.module:49
+msgid "This user is allowed to print"
+msgstr "Este usuario puede utilizar dispositivos de impresión"
+
#: MdlNetConf.module:290
msgid "This will work if you use a cable or DSL modem on a home network."
msgstr "Esto funcionará si tienes cable o módem DSL en una red casera."
@@ -714,11 +818,15 @@
msgid "To install them all, just click next"
msgstr "Para instalarlos todos, simplemente presiona Sigiente"
-#: MdlInstallCustom.module:424
+#: FrmInstallSysN.class:82
+msgid "Total Progress"
+msgstr "Progreso Total"
+
+#: MdlInstallCustom.module:506
msgid "Total packages to be installed = "
msgstr "Paquetes a instalar = "
-#: FrmInstallSys.class:215
+#: FrmInstallSys.class:240
msgid "Total progress"
msgstr "Progreso Total"
@@ -726,7 +834,7 @@
msgid "Typically, you want to use the largest partition for this."
msgstr "Normalmente querrías utilizar tu partición más grande para esto."
-#: FrmZoneSet.class:115
+#: FrmZoneSet.class:108
msgid "UTC"
msgstr "UTC"
@@ -734,7 +842,7 @@
msgid "Unable to identify distro."
msgstr "No se pudo detectar la distribución."
-#: MdlInstallCustom.module:83
+#: MdlInstallCustom.module:87
msgid "Unable to install kernels. "
msgstr "No se pudieron instalar los kernels. "
@@ -742,6 +850,10 @@
msgid "Unplugged"
msgstr "Desconectado"
+#: FrmUserAdd.class:326
+msgid "Use Picture ID for Login greeting"
+msgstr "Utilizar una imágen para el usuario en el gestor de sesiones"
+
#: FrmPartScheme.class:115
msgid "Use existing disk partitions"
msgstr "Utilizar las particiones existentes en mi disco duro"
@@ -762,9 +874,17 @@
msgid "User Accounts"
msgstr "Usuarios"
-#: FrmUserAdd.class:121
-msgid "Username"
-msgstr "Nombre de usuario"
+#: FrmUserAdd.class:344
+msgid "User Rights Management"
+msgstr "Administración de los Permisos de Usuario"
+
+#: FrmUserAdd.class:74
+msgid "Username already exists"
+msgstr "El nombre de usuario ya existe"
+
+#: FrmUserAdd.class:71
+msgid "Username contains illegal characters"
+msgstr "El nombre de usuario contiene caracteres ilegales"
#: FrmPartSel.class:149
msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
@@ -778,7 +898,7 @@
msgid "VectorLinux is unable to determine the type of hard disks on your
system."
msgstr "El instalador no ha podido determinar el tipo de disco duro en tu
sistema."
-#: FrmInstallSys.class:192
+#: FrmInstallSys.class:223
msgid "Vectorlinux is currently being installed to your system... Please
wait"
msgstr "Por favor espere mientras VectorLinux se instala en su sistema"
@@ -790,7 +910,7 @@
msgid "Vectorlinux is now installed in your system. Please click"
msgstr "VectorLinux ha sido instalado e tu sistema. Por favor presiona"
-#: MdlInstallCustom.module:94
+#: MdlInstallCustom.module:98
msgid "Vectorlinux is now installed in your system. Please click next to
configure it."
msgstr "Vectorlinux se ha instalado en tu ordenador. Por favor, clica
next para configurarlo."
@@ -826,10 +946,14 @@
msgid "Yes, I Agree to the License Agreement"
msgstr "De acuerdo"
-#: FMain.class:245
+#: FMain.class:247
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr "Debes seleccionar una partición para \"/\" (raíz). Allí sera
instalado el sistema operativo"
+#: FrmUserAdd.class:237
+msgid "Your password selections do not match. Please enter the same
password twice"
+msgstr "Sus contraseñas no coinciden. Por favor ingrese la misma
contraseña dos veces."
+
#: MdlDiskPart.module:90
msgid "a bad install media. Setup cannot continue."
msgstr "error en el medio de instalación. El programa de instalación no
puede continuar."
@@ -874,13 +998,17 @@
msgid "localtime-copied-from"
msgstr "Hora-local-copiada-de"
-#: MdlInstallCustom.module:95
+#: MdlInstallCustom.module:99
msgid "packages have been Installed. Please click next to move on to
System Configuration."
msgstr "paquetes han sido instalados. Por favor presiona Siguiente para
configurar el sistema."
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "partition"
msgstr "partición"
+
+#: FrmUserAdd.class:262
+msgid "permission to do certain things by adding them to certain groups."
+msgstr "permisos para realizar determinadas acciones agregándolo a un
grupo o a varios grupos determinados."
#: FrmPartSel.class:149
msgid "suggested setup for a typical Linux installation"
|
|
From: <cod...@go...> - 2008-10-08 21:28:20
|
Author: M0...@gm...
Date: Wed Oct 8 14:26:25 2008
New Revision: 218
Added:
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmInstallSysN.class
branches/iVL/FrmInstallSysN.form
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmPartSel.form
branches/iVL/FrmRootPass.class
branches/iVL/FrmRootPass.form
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
branches/iVL/MdlUsrAdd.module
branches/iVL/installer.gambas
Log:
- Optimized the following windows for 800x600 resolution (failsafe)
+ Lilo Config window
+ Root Password setting
- Other acheivements
+ Managed to break the FrmInstallSys window
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/.project
+# /home/moe/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsGlobal.class
+# /home/moe/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsPartSel.class
+# /home/moe/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsWinDrives.class
+# /home/moe/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FMain.class
+# /home/moe/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -34,23 +34,23 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:408
+#: FMain.class:409
msgid "Process Overview"
msgstr ""
-#: FMain.class:428
+#: FMain.class:429
msgid "Next"
msgstr ""
-#: FMain.class:434
+#: FMain.class:435
msgid "Back"
msgstr ""
-#: FMain.class:440
+#: FMain.class:441
msgid "Exit Installation"
msgstr ""
-#: FMain.class:456
+#: FMain.class:457
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmDiskPart.class
+# /home/moe/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmLicense.class
+# /home/moe/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartScheme.class
+# /home/moe/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartSel.class
+# /home/moe/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPkgSel.class
+# /home/moe/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSelISO.class
+# /home/moe/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSummary.class
+# /home/moe/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmWinDrives.class
+# /home/moe/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlCore.module
+# /home/moe/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlDiskPart.module
+# /home/moe/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlObjSizer.module
+# /home/moe/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPartSel.module
+# /home/moe/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,27 +18,27 @@
msgid "PARTITION"
msgstr ""
-#: MdlPartSel.module:77
+#: MdlPartSel.module:78
msgid "MOUNT POINT"
msgstr ""
-#: MdlPartSel.module:86
+#: MdlPartSel.module:88
msgid "FILESYSTEM"
msgstr ""
-#: MdlPartSel.module:148
-msgid "Not Used"
+#: MdlPartSel.module:137
+msgid "Do not format"
msgstr ""
-#: MdlPartSel.module:174
-msgid "Do not format"
+#: MdlPartSel.module:139
+msgid "Not Used"
msgstr ""
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "Please select only one "
msgstr ""
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "partition"
msgstr ""
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPkgSel.module
+# /home/moe/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSetup.module
+# /home/moe/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -13,4 +13,12 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+
+#: MdlSetup.module:261
+msgid "Activating swap space"
+msgstr ""
+
+#: MdlSetup.module:263
+msgid "Preparing filesystems"
+msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSummarize.module
+# /home/moe/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlWinDrives.module
+# /home/moe/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Oct 8 14:26:25 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.102
+Version=0.0.103
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Oct 8 14:26:25 2008
@@ -1 +1,5 @@
-- Fixed problem with user accounts not getting created.
\ No newline at end of file
+- Optimized the following windows for 800x600 resolution (failsafe)
+ + Lilo Config window
+ + Root Password setting
+- Other acheivements
+ + Managed to break the FrmInstallSys window
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Oct 8 14:26:25 2008
@@ -41,7 +41,7 @@
-'ME.Maximized = TRUE
+ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -75,8 +75,8 @@
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
- .Width = 800
- .Height = 600
+ '.Width = 800
+ '.Height = 600
END WITH
@@ -335,6 +335,7 @@
'IF FrmCurr.text = "FrmLangSel" THEN STOP EVENT
frmNext.Reparent(ME.pnlWinHost)
+ frmNext.ResizeScaled(pnlwinhost.Width, pnlwinhost.Height)
FrmCurr.Hide
frmLast = FrmCurr
Added: branches/iVL/FrmInstallSys.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSys.class Wed Oct 8 14:26:25 2008
@@ -0,0 +1,196 @@
+' 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/>.
+
+
+PUBLIC SUB BEGIN_PROCESS()
+
+ DIM sRes AS Integer ' we will need to
+
+ MdlCore.lock_gui()
+ FMain.FrmCurr = ME
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+
+MdlInstallSys.ACTIVATE_SWAP_SPACE() ' activate swap for the current install
+
+MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' formats partitions and mounts them
+
+END
+
+
+
+
+
+PUBLIC SUB Form_Open()
+
+ ' ' ' DIM iMinFrameH AS Integer
+ ' ' ' iMinFrameH = ME.tlCurrPkg.Height + ME.tlCurrPkg2.Height +
ME.tlCurrStepLbl.Height + ME.pbInstallProg2.Height +
ME.tlCurrStepLbl.Height + 36
+ ' ' ' WITH ME
+ ' ' ' .FrmProg.Move(4, .tlBanner.top + .tlBanner.Height +
8, .ClientWidth - (.FrmProg.Left * 2), iMinFrameH)
+ ' ' ' .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
+ ' ' ' .hrsep.Move(4, .tlBanner.top + .tlBanner.Height
- .hrsep.Height, .tlBanner.Width)
+ ' ' ' '.tlBanner.Border = Border.Plain
+ ' ' ' .FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
36), .ClientWidth - (.FrmProg.Left * 2))
+ ' ' ' .tlCurrPkg.move(8, 32, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ ' ' ' .tlCurrStepLbl.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 4), MdlObjSizer.get_object_width(.tlCurrStepLbl.Text)
+ 8, 27)
+ ' ' ' .pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
+ ' ' ' .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ ' ' ' .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
+ ' ' '
+ ' ' ' .scrlCredits.Move(.FrmProg.left, .FrmProg.top + FrmProg.Height
+ 24, .FrmProg.Width)
+ ' ' '
+ ' ' ' .tlCredits.Move(8, 4)
+ ' ' ' END WITH
+ ' ' '
+
+FMain.FrmCurr = ME
+
+FMain.FrmCurr = ME
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+ ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
+
+
+'MdlSetup.RUN_CREDITS
+
+ 'ClsGlobal.sSourceMnt = "/mnt/cdrom"
+ 'ME.FrmProg.Text = " Preparing system for installation "
+ ME.tlCurrStepLbl.Text = ("Current Step")
+ 'ME.show_credits
+ 'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
+ 'ME.tmCredits.Enabled = TRUE
+
+'STOP EVENT
+
+'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
+'WAIT
+ME.ResizeScaled(ME.Parent.Width, ME.Parent.Height)
+ME.scrlCredits.Border = Border.Sunken
+WAIT 1
+Message("Window has been resized")
+'ME.scrlCredits.Border = Border.Plain
+WAIT 2
+'ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
+MdlSetup.BEGIN_INSTALLATION()
+
+
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
+
+END
+
+' ' ' PUBLIC SUB Form_Resize()
+' ' '
+' ' ' DIM iMinFrameH AS Integer
+' ' ' iMinFrameH = ME.tlCurrPkg.Height + ME.tlCurrPkg2.Height +
ME.tlCurrStepLbl.Height + ME.pbInstallProg2.Height +
ME.tlCurrStepLbl.Height + 36
+' ' ' WITH ME
+' ' ' '.FrmProg.Move(4, .tlBanner.top + .tlBanner.Height +
8, .ClientWidth - (.FrmProg.Left * 2), iMinFrameH)
+' ' ' .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
+' ' ' .hrsep.Move(4, .tlBanner.top + .tlBanner.Height
- .hrsep.Height, .tlBanner.Width)
+' ' ' '.tlBanner.Border = Border.Plain
+' ' ' '.FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
36), .ClientWidth - (.FrmProg.Left * 2))
+' ' ' '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .ClientWidth - (.FrmProg.Left * 2))
+' ' ' ' / The following objects are inside the frame
+' ' ' .tlCurrPkg.move(8, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+' ' ' .tlCurrStepLbl.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 4), MdlObjSizer.get_object_width(.tlCurrStepLbl.Text)
+ 8, 27)
+' ' ' .pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
+' ' ' .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
+' ' ' .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
+' ' ' .FrmProg.Move(4, hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientw - (.FrmProg.x * 2), 32 + (.tlCurrStepLbl.H
+ .tlCurrPkg.h + .tlCurrPkg2.h + (.pbInstallProg2.h * 2)))
+' ' ' ' .frmCredits.Move(.FrmProg.left, .FrmProg.top
+ .FrmProg.Height + 16, .FrmProg.Width)
+' ' ' '.scrlCredits.move(8, 24, .FrmProg.Width - (.scrlCredits.left
* 2))
+' ' ' '.scrlCredits.Move(.FrmProg.left, .FrmProg.top +
FrmProg.Height + 24, .FrmProg.Width)
+' ' '
+' ' ' '.tlCredits.Move(8, 4)
+' ' '
+' ' ' '.pbInstallProg.Move(.tlCurrStepLbl.Left +
(.tlCurrStepLbl.Width + 2), .FrmProg.Width - (.tlCurrStepLbl.Width +
(.tlCurrStepLbl.left * 2))) '
+' ' ' '.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 2), .tlCurrPkg.Width)
+' ' '
+' ' ' END WITH
+
+
+''''''END
+
+PUBLIC SUB HIDE_PROGRES_CONTROLS()
+
+ WITH ME
+ .tlCurrStepLbl.Visible = FALSE
+ .pbInstallProg.Visible = FALSE
+ .tlCurrPkg2.Visible = FALSE
+ .pbInstallProg2.Visible = FALSE
+ END WITH
+
+END
+
+
+
+
+PUBLIC SUB tmCredits_Timer()
+
+ ' ' ' DIM i AS Integer = ME.FrmProg.left + 20
+ ' ' '
+ ' ' ' IF ME.tlCredits.x < (i) - (ME.tlCredits.Width) THEN ME.tlCredits.x
= (frmCredits.Width - 12)
+ ' ' ' tlCredits.x = frmCredits.left + 4 + (tlCredits.x - 10)
+ ' ' '
+ ' ' '
+
+
+
+
+ DIM X AS Integer
+ X = ME.scrlCredits.ScrollX
+ REPEAT
+ INC ME.scrlCredits.ScrollX
+ IF X = ME.scrlCredits.Scrollx THEN
+ ME.scrlCredits.scrollx = 0
+ ME.tmCredits.Enabled = FALSE
+ END IF
+ UNTIL tmCredits.Enabled = FALSE
+
+
+ '
+ ' IF ME.sclCredits.ScrollX < - ME.tlCredits.Width + ME.tlCredits.x THEN
+ ' ME.sclCredits.Scrollx = ME.sclCredits.Width
+ ' ENDIF
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.x * 2))
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientw - (.FrmProg.x * 2), .clienth - (.FrmProg.y
+ .tlBanner.h))
+ ' items inside the frame
+ .tlCurrPkg.Move(8, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ .tlCurrStepLbl.Move(8, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+ .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
+ .tlCurrPkg2.Move(8, .pbInstallProg.top + .pbInstallProg.Height +
4, .ClientW - (.tlCurrPkg2.x * 2))
+ .pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
+ END WITH
+
+END
Added: branches/iVL/FrmInstallSys.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSys.form Wed Oct 8 14:26:25 2008
@@ -0,0 +1,51 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,96,74)
+ Text = ("")
+ Maximized = True
+ { tlBanner TextLabel
+ MoveScaled(1,1,63,7)
+ Text = ("Vectorlinux is currently being installed to your system...
Please wait")
+ }
+ { hrsep Separator
+ MoveScaled(2,8,48,2)
+ }
+ { FrmProg Frame
+ MoveScaled(1,11,76,34)
+ Text = ("")
+ { pbInstallProg2 ProgressBar
+ MoveScaled(0,18,44,3)
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(1,14,45,3)
+ Text = ("Total progress")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(13,10,31,2)
+ Label = False
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(1,9,11,3)
+ Text = ("Current Step ")
+ }
+ { tlCurrPkg TextLabel
+ MoveScaled(1,0,73,6)
+ Text = ("Installing ...")
+ }
+ }
+ { tmCredits #Timer
+ #X = 560
+ #Y = 77
+ Delay = 50
+ }
+ { scrlCredits ScrollView
+ MoveScaled(2,56,84,5)
+ Border = False
+ ScrollBar = Scroll.None
+ { tlCredits TextLabel
+ MoveScaled(-2,0,46,3.375)
+ Text = ("")
+ }
+ }
+}
Added: branches/iVL/FrmInstallSysN.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSysN.class Wed Oct 8 14:26:25 2008
@@ -0,0 +1,31 @@
+' Gambas class file
+
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .frmProg.Move(4, .hrsep.top + .hrsep.Height + (.tlBanner.Height *
2), .ClientWidth - (.frmProg.left * 2), .ClientHeight - (.frmProg.top *
2)) '- .tlBanner.Height))
+ .tlCurrPkg.Move(4, 24, .frmProg.Width - (.tlCurrPkg.left * 2))
+ .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 8,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+ .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .frmProg.Width - (.pbInstallProg.Left +
(.tlCurrStepLbl.left * 2)))
+ .tlCurrPkg2.Move(4, .tlCurrStepLbl.Top + (.tlCurrStepLbl.Height * 2),
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
+ .pbInstallProg2.Move(.tlCurrPkg2.left + .tlCurrPkg2.Width +
8, .tlCurrPkg2.top, .frmProg.Width - (.pbInstallProg2.left +
(.tlCurrPkg2.left * 2)))
+ '.pbInstallProg2.Move(4, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .frmProg.Width - (.pbInstallProg2.left * 2))
+
+ END WITH
+
+END
+
+PUBLIC SUB Form_Open()
+
+ FMain.FrmCurr = ME
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+
+'ready to start installing
+Message.Info("Ready to start installing")
+MdlSetup.BEGIN_INSTALLATION() ' begin the installation process
+END
Added: branches/iVL/FrmInstallSysN.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSysN.form Wed Oct 8 14:26:25 2008
@@ -0,0 +1,36 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,64)
+ Text = ("")
+ { tlBanner TextLabel
+ MoveScaled(1,1,19,4)
+ Text = ("")
+ }
+ { hrsep Separator
+ MoveScaled(10,6,10,1)
+ }
+ { frmProg Frame
+ MoveScaled(1,9,60,27)
+ Text = ("")
+ { tlCurrPkg TextLabel
+ MoveScaled(2,1,16,3)
+ Text = ("")
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(2,6,15,2.25)
+ Text = ("Current Step")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(14,7,9,2)
+ Label = False
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(2,11,11,3)
+ Text = ("Total Progress")
+ }
+ { pbInstallProg2 ProgressBar
+ MoveScaled(14,11,9,3)
+ }
+ }
+}
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Wed Oct 8 14:26:25 2008
@@ -94,8 +94,8 @@
.tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height *
1.5), MdlObjSizer.get_object_width(.tlTarGet.Text))
.LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top,
(.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left))
.tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width +
32, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text))
-
- .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
4, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + (.FBResolution.Width
* 0.75)))
+ .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
8, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + 16))
+ '.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
4, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + (.FBResolution.Width
* 0.75)))
cbleft = .FBResolution.Left
cbwidth = .FBResolution.Width
.tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 12,
MdlObjSizer.get_object_width(.tlTimeOUt.Text))
Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form (original)
+++ branches/iVL/FrmPartSel.form Wed Oct 8 14:26:25 2008
@@ -4,14 +4,14 @@
MoveScaled(0,0,72,55)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,1,61,3.7143)
+ MoveScaled(1,1,59,5)
Text = ("Please select the partitions you wish to use and how to use
them")
}
{ scrollPartitions ScrollView
MoveScaled(1,9,69,38)
}
{ cbDoWin CheckBox
- MoveScaled(1,50,57,3.1429)
+ MoveScaled(1,50,57,3.125)
ToolTip = ("Check this box if you have a Windows installation on your
system or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts")
Text = ("Detect and Setup Windows partitions for auto-mounting at
boot")
}
@@ -21,6 +21,6 @@
Picture = Picture["icon:/small/help"]
}
{ hrSep Separator
- MoveScaled(3,6,19,1)
+ MoveScaled(3,7,19,1)
}
}
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Wed Oct 8 14:26:25 2008
@@ -31,7 +31,7 @@
PUBLIC SUB Button1_Click()
IF ME.tbPasswd1.Text = "" THEN
- Message("Enter a Password for root.")
+ Message(("Enter a Password for root."))
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
'Message("chroot /mnt/target /sbin/passwdx root " &
ME.tbPasswd1.Text)
@@ -55,7 +55,8 @@
WITH ME
.tlbanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2))
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
- .Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height * 4)
+ '.Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height *
4)
+ .Frame1.Move(4, hrSep.top + .hrSep.Height + .tlBanner.Height, .ClientW
- (.Frame1.left * 2), tlbanner.height * 4)
.tlAboutRoot.Move(4, 24, .Frame1.Width - (.tlAboutRoot.Left *
2), .Frame1.Height - .tlAboutRoot.top - 8)
.tlPass1.Move(.Frame1.left, .Frame1.top + .Frame1.Height + 24,
MdlObjSizer.get_object_width(.tlPass1.text), 21)
.tlPass2.Move(.tlPass1.Left, .tlPass1.top + .tlPass1.Height + 4,
MdlObjSizer.get_object_width(.tlPass2.text), 21)
Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form (original)
+++ branches/iVL/FrmRootPass.form Wed Oct 8 14:26:25 2008
@@ -12,7 +12,7 @@
}
}
{ tlBanner TextLabel
- MoveScaled(2,1,62,3.1667)
+ MoveScaled(2,2,62,3.125)
Text = ("System Administrator")
}
{ hrSep Separator
@@ -23,21 +23,21 @@
Text = ("Set Password")
}
{ tbPasswd2 TextBox
- MoveScaled(29,6,21,3.1667)
+ MoveScaled(32,36,21,3.125)
Text = ("")
Password = True
}
{ tbPasswd1 TextBox
- MoveScaled(30,0,21,3.1667)
+ MoveScaled(32,31,21,3.125)
Text = ("")
Password = True
}
{ tlPass1 TextLabel
- MoveScaled(0,1,22,4)
+ MoveScaled(2,32,22,4)
Text = ("Enter Password")
}
{ tlPass2 TextLabel
- MoveScaled(0,6,22,4)
+ MoveScaled(3,36,22,4)
Text = ("Re-Enter Password")
}
}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Oct 8 14:26:25 2008
@@ -152,7 +152,7 @@
.tbRealname.Move(iboxleft, .tlRealName.top, iboxwidth)
.TextLabel3.Move(4, .tlRealName.top + .tlRealName.Height +
2, .TextLabel2.Width)
.tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth)
- .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height +
2, .TextLabel2.Width)
+ .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height + 2,
MdlObjSizer.get_object_width(.TextLabel4.text))
.tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth)
'.tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
2, .TextLabel2.Width)
'.cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
@@ -163,7 +163,7 @@
.tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height +
2, .TextLabel2.Width + iboxwidth + 8)
'.tbPicPath.Move(4, .bUsePic.top + .bUsePic.height +
2, .tlBanner.Width - (.btBrowse.Width + 4))
.btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top,
MdlObjSizer.get_object_width(.btBrowse.text) + 36)
- .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + .Button1.Height
+ .Button1.height))
+ .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + .Button1.Height))
.Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8,
MdlObjSizer.get_object_width(.Button1.Text) + 36)
.btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
'.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Wed Oct 8 14:26:25 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,76,67)
Text = ("")
{ tlExp TextLabel
- MoveScaled(1,9,55,8)
+ MoveScaled(1,9,55,6)
Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
}
{ tbUsername TextBox
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Oct 8 14:26:25 2008
@@ -68,26 +68,28 @@
.Height = 27
.x = x
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.2
+ .Width = MdlObjSizer.get_object_width("/dev/hda1 (100 GB)")
+ '.Width = MdlObjSizer.get_object_width(.text) '* 1.5
END WITH
icol1 = x
- icol2 = x + tl.Width + 4
+ icol2 = x + (tl.Width * 1.25)
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
.text = "<b>" & ("MOUNT POINT") & "</b>"
.Height = 27
.x = icol2
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.2
+ .Width = MdlObjSizer.get_object_width(.text) '* 1.5
END WITH
- icol3 = tl.x + tl.Width + 4
+ icol3 = tl.left + (tl.Width * 1.5)
+ 'iboxwidth = tl.Width
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
.text = "<b>" & ("FILESYSTEM") & "</b>"
.Height = 27
.x = icol3
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.2
+ .Width = MdlObjSizer.get_object_width(.text) '* 1.5
END WITH
y = y + 20
@@ -104,18 +106,7 @@
sPart = Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/"))
- 'Message.Info(sPart)
- ' ' ' 'make sure the mount point exists
- ' ' ' IF IsDir("/mnt" &/ sPart) = FALSE THEN
- ' ' ' SHELL "mkdir /mnt" &/ sPart WAIT
- ' ' ' END IF
- ' ' ' ' Now mount the partition
- ' ' ' SHELL "mount " & Trim(sPartList[i]) & Space(1)
& "/mnt" &/ sPart WAIT
- ' ' ' ' get the size using df -h | grep sPart and some
sed
- ' ' ' ' will embed some bash, but should probabbly be
fixed
- ' ' ' SHELL "export " & sPart & "=$(df -h | grep " & sPart
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
- ' ' ' 'Message(sPart & Space(1) & "[ " & Trim(sSize) & "
]")
SHELL "export size=$(parted " & sDrive & " print | grep ^\'"
& sBlank & sPartNo & "\'); echo $size | cut -f 4 -d \' \'" TO sSize
'create the label and the drop down box here
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "Labels"
@@ -143,7 +134,7 @@
.X = icol2 'FrmPartSel.tlPartRow2.Left
.y = y
.Height = tl.Height
- .Width = tl.Width
+ .Width = MdlObjSizer.get_object_width(("Do not format")) *
1.5 'tl.Width"
.ReadOnly = TRUE
.Add(("Not Used"))
.Add("/")
@@ -238,7 +229,7 @@
WITH cb
.y = y
.x = icol2
- .width = tl.Width
+ .width = MdlObjSizer.get_object_width(("Do not
format")) * 1.5 'tl.Width
.ReadOnly = TRUE
.Add("Swap")
.Add(("Not Used"))
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Oct 8 14:26:25 2008
@@ -240,4 +240,29 @@
END
+PUBLIC SUB BEGIN_INSTALLATION()
+
+
+ WITH FrmInstallSys
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .frmProg.Move(4, .hrsep.top + .hrsep.Height + (.tlBanner.Height *
2), .ClientWidth - (.frmProg.left * 2), .ClientHeight - (.frmProg.top *
2)) '- .tlBanner.Height))
+ .tlCurrPkg.Move(4, 24, .frmProg.Width - (.tlCurrPkg.left * 2))
+ .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 8,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+ .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .frmProg.Width - (.pbInstallProg.Left +
(.tlCurrStepLbl.left * 2)))
+ .tlCurrPkg2.Move(4, .tlCurrStepLbl.Top + (.tlCurrStepLbl.Height * 2),
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
+ .pbInstallProg2.Move(.tlCurrPkg2.left + .tlCurrPkg2.Width +
8, .tlCurrPkg2.top, .frmProg.Width - (.pbInstallProg2.left +
(.tlCurrPkg2.left * 2)))
+ '.pbInstallProg2.Move(4, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .frmProg.Width - (.pbInstallProg2.left * 2))
+
+ END WITH
+
+
+ MdlCore.LOCK_GUI()
+ FrmInstallSys.tlCurrPkg.text = ("Activating swap space")
+ MdlInstallSys.ACTIVATE_SWAP_SPACE()
+ FrmInstallSys.tlCurrPkg.text = ("Preparing filesystems")
+ MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' This will start the install
process
+
+
+END
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Wed Oct 8 14:26:25 2008
@@ -28,6 +28,12 @@
objGrps = NEW Object[]
sGrpArr = Split(sGrpList, ",")
+'try to resize the window because the frame is too narrow
+ WITH FrmUserAdd
+ .Resize(.Parent.Width, .Parent.Height)
+ END WITH
+
+
y = 24
x = 4
FOR i = 0 TO sGrpArr.Count - 1
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-07 21:26:39
|
Author: m0e.lnx
Date: Tue Oct 7 14:25:42 2008
New Revision: 217
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/DevLog
branches/iVL/DevNotes
branches/iVL/FMain.class
branches/iVL/FrmRootPass.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlSummarize.module
branches/iVL/MdlUsrAdd.module
Log:
- Fixed problem with user accounts not getting created.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Oct 7 14:25:42 2008
@@ -14,43 +14,43 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:229
+#: FMain.class:231
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:231
+#: FMain.class:233
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:231
+#: FMain.class:233
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:245
+#: FMain.class:247
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:301
+#: FMain.class:303
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:406
+#: FMain.class:408
msgid "Process Overview"
msgstr ""
-#: FMain.class:426
+#: FMain.class:428
msgid "Next"
msgstr ""
-#: FMain.class:432
+#: FMain.class:434
msgid "Back"
msgstr ""
-#: FMain.class:438
+#: FMain.class:440
msgid "Exit Installation"
msgstr ""
-#: FMain.class:454
+#: FMain.class:456
msgid "Button1"
msgstr ""
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Oct 7 14:25:42 2008
@@ -1 +1 @@
-- User add window is ready for testing
\ No newline at end of file
+- Fixed problem with user accounts not getting created.
\ No newline at end of file
Modified: branches/iVL/DevNotes
==============================================================================
--- branches/iVL/DevNotes (original)
+++ branches/iVL/DevNotes Tue Oct 7 14:25:42 2008
@@ -5,6 +5,7 @@
- combobox to select config method
- textboxes for static IP settings.
\- wireless settings section must be moved to the right if this
happens
+* Item positioning for smaller window resolutions is off (needs testing in
smaller window resolutions)
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Oct 7 14:25:42 2008
@@ -41,7 +41,7 @@
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -75,6 +75,8 @@
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
+ .Width = 800
+ .Height = 600
END WITH
Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form (original)
+++ branches/iVL/FrmRootPass.form Tue Oct 7 14:25:42 2008
@@ -15,29 +15,29 @@
MoveScaled(2,1,62,3.1667)
Text = ("System Administrator")
}
+ { hrSep Separator
+ MoveScaled(2,5,15,1)
+ }
+ { Button1 Button
+ MoveScaled(53,51,11,2)
+ Text = ("Set Password")
+ }
{ tbPasswd2 TextBox
- MoveScaled(31,37,21,3.1667)
+ MoveScaled(29,6,21,3.1667)
Text = ("")
Password = True
}
{ tbPasswd1 TextBox
- MoveScaled(29,31,21,3.1667)
+ MoveScaled(30,0,21,3.1667)
Text = ("")
Password = True
}
- { tlPass2 TextLabel
- MoveScaled(2,37,22,4)
- Text = ("Re-Enter Password")
- }
{ tlPass1 TextLabel
- MoveScaled(2,32,22,4)
+ MoveScaled(0,1,22,4)
Text = ("Enter Password")
}
- { Button1 Button
- MoveScaled(53,51,11,2)
- Text = ("Set Password")
- }
- { hrSep Separator
- MoveScaled(2,5,15,1)
+ { tlPass2 TextLabel
+ MoveScaled(0,6,22,4)
+ Text = ("Re-Enter Password")
}
}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Oct 7 14:25:42 2008
@@ -30,6 +30,8 @@
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
+ .tbPicPath.Visible = FALSE
+ .btBrowse.Visible = FALSE
END WITH
'WAIT 3
@@ -63,18 +65,18 @@
END IF
SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'" TO
sCHAR
- SHELL "grep -e ^" & ME.tbUsername.Text & " /mnt/target/etc/passwd" TO
sLogE
+ SHELL "grep -e ^" & ME.tbUsername.Text & ClsGlobal.sTargetMnt
&/ "etc/passwd" TO sLogE
IF sCHAR <> "" THEN
Message(("Username contains illegal characters"))
- STOP EVENT
+ RETURN
ELSE IF sLogE <> "" THEN
Message(("Username already exists"))
- STOP EVENT
+ RETURN
ELSE
IF ME.tbPasswd1.Text = "" THEN
Message(("Enter a Password."))
- STOP EVENT
+ RETURN
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
@@ -83,7 +85,8 @@
'SHELL "cd " & sPicdir & " && ln -s root1.png
root.face.icon" ' This needs to go somewhere else
'SHELL "cd " & sPicdir & " ; ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
- SHELL "cd " & sPicdir & "; ln -s " & tbPicPath.Text & Space(1)
& tbUsername.Text & ".face.icon" WAIT
+
+ SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
ENDIF
@@ -94,15 +97,21 @@
END IF
NEXT
sGroups = Right(sGroups, Len(sGroups) - 1)
- Message(sGroups)
+ 'Message(sGroups)
- SHELL "chroot /mnt/target groupdel " & ME.tbUsername.Text WAIT
- SHELL "chroot /mnt/target groupadd -g " & iUID & Space(1) &
ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text & " &> /dev/null" WAIT
+ 'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/groupadd " &
ME.tbUsername.Text & " &> /dev/null" WAIT
'Message("chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
ME.tbUsername.Text)
- SHELL "chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash -u "
& iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups & Space(1) &
ME.tbUsername.Text WAIT
+ 'SHELL "chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups & Space(1) &
ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/useradd -m -c " & "\'" &
ME.tbRealname.text & "\'" & " -g " & ME.tbUsername.text &
+ " -p " & ME.tbPasswd1.text & " -G " & "\'" & sGroups & "\' " &
ME.tbUsername.Text WAIT
+ ' sDocmd = "useradd -m -c " & "\'" & sname & "\'" & " -g " &
slogin & " -p " & ME.txtpass1.Text &
+ '" -G " & "\'" & sgrparse & "\' " & slogin
+
'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
Message("user " & ME.tbUsername.Text & " was created.")
@@ -135,7 +144,7 @@
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
.tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width)
.TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2.5)
- .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.75)
+ .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.25)
iboxleft = .tbUsername.Left
iboxwidth = .tbUsername.Width
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Tue Oct 7 14:25:42 2008
@@ -52,7 +52,7 @@
END IF
IF ClsPkgSel.bCustom = TRUE THEN
- sText = sText & "<b>" & ("INSTALL TYPE:") & "</b>" & Space(1) &
("Custom") & "<br>)"
+ sText = sText & "<b>" & ("INSTALL TYPE:") & "</b>" & Space(1) &
("Custom") & "<br>"
sText = sText & "<br><b>" & ("BULK PACKAGES:") & "</b> "
FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Tue Oct 7 14:25:42 2008
@@ -17,7 +17,7 @@
PUBLIC objGrps AS Object[]
PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
-DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,game,adm,sys,wheel,plugdev,disk"
+DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,games,adm,sys,wheel,plugdev,disk"
DIM sGrpArr AS String[]
DIM i AS Integer
DIM sLabel, sComment, sToolTip AS String
@@ -51,7 +51,7 @@
CASE "video"
sComment = ("This user is allowed to change video settings")
bdefval = TRUE
- CASE "game"
+ CASE "games"
sComment = ("This user is allowed to play restricted games")
bdefval = TRUE
CASE "adm"
|
|
From: <cod...@go...> - 2008-10-07 19:23:30
|
Author: m0e.lnx
Date: Tue Oct 7 12:22:12 2008
New Revision: 216
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmRootPass.form
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/FrmZoneSet.class
branches/iVL/FrmZoneSet.form
branches/iVL/MdlUsrAdd.module
Log:
- User add window is ready for testing
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Oct 7 12:22:12 2008
@@ -34,23 +34,23 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:405
+#: FMain.class:406
msgid "Process Overview"
msgstr ""
-#: FMain.class:425
+#: FMain.class:426
msgid "Next"
msgstr ""
-#: FMain.class:431
+#: FMain.class:432
msgid "Back"
msgstr ""
-#: FMain.class:437
+#: FMain.class:438
msgid "Exit Installation"
msgstr ""
-#: FMain.class:453
+#: FMain.class:454
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Oct 7 12:22:12 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmUserAdd
+Startup=MdlCore
Version=0.0.102
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Oct 7 12:22:12 2008
@@ -1 +1 @@
-- User Add window is designed
\ No newline at end of file
+- User add window is ready for testing
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Oct 7 12:22:12 2008
@@ -312,12 +312,13 @@
CASE "FrmRootPass"
FrmRootPass.Button1_Click()
- frmNext = FrmEmbUsrAdd
+ frmNext = FrmUserAdd
- CASE "FrmEmbUsrAdd"
+ CASE "FrmUserAdd"
frmNext = FrmNetConf
+
CASE "FrmNetConf"
MdlNetConf.SET_HOSTNAME
Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form (original)
+++ branches/iVL/FrmRootPass.form Tue Oct 7 12:22:12 2008
@@ -20,14 +20,14 @@
Text = ("")
Password = True
}
- { tlPass2 TextLabel
- MoveScaled(2,37,22,4)
- Text = ("Re-Enter Password")
- }
{ tbPasswd1 TextBox
MoveScaled(29,31,21,3.1667)
Text = ("")
Password = True
+ }
+ { tlPass2 TextLabel
+ MoveScaled(2,37,22,4)
+ Text = ("Re-Enter Password")
}
{ tlPass1 TextLabel
MoveScaled(2,32,22,4)
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Oct 7 12:22:12 2008
@@ -21,10 +21,19 @@
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
+
+ WITH FMain
+ .FrmCurr = ME
+ .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ .tvPlan["Conf3"].Selected = TRUE
+ END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
END WITH
- WAIT 1
+ 'WAIT 3
+
+
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
END
@@ -33,31 +42,63 @@
DIM sCAPS AS String
DIM sCHAR AS String
DIM sLogE AS String
- DIM sPicdir AS String = "/mnt/target/usr/share/apps/kdm/pics/users/"
- DIM sGroups AS String
= "plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
+ DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
+ DIM sGroups AS
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
+ DIM cb AS CheckBox
+
+
IF ME.tbUsername.Text = "" THEN
- Message("Enter a UserName")
+ Message(("Enter the login name that this user will use to login to
this system."))
ELSE
- SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[A-Z]\'" TO sCAPS
+ 'SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[A-Z]\'" TO sCAPS
+ IF ME.tbUsername.text LIKE "*[A-Z]*" THEN
+ 'IF ME.tbUsername.textNOT LIKE "*[a-z0-9_-]*" THEN
+ Message.Error(("Login name field contains illegal characters. Please
use only lowercase letters and numbers"))
+ STOP EVENT
+ 'ELSE IF ME.tbUsernameNOT LIKE "*[a-z0-9_-]*" THEN
+
+
+ END IF
+
SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'" TO
sCHAR
SHELL "grep -e ^" & ME.tbUsername.Text & " /mnt/target/etc/passwd" TO
sLogE
- IF sCAPS <> "" THEN
- Message("Username contains illegal characters (CAPITAL)")
- ELSE IF sCHAR <> "" THEN
- Message("Username contains illegal characters")
+
+ IF sCHAR <> "" THEN
+ Message(("Username contains illegal characters"))
+ STOP EVENT
ELSE IF sLogE <> "" THEN
- Message("Username already exists")
+ Message(("Username already exists"))
+ STOP EVENT
ELSE
IF ME.tbPasswd1.Text = "" THEN
- Message("Enter a Password.")
+ Message(("Enter a Password."))
+ STOP EVENT
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
- IF IsDir(sPicdir) THEN
- SHELL "cd " & sPicdir & " && ln -s root1.png root.face.icon"
- SHELL "cd " & sPicdir & " && ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
+
+ 'IF IsDir(sPicdir) THEN
+ IF bUsePic.Value = TRUE THEN
+ 'SHELL "cd " & sPicdir & " && ln -s root1.png
root.face.icon" ' This needs to go somewhere else
+
+ 'SHELL "cd " & sPicdir & " ; ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
+ SHELL "cd " & sPicdir & "; ln -s " & tbPicPath.Text & Space(1)
& tbUsername.Text & ".face.icon" WAIT
+
ENDIF
+
+ 'COMPILE LIST OF GROUPS THIS USER WILL BELONG TO
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ IF cb.Value = TRUE THEN
+ sGroups = sGroups & "," & cb.Text
+ END IF
+ NEXT
+ sGroups = Right(sGroups, Len(sGroups) - 1)
+ Message(sGroups)
+
+
+
+
SHELL "chroot /mnt/target groupdel " & ME.tbUsername.Text WAIT
SHELL "chroot /mnt/target groupadd -g " & iUID & Space(1) &
ME.tbUsername.Text WAIT
'Message("chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
ME.tbUsername.Text)
@@ -65,9 +106,7 @@
'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
Message("user " & ME.tbUsername.Text & " was created.")
- ME.tbUsername.Clear
- ME.tbPasswd1.Clear
- ME.tbPasswd2.Clear
+ btClrFrm_Click() ' clear the form
INC iUID
ELSE
Message("Passwords do not match")
@@ -80,7 +119,7 @@
SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
Message("Vectorlinux has been installed click OK to reboot")
- SHELL "reboot"
+ 'SHELL "reboot"
END
@@ -95,7 +134,7 @@
.tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
.tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width)
- .TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2)
+ .TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2.5)
.tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.75)
iboxleft = .tbUsername.Left
@@ -106,10 +145,12 @@
.tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth)
.TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height +
2, .TextLabel2.Width)
.tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth)
- .tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
2, .TextLabel2.Width)
- .cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
- .tbUsrID.Move(.cbUserID.Left + .cbUserID.Width + 4, .cbUserID.top,
iboxwidth - (.cbUserID.Width + 4))
- .bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 8,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
+ '.tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
2, .TextLabel2.Width)
+ '.cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
+ '.tbUsrID.Move(.cbUserID.Left + .cbUserID.Width + 4, .cbUserID.top,
iboxwidth - (.cbUserID.Width + 4))
+ .bUsePic.Move(4, .tbPasswd2.top + .tbPasswd2.Height + 4,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
+ '.tbPicPath.Move(4,.tb
+ '.bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 8,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
.tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height +
2, .TextLabel2.Width + iboxwidth + 8)
'.tbPicPath.Move(4, .bUsePic.top + .bUsePic.height +
2, .tlBanner.Width - (.btBrowse.Width + 4))
.btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top,
MdlObjSizer.get_object_width(.btBrowse.text) + 36)
@@ -118,21 +159,7 @@
.btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
'.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
-
-
-
-
-
- '.Frame1.Move(4, 4, .ClientWidth - (.Frame1.left * 2), .ClientHeight -
(.Frame1.Height * 2))
-' .TextLabel1.Move(4, 12, .Frame1.Width - (.TextLabel1.Left * 2))
-
- ' .TextLabel2.Move(4, .TextLabel1.top + .TextLabel1.Height + 16, 130)
- ' .tbUsername.Move(.TextLabel2.left + .TextLabel2.Width +
4, .TextLabel2.top, 150)
- ' .TextLabel3.Move(4, .TextLabel2.top + .TextLabel2.Height + 4, 130)
- ' .tbPasswd1.Move(.TextLabel3.left + .TextLabel3.Width +
4, .TextLabel3.top, 150)
- ' .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.Height + 4, 130)
- ' .tbPasswd2.Move(.TextLabel4.left + .TextLabel4.Width +
4, .TextLabel4.top, 150)
- ' .Button1.Move(.TextLabel4.left, .TextLabel4.top + .TextLabel4.Height
+ 8, MdlObjSizer.get_object_width(.button1.text) + 24)
+ .btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
@@ -146,15 +173,7 @@
END
-PUBLIC SUB cbUserID_Click()
- IF Trim(cbUserID.text) = ("Auto") THEN
- ME.tbUsrID.Visible = FALSE
- ELSE
- ME.tbUsrID.Visible = TRUE
-END IF
-
-END
PUBLIC SUB bUsePic_Click()
@@ -199,5 +218,39 @@
cb.Delete
NEXT
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS
+
+END
+
+PUBLIC SUB tbPasswd2_LostFocus()
+
+ ' run a test here to see if passwords match
+ IF tbPasswd1.Text <> tbPasswd2.Text THEN
+ Message.Error(("Your password selections do not match. Please enter
the same password twice"))
+ END IF
+ STOP EVENT
+
+END
+
+PUBLIC SUB tbUsername_KeyRelease()
+
+ IF Key.text = Space(1) THEN
+ tbUsername.Text = Replace(tbUsername.text, Space(1), "")
+ END IF
+
+END
+
+PUBLIC SUB btBrowse_Enter()
+
+ 'Balloon.Info("Test message in a ballooon control here", fGroupSel)
+
+END
+
+PUBLIC SUB btgrpHelp_Click()
+
+ DIM sMsg AS String = "<h3>" & fGroupSel.Text & "</h3>" & "<br><br>" &
+ ("Groups are a way of administering permissions for your users. You
grant the user") & "<br>" &
+ ("permission to do certain things by adding them to certain groups.")
& "<br><br>" &
+ ("Select which groups you want this user to be a part of here")
+ Message(sMsg, ("OK"))
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Tue Oct 7 12:22:12 2008
@@ -25,20 +25,9 @@
Text = ("")
Password = True
}
- { cbUserID ComboBox
- MoveScaled(16,31,16,3)
- Text = ("")
- ReadOnly = True
- List = [("Auto"), ("Manual")]
- }
- { tbUsrID TextBox
- MoveScaled(34,31,13,3)
- Visible = False
- Text = ("")
- }
{ bUsePic CheckBox
MoveScaled(2,35,45,3)
- Text = ("User Picture ID for Login greeting")
+ Text = ("Use Picture ID for Login greeting")
}
{ tbPicPath TextBox
MoveScaled(2,39,55,3)
@@ -54,6 +43,11 @@
{ fGroupSel Frame
MoveScaled(2,44,69,17)
Text = ("User Rights Management")
+ { btgrpHelp Button
+ MoveScaled(58,2,9,3)
+ Text = ("Help")
+ Picture = Picture["icon:/16/help"]
+ }
}
{ Button1 Button
MoveScaled(1,63,14,3)
@@ -67,7 +61,7 @@
}
{ TextLabel2 TextLabel
MoveScaled(2,18,12,3)
- Text = ("Username")
+ Text = ("Login Name")
Alignment = Align.Normal
}
{ TextLabel3 TextLabel
@@ -86,11 +80,6 @@
}
{ hrSep Separator
MoveScaled(30,8,12,1)
- }
- { tlUserID TextLabel
- MoveScaled(2,31,12,3)
- Text = ("User ID")
- Alignment = Align.BottomLeft
}
{ pbUsrPic PictureBox
MoveScaled(58,21,8,8)
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Tue Oct 7 12:22:12 2008
@@ -38,14 +38,14 @@
END
-PUBLIC SUB Button1_Click()
-' THis is not necessary, since the next button on the main window handles
this
-
- MdlZoneSet.SET_ZONE(ME.lbTmZone.Text)
- MdlZoneSet.WRITE_CONF()
- 'Message("TimeZone " & ME.lbTmZone.Text & " Was set.")
-
-END
+' ' ' PUBLIC SUB Button1_Click()
+' ' ' ' THis is not necessary, since the next button on the main window
handles this
+' ' '
+' ' ' MdlZoneSet.SET_ZONE(ME.lbTmZone.Text)
+' ' ' MdlZoneSet.WRITE_CONF()
+' ' ' 'Message("TimeZone " & ME.lbTmZone.Text & " Was set.")
+' ' '
+' ' ' END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmZoneSet.form
==============================================================================
--- branches/iVL/FrmZoneSet.form (original)
+++ branches/iVL/FrmZoneSet.form Tue Oct 7 12:22:12 2008
@@ -3,11 +3,6 @@
{ Form Form
MoveScaled(0,0,81,55)
Text = ("")
- { Button1 Button
- MoveScaled(49,46,12,3)
- Visible = False
- Text = ("Set TimeZone")
- }
{ lbTmZone ListBox
MoveScaled(1,23,32,23)
}
@@ -16,7 +11,7 @@
Text = ("Choose the correct timezone for the area in which you live.")
}
{ cbHwClock ComboBox
- MoveScaled(1,15,34,3.4286)
+ MoveScaled(1,15,34,3.3333)
Text = ("ComboBox1")
ReadOnly = True
List = [("LocalTime"), ("UTC")]
@@ -26,7 +21,7 @@
Text = ("Choose how\nyour hardware clock is set up.\nChoose UTC if you
know that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way.")
}
{ tlbanner TextLabel
- MoveScaled(2,1,27,3.4286)
+ MoveScaled(2,1,27,3.3333)
Text = ("")
}
{ hrsep Separator
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Tue Oct 7 12:22:12 2008
@@ -17,7 +17,7 @@
PUBLIC objGrps AS Object[]
PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
-DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,game,adm,sys,wheel"
+DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,game,adm,sys,wheel,plugdev,disk"
DIM sGrpArr AS String[]
DIM i AS Integer
DIM sLabel, sComment, sToolTip AS String
@@ -63,6 +63,12 @@
CASE "wheel"
sComment = ("Elite user")
bdefval = FALSE
+ CASE "plugdev"
+ sComment = ("Allow user to mount / un-mount Pendrive (USB Sticks)")
+ bdefval = TRUE
+ CASE "disk"
+ sComment = ("Allow user to mount / un-mount Removable HD Storage
Devices")
+ bdefval = TRUE
END SELECT
'x = 4
IF htotal > FrmUserAdd.width THEN
@@ -90,3 +96,10 @@
END
+
+PUBLIC FUNCTION CREATE_NEW_ACCOUNT()
+
+
+
+END
+
|
|
From: <cod...@go...> - 2008-10-07 14:48:08
|
Author: M0...@gm...
Date: Tue Oct 7 07:42:40 2008
New Revision: 215
Modified:
branches/iVL/DevLog
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/MdlUsrAdd.module
Log:
- User Add window is designed
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Oct 7 07:42:40 2008
@@ -1 +1 @@
-- Begin development in the user add section
\ No newline at end of file
+- User Add window is designed
\ No newline at end of file
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Oct 7 07:42:40 2008
@@ -24,6 +24,8 @@
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
END WITH
+ WAIT 1
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
END
@@ -95,18 +97,27 @@
.tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width)
.TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2)
.tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.75)
+
iboxleft = .tbUsername.Left
iboxwidth = .tbUsername.Width
- .TextLabel3.Move(4, .TextLabel2.top + .TextLabel2.Height +
4, .TextLabel2.Width)
+ .tlRealName.Move(4, .TextLabel2.top + .TextLabel2.Height +
2, .TextLabel2.Width)
+ .tbRealname.Move(iboxleft, .tlRealName.top, iboxwidth)
+ .TextLabel3.Move(4, .tlRealName.top + .tlRealName.Height +
2, .TextLabel2.Width)
.tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth)
- .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height +
4, .TextLabel2.Width)
+ .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height +
2, .TextLabel2.Width)
.tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth)
- .tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
4, .TextLabel2.Width)
+ .tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
2, .TextLabel2.Width)
.cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
.tbUsrID.Move(.cbUserID.Left + .cbUserID.Width + 4, .cbUserID.top,
iboxwidth - (.cbUserID.Width + 4))
- .bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 4,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
+ .bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 8,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
.tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height +
2, .TextLabel2.Width + iboxwidth + 8)
+ '.tbPicPath.Move(4, .bUsePic.top + .bUsePic.height +
2, .tlBanner.Width - (.btBrowse.Width + 4))
.btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top,
MdlObjSizer.get_object_width(.btBrowse.text) + 36)
+ .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + .Button1.Height
+ .Button1.height))
+ .Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8,
MdlObjSizer.get_object_width(.Button1.Text) + 36)
+ .btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
+ '.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
+ .pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
@@ -157,5 +168,36 @@
PUBLIC SUB Form_Menu()
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
+
+END
+
+PUBLIC SUB btBrowse_Click()
+'ClsGlobal.sTargetMnt = "/"
+ 'IF Dialog.OpenFile() THEN RETURN
+ Dialog.Title = ("Select picture for user Login")
+ Dialog.path = ClsGlobal.sTargetMnt &/ "usr" &/ "share" &/ "apps"
&/ "kdm" &/ "pics" &/ "users"
+ Dialog.Filter = ["*.png", "Picture Files", "*.jpg", "JPEG Graphics"]
+ IF Dialog.OpenFile() THEN RETURN
+ tbPicPath.text = Replace(Dialog.path, ClsGlobal.sSourceMnt, "")
+ ME.pbUsrPic.Picture = Picture[Dialog.Path]
+
+' END IF
+
+END
+
+PUBLIC SUB btClrFrm_Click()
+DIM cb AS CheckBox
+
+ WITH ME
+ .tbPasswd1.Clear
+ .tbPasswd2.Clear
+ .tbRealname.Clear
+ .tbPicPath.Clear
+ .tbUsername.Clear
+ END WITH
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ cb.Delete
+ NEXT
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Tue Oct 7 07:42:40 2008
@@ -4,22 +4,16 @@
MoveScaled(0,0,76,67)
Text = ("")
{ tlExp TextLabel
- MoveScaled(3,12,55,8)
+ MoveScaled(1,9,55,8)
Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
}
{ tbUsername TextBox
- MoveScaled(23,20,15,3)
+ MoveScaled(16,18,15,3)
Text = ("")
}
- { TextLabel2 TextLabel
- MoveScaled(2,21,12,3)
- Text = ("Username")
- Alignment = Align.Normal
- }
- { TextLabel3 TextLabel
- MoveScaled(2,24,16,3)
- Text = ("Enter Password")
- Alignment = Align.Normal
+ { tbRealname TextBox
+ MoveScaled(17,21,15,3)
+ Text = ("")
}
{ tbPasswd1 TextBox
MoveScaled(16,24,16,3)
@@ -31,29 +25,8 @@
Text = ("")
Password = True
}
- { TextLabel4 TextLabel
- MoveScaled(2,27,14,3)
- Text = ("ReEnter Password")
- Alignment = Align.Normal
- }
- { Button1 Button
- MoveScaled(1,63,14,1)
- Text = ("Create User")
- }
- { tlBanner TextLabel
- MoveScaled(1,2,55,4)
- Text = ("")
- }
- { hrSep Separator
- MoveScaled(30,8,12,1)
- }
- { tlUserID TextLabel
- MoveScaled(2,31,12,3)
- Text = ("User ID")
- Alignment = Align.Normal
- }
{ cbUserID ComboBox
- MoveScaled(16,31,16,2)
+ MoveScaled(16,31,16,3)
Text = ("")
ReadOnly = True
List = [("Auto"), ("Manual")]
@@ -81,5 +54,51 @@
{ fGroupSel Frame
MoveScaled(2,44,69,17)
Text = ("User Rights Management")
+ }
+ { Button1 Button
+ MoveScaled(1,63,14,3)
+ Text = ("Create User")
+ Picture = Picture["icon:/16/add"]
+ }
+ { btClrFrm Button
+ MoveScaled(17,63,12,3)
+ Text = ("Clear Form")
+ Picture = Picture["icon:/16/clear"]
+ }
+ { TextLabel2 TextLabel
+ MoveScaled(2,18,12,3)
+ Text = ("Username")
+ Alignment = Align.Normal
+ }
+ { TextLabel3 TextLabel
+ MoveScaled(2,24,16,3)
+ Text = ("Enter Password")
+ Alignment = Align.Normal
+ }
+ { TextLabel4 TextLabel
+ MoveScaled(2,27,14,3)
+ Text = ("ReEnter Password")
+ Alignment = Align.Normal
+ }
+ { tlBanner TextLabel
+ MoveScaled(1,2,55,4)
+ Text = ("")
+ }
+ { hrSep Separator
+ MoveScaled(30,8,12,1)
+ }
+ { tlUserID TextLabel
+ MoveScaled(2,31,12,3)
+ Text = ("User ID")
+ Alignment = Align.BottomLeft
+ }
+ { pbUsrPic PictureBox
+ MoveScaled(58,21,8,8)
+ Stretch = True
+ }
+ { tlRealName TextLabel
+ MoveScaled(2,21,12,3)
+ Text = ("Real Name")
+ Alignment = Align.Normal
}
}
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Tue Oct 7 07:42:40 2008
@@ -22,45 +22,66 @@
DIM i AS Integer
DIM sLabel, sComment, sToolTip AS String
DIM cb AS CheckBox
-DIM x, y AS Integer
+DIM x, y, htotal AS Integer
+DIM bdefval AS Boolean
objGrps = NEW Object[]
sGrpArr = Split(sGrpList, ",")
+
+y = 24
+x = 4
FOR i = 0 TO sGrpArr.Count - 1
sLabel = Trim(sGrpArr[i])
SELECT CASE sLabel
CASE "cdrom"
sComment = ("This user can access CD/DVD devices")
+ bdefval = TRUE
CASE "floppy"
sComment = ("This user can access floppy disks")
+ bdefval = TRUE
CASE "lp"
sComment = ("This user is allowed to print")
+ bdefval = TRUE
CASE "scanner"
sComment = ("This user can access scanner devices")
+ bdefval = TRUE
CASE "audio"
sComment = ("This user is allowed to change audio settings")
+ bdefval = TRUE
CASE "video"
sComment = ("This user is allowed to change video settings")
+ bdefval = TRUE
CASE "game"
sComment = ("This user is allowed to play restricted games")
+ bdefval = TRUE
CASE "adm"
sComment = ("Restricted administrator (backup)")
+ bdefval = FALSE
CASE "sys"
sComment = ("This user is a system administrator")
+ bdefval = FALSE
CASE "wheel"
sComment = ("Elite user")
+ bdefval = FALSE
END SELECT
- x = 4
- y = 12
+ 'x = 4
+ IF htotal > FrmUserAdd.width THEN
+ x = 4
+ y = y + 24
+ htotal = x
+ END IF
+ 'y = 12
cb = NEW CheckBox(FrmUserAdd.fGroupSel)
WITH cb
.text = sLabel
- .Value = FALSE
- .Height = 18
+ .Value = bdefval
+ .Height = 21
.Width = MdlObjSizer.get_object_width(.text) + 24
.Move(x, y)
.ToolTip = sComment
- y = y + 4
+ 'y = y + cb.Height
+ x = x + 100
+ htotal = htotal + x
END WITH
objGrps.Add(cb)
'y = y + cb.Height + 4
|
|
From: <cod...@go...> - 2008-10-06 23:36:56
|
Author: m0e.lnx
Date: Mon Oct 6 14:32:59 2008
New Revision: 214
Added:
branches/iVL/MdlUsrAdd.module
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
Log:
- Begin development in the user add section
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Oct 6 14:32:59 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/.project
+# /home/remote/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Oct 6 14:32:59 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmUserAdd
Version=0.0.102
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Mon Oct 6 14:32:59 2008
@@ -1 +1 @@
-- Fixed progressbar values for custom installation.
\ No newline at end of file
+- Begin development in the user add section
\ No newline at end of file
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Mon Oct 6 14:32:59 2008
@@ -1,8 +1,29 @@
' 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/>.
+
+
PUBLIC iUID AS Integer = 1000
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
+ WITH ME
+ .tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
+ END WITH
END
@@ -62,18 +83,45 @@
PUBLIC SUB Form_Resize()
+
+ DIM iboxleft AS Integer
+ DIM iboxwidth AS Integer
+
- WITH ME
- .Frame1.Move(4, 4, .ClientWidth - (.Frame1.left * 2), .ClientHeight -
(.Frame1.Height * 2))
- .TextLabel1.Move(4, 12, .Frame1.Width - (.TextLabel1.Left * 2))
+ WITH ME
+
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
+ .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width)
+ .TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2)
+ .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.75)
+ iboxleft = .tbUsername.Left
+ iboxwidth = .tbUsername.Width
+ .TextLabel3.Move(4, .TextLabel2.top + .TextLabel2.Height +
4, .TextLabel2.Width)
+ .tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth)
+ .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height +
4, .TextLabel2.Width)
+ .tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth)
+ .tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
4, .TextLabel2.Width)
+ .cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
+ .tbUsrID.Move(.cbUserID.Left + .cbUserID.Width + 4, .cbUserID.top,
iboxwidth - (.cbUserID.Width + 4))
+ .bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 4,
MdlObjSizer.get_object_width(.bUsePic.Text) + 36)
+ .tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height +
2, .TextLabel2.Width + iboxwidth + 8)
+ .btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top,
MdlObjSizer.get_object_width(.btBrowse.text) + 36)
+
+
+
+
+
+ '.Frame1.Move(4, 4, .ClientWidth - (.Frame1.left * 2), .ClientHeight -
(.Frame1.Height * 2))
+' .TextLabel1.Move(4, 12, .Frame1.Width - (.TextLabel1.Left * 2))
- .TextLabel2.Move(4, .TextLabel1.top + .TextLabel1.Height + 16, 130)
- .tbUsername.Move(.TextLabel2.left + .TextLabel2.Width +
4, .TextLabel2.top, 150)
- .TextLabel3.Move(4, .TextLabel2.top + .TextLabel2.Height + 4, 130)
- .tbPasswd1.Move(.TextLabel3.left + .TextLabel3.Width +
4, .TextLabel3.top, 150)
- .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.Height + 4, 130)
- .tbPasswd2.Move(.TextLabel4.left + .TextLabel4.Width +
4, .TextLabel4.top, 150)
- .Button1.Move(.TextLabel4.left, .TextLabel4.top + .TextLabel4.Height +
8, MdlObjSizer.get_object_width(.button1.text) + 24)
+ ' .TextLabel2.Move(4, .TextLabel1.top + .TextLabel1.Height + 16, 130)
+ ' .tbUsername.Move(.TextLabel2.left + .TextLabel2.Width +
4, .TextLabel2.top, 150)
+ ' .TextLabel3.Move(4, .TextLabel2.top + .TextLabel2.Height + 4, 130)
+ ' .tbPasswd1.Move(.TextLabel3.left + .TextLabel3.Width +
4, .TextLabel3.top, 150)
+ ' .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.Height + 4, 130)
+ ' .tbPasswd2.Move(.TextLabel4.left + .TextLabel4.Width +
4, .TextLabel4.top, 150)
+ ' .Button1.Move(.TextLabel4.left, .TextLabel4.top + .TextLabel4.Height
+ 8, MdlObjSizer.get_object_width(.button1.text) + 24)
@@ -84,5 +132,30 @@
PUBLIC SUB tbUsername_KeyPress()
+
+END
+
+PUBLIC SUB cbUserID_Click()
+
+ IF Trim(cbUserID.text) = ("Auto") THEN
+ ME.tbUsrID.Visible = FALSE
+ ELSE
+ ME.tbUsrID.Visible = TRUE
+END IF
+
+END
+
+PUBLIC SUB bUsePic_Click()
+
+ WITH ME
+ .tbPicPath.Visible = bUsePic.Value
+ .btBrowse.Visible = .bUsePic.Value
+ END WITH
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Mon Oct 6 14:32:59 2008
@@ -1,44 +1,85 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,72,47)
+ MoveScaled(0,0,76,67)
Text = ("")
- { Frame1 Frame
- MoveScaled(1,2,62,37)
- Text = ("Add Users")
- { TextLabel1 TextLabel
- MoveScaled(2,2,55,8)
- Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
- }
- { TextLabel2 TextLabel
- MoveScaled(2,17,12,3)
- Text = ("Username")
- }
- { tbUsername TextBox
- MoveScaled(14,17,15,3)
- Text = ("")
- }
- { TextLabel3 TextLabel
- MoveScaled(2,20,16,3)
- Text = ("Enter Password")
- }
- { tbPasswd1 TextBox
- MoveScaled(16,20,16,3)
- Text = ("")
- Password = True
- }
- { TextLabel4 TextLabel
- MoveScaled(2,23,14,3)
- Text = ("ReEnter Password")
- }
- { tbPasswd2 TextBox
- MoveScaled(16,23,16,3)
- Text = ("")
- Password = True
- }
- { Button1 Button
- MoveScaled(2,27,14,1)
- Text = ("Create User")
- }
+ { tlExp TextLabel
+ MoveScaled(3,12,55,8)
+ Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
+ }
+ { tbUsername TextBox
+ MoveScaled(23,20,15,3)
+ Text = ("")
+ }
+ { TextLabel2 TextLabel
+ MoveScaled(2,21,12,3)
+ Text = ("Username")
+ Alignment = Align.Normal
+ }
+ { TextLabel3 TextLabel
+ MoveScaled(2,24,16,3)
+ Text = ("Enter Password")
+ Alignment = Align.Normal
+ }
+ { tbPasswd1 TextBox
+ MoveScaled(16,24,16,3)
+ Text = ("")
+ Password = True
+ }
+ { tbPasswd2 TextBox
+ MoveScaled(16,27,16,3)
+ Text = ("")
+ Password = True
+ }
+ { TextLabel4 TextLabel
+ MoveScaled(2,27,14,3)
+ Text = ("ReEnter Password")
+ Alignment = Align.Normal
+ }
+ { Button1 Button
+ MoveScaled(1,63,14,1)
+ Text = ("Create User")
+ }
+ { tlBanner TextLabel
+ MoveScaled(1,2,55,4)
+ Text = ("")
+ }
+ { hrSep Separator
+ MoveScaled(30,8,12,1)
+ }
+ { tlUserID TextLabel
+ MoveScaled(2,31,12,3)
+ Text = ("User ID")
+ Alignment = Align.Normal
+ }
+ { cbUserID ComboBox
+ MoveScaled(16,31,16,2)
+ Text = ("")
+ ReadOnly = True
+ List = [("Auto"), ("Manual")]
+ }
+ { tbUsrID TextBox
+ MoveScaled(34,31,13,3)
+ Visible = False
+ Text = ("")
+ }
+ { bUsePic CheckBox
+ MoveScaled(2,35,45,3)
+ Text = ("User Picture ID for Login greeting")
+ }
+ { tbPicPath TextBox
+ MoveScaled(2,39,55,3)
+ Visible = False
+ Text = ("")
+ }
+ { btBrowse Button
+ MoveScaled(57,39,10,3)
+ Visible = False
+ Text = ("Select")
+ Picture = Picture["icon:/16/directory"]
+ }
+ { fGroupSel Frame
+ MoveScaled(2,44,69,17)
+ Text = ("User Rights Management")
}
}
Added: branches/iVL/MdlUsrAdd.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlUsrAdd.module Mon Oct 6 14:32:59 2008
@@ -0,0 +1,71 @@
+' Gambas module 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/>.
+PUBLIC objGrps AS Object[]
+
+PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
+DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,game,adm,sys,wheel"
+DIM sGrpArr AS String[]
+DIM i AS Integer
+DIM sLabel, sComment, sToolTip AS String
+DIM cb AS CheckBox
+DIM x, y AS Integer
+
+objGrps = NEW Object[]
+sGrpArr = Split(sGrpList, ",")
+FOR i = 0 TO sGrpArr.Count - 1
+ sLabel = Trim(sGrpArr[i])
+ SELECT CASE sLabel
+ CASE "cdrom"
+ sComment = ("This user can access CD/DVD devices")
+ CASE "floppy"
+ sComment = ("This user can access floppy disks")
+ CASE "lp"
+ sComment = ("This user is allowed to print")
+ CASE "scanner"
+ sComment = ("This user can access scanner devices")
+ CASE "audio"
+ sComment = ("This user is allowed to change audio settings")
+ CASE "video"
+ sComment = ("This user is allowed to change video settings")
+ CASE "game"
+ sComment = ("This user is allowed to play restricted games")
+ CASE "adm"
+ sComment = ("Restricted administrator (backup)")
+ CASE "sys"
+ sComment = ("This user is a system administrator")
+ CASE "wheel"
+ sComment = ("Elite user")
+END SELECT
+ x = 4
+ y = 12
+cb = NEW CheckBox(FrmUserAdd.fGroupSel)
+ WITH cb
+ .text = sLabel
+ .Value = FALSE
+ .Height = 18
+ .Width = MdlObjSizer.get_object_width(.text) + 24
+ .Move(x, y)
+ .ToolTip = sComment
+ y = y + 4
+ END WITH
+ objGrps.Add(cb)
+ 'y = y + cb.Height + 4
+NEXT
+
+
+
+END
|
|
From: <cod...@go...> - 2008-10-06 19:18:21
|
Author: m0e.lnx
Date: Mon Oct 6 12:13:55 2008
New Revision: 213
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/DevLog
branches/iVL/FrmLangSel.class
branches/iVL/FrmPkgsel2.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
Log:
- Fixed progressbar values for custom installation.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsGlobal.class
+# /home/remote/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsPartSel.class
+# /home/remote/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsWinDrives.class
+# /home/remote/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FMain.class
+# /home/remote/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmDiskPart.class
+# /home/remote/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmLicense.class
+# /home/remote/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartScheme.class
+# /home/remote/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartSel.class
+# /home/remote/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPkgSel.class
+# /home/remote/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSelISO.class
+# /home/remote/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSummary.class
+# /home/remote/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmWinDrives.class
+# /home/remote/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlCore.module
+# /home/remote/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlDiskPart.module
+# /home/remote/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlObjSizer.module
+# /home/remote/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPartSel.module
+# /home/remote/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPkgSel.module
+# /home/remote/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSetup.module
+# /home/remote/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSummarize.module
+# /home/remote/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Mon Oct 6 12:13:55 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlWinDrives.module
+# /home/remote/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Mon Oct 6 12:13:55 2008
@@ -1,2 +1 @@
-- Fixed problem with prograssbar while installing packages and
packages/required for full install
-- Fixed progressbar meter at installing CONF packages
+- Fixed progressbar values for custom installation.
\ No newline at end of file
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Mon Oct 6 12:13:55 2008
@@ -55,3 +55,10 @@
FMain.btnext.Enabled = TRUE
END
+
+PUBLIC SUB lbLangSel_KeyRelease()
+
+
+
+
+END
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Mon Oct 6 12:13:55 2008
@@ -62,6 +62,6 @@
PUBLIC SUB Form_Hide()
- FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Mon Oct 6 12:13:55 2008
@@ -46,7 +46,7 @@
iRet = ME.INSTALL_USER_SELECTED_BULKS()
'Message("Installing user-selected bulks")
- PRINT "INSTALING USER-SELECTED BULK PACKAGES"
+ PRINT "INSTALING USER-SELECTED BULKS"
IF iRet <> 0 THEN
Message.Error(("There has been an error while installing optional
software to your system. ") & gb.newline & sErr)
RETURN
@@ -61,8 +61,12 @@
END IF
'iret = ME.INSTALL_PACKAGES_REQUIRED()
+ ' Make sure we set the right value for the progress bar here
+ MdlInstallSys.iPkgCnt = iPkgCnt
+ MdlInstallSys.iPkgNum = iPkgNum
iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
+
IF iret <> 0 THEN
Message.Error(("Error while installing required system software. ") &
gb.NewLine & sErr)
RETURN
@@ -197,150 +201,228 @@
' ' END
-PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer
-
- DIM i, iRet AS Integer
- DIM sPkg AS String
-
- FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages" &/ "required")
- SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ sPkg)
- CASE "tlz", "tgz"
- PRINT " + Install " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg
- iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" &/ "required" &/
sPkg & " is installed"
- END SELECT
- NEXT
-END
-
-PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES() AS Integer
-
- DIM i AS Integer
- DIM sFile AS String[]
- DIM sLine AS String
- DIM sRawFile AS String
- DIM sTlzPath AS String
- DIM sTlzName AS String
- DIM sTlzDesc AS String
- DIM iTlzSize AS Integer
- DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
- DIM sTargetSize AS Variant
- DIM cb AS CheckBox
- DIM sName AS String
-
- sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
-
- sFile = Split(sRawFile, "\n")
-
- FOR EACH cb IN MdlPkgSel.Pkgs
- sName = Trim(cb.text)
-
-
- FOR i = 0 TO sFile.count - 1
- sLine = Trim(sFile[i])
- IF InStr(sLine, sName) THEN
- IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
- sTlzName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
- sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
- sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
- iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
- 'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
- 'iTlzSize = Trim(iTlzSize)
- FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName
& " ..."
- FrmInstallSys.pbInstallProg.Value = 0.0
-
- 'IF sTlzName = sName THEN
-
-
- PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
- ' install each package
- SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO sTargetSize
- sTargetSize = Trim(CStr(sTargetSize))
- SHELL "echo \"\" > /tmp/installdump" WAIT
- sDump = ""
- sErr = ""
- 'hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" WAIT 'FOR READ
- WAIT 1
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 1
- MdlInstallSys.UPDATE_STEP_PROGRESS(sTargetSize,
iTlzSize)
-
- ' figure out the progress again
-
- UNTIL
- hproc.State = Process.Stopped
- sDump = File.Load("/tmp/installdump")
-
- IF InStr(sDump, "FAILED") > 0 THEN
- ERROR
- RETURN 1
- ELSE
- IF FrmInstallSys.pbInstallProg.Value <> 1 THEN
- FrmInstallSys.pbInstallProg.Value = 1
- END IF
- END IF
- END IF
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- END IF
- END IF
- NEXT
- NEXT
-END
-
-
-
-
-' ' ' PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES_OLD() AS Integer
-' ' '
-' ' ' DIM i, iret AS Integer
+' ' ' PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer
+' ' '
+' ' ' DIM i, iRet AS Integer
' ' ' DIM sPkg AS String
-' ' ' DIM cb AS CheckBox
-' ' ' DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
-' ' ' DIM sPkgLoc AS String
-' ' ' DIM sFile AS String[]
-' ' ' DIM sLine AS String
-' ' ' DIM sConfig AS String
+' ' ' DIM sDump AS String
' ' ' DIM ii AS Integer
-' ' ' ' needs to read PACKAES.TXT to get package name and location
+' ' ' FOR EACH spkg IN RDir(ClsGlobal.sSetupConfPath &/ "packages"
&/ "required", "t?z")
+' ' ' INC ii
+' ' ' NEXT
' ' '
-' ' ' 'sFile = Split(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"), "\n")
-' ' ' ii = 0
-' ' ' sConfig = "WORKINGDIR=" & ClsGlobal.sTargetMnt &/ "home"
&/ "ftp" &/ "pub" &/ "veclinux" & "\n" &
-' ' ' "SOURCE=" & ClsGlobal.sSourceMnt &/ "packages"
+' ' ' i = 0
+' ' ' FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages"
&/ "required")
+' ' ' SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg)
+' ' ' CASE "tlz", "tgz"
+' ' ' INC i
+' ' ' PRINT " + Install " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg
+' ' ' 'iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg)
+' ' ' SHELL "echo \"\" > /tmp/installdump" WAIT
' ' '
-' ' ' File.Save(Temp("sources"))
-' ' ' IF Exist(ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux") =
FALSE THEN
-' ' ' MKDIR ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux"
-' ' ' END IF
-' ' ' SHELL "slapt-get -u -c " & Temp("sources") WAIT
-' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' IF cb.value = TRUE THEN
-' ' ' 'spkg = cb.Text
-' ' ' INC ii
-' ' ' NEXT
-' ' '
-' ' ' ' now to install them
-' ' '
-' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' IF cb.Value = TRUE THEN
-' ' ' sPkg =
-' ' '
-' ' '
-' ' ' FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
-' ' ' sPkg = ClsPkgSel.arrPkgs[i]
-' ' ' PRINT " + Install " & sPkgPath &/ sPkg
-' ' ' iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
-' ' ' IF iret <> 0 THEN
-' ' ' RETURN iret
-' ' ' END IF
-' ' ' PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+' ' ' hproc = SHELL "installpkg " & ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg & " -R " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump"
+' ' ' WAIT 1
+' ' ' IF hproc.State = Process.Running THEN
+' ' ' REPEAT
+' ' ' WAIT
+' ' ' UNTIL hproc.State = Process.Stopped
+' ' ' END IF
+' ' ' sDump = File.Load("/tmp/installdump")
+' ' ' IF InStr(sDump, "FAILED") THEN
+' ' ' RETURN 1
+' ' ' END IF
+' ' '
+' ' ' PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ sPkg & " is installed"
+' ' ' FrmInstallSys.pbInstallProg.Value = i / ii
+' ' '
+' ' ' INC iPkgNum
+' ' '
+' ' ' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+' ' ' END SELECT
' ' ' NEXT
' ' ' END
+
+PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES() AS Integer
+ DIM cb AS CheckBox
+ DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
+ DIM iStepTotal AS Integer = 0
+ DIM i AS Integer = 0
+ DIM sDump AS String
+
+ 'Message.Info("Begin installation of user selected software")
+
+ FOR EACH cb IN MdlPkgSel.Pkgs
+ IF cb.value = TRUE THEN
+ INC iStepTotal
+ END IF
+ NEXT
+
+
+
+ FOR EACH cb IN MdlPkgSel.Pkgs
+ IF cb.Value = TRUE THEN
+ ' we will only measure #/##
+ sDump = ""
+ SHELL "echo \"\" > /tmp/installdump" WAIT
+ 'Message.Info(sBasePath &/ cb.tag)
+ FrmInstallSys.tlCurrPkg.Text = ("Installing user-selected
package") & Space(1) & File.Name(sBasePath &/ cb.Tag)
+ hproc = SHELL "installpkg " & sBasePath &/ cb.tag & Space(1)
& "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo \'FAILED\'
2> /tmp/installdump" 'WAIT
+ '
+ WAIT 1
+ IF hproc.State = Process.running THEN
+ REPEAT
+ WAIT
+ UNTIL hproc.State = Process.Stopped
+ END IF
+ sDump = File.Load("/tmp/installdump")
+ ' update step progress
+ INC i
+ FrmInstallSys.pbInstallProg.Value = i / iStepTotal
+ INC iPkgNum
+ 'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ IF InStr(sDump, "FAILED") > 0 THEN
+ Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
+ RETURN 1
+ ' ELSE
+ ' RETURN 0
+ END IF
+' NEXT
+ 'Message.Warning("Package " & File.Name(sBasePath &/ cb.tag) & "
is installed")
+ END IF
+
+ NEXT
+ 'Message.Info("End installation of user selected software")
+END
+' '
+' '
+' '
+' '
+' ' DIM i AS Integer
+' ' DIM sFile AS String[]
+' ' DIM sLine AS String
+' ' DIM sRawFile AS String
+' ' DIM sTlzPath AS String
+' ' DIM sTlzName AS String
+' ' DIM sTlzDesc AS String
+' ' DIM iTlzSize AS Integer
+' ' DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
+' ' DIM sTargetSize AS Variant
+' ' DIM cb AS CheckBox
+' ' DIM sName AS String
+' '
+' ' sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
+' '
+' ' sFile = Split(sRawFile, "\n")
+' '
+' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' sName = Trim(cb.text)
+' '
+' '
+' ' FOR i = 0 TO sFile.count - 1
+' ' sLine = Trim(sFile[i])
+' ' IF InStr(sLine, sName) THEN
+' ' IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
+' ' sTlzName = Trim(Right(sLine, Len(sLine) -
InStr(sLine, ":")))
+' ' sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
+' ' sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
+' ' iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
+' ' 'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
+' ' 'iTlzSize = Trim(iTlzSize)
+' ' FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName
& " ..."
+' ' FrmInstallSys.pbInstallProg.Value = 0.0
+' '
+' ' 'IF sTlzName = sName THEN
+' ' Message.Info(sTlzName)
+' ' 'RETURN
+' '
+' ' PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
+' ' ' install each package
+' ' SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & "
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+' ' sTargetSize = Trim(CStr(sTargetSize))
+' ' SHELL "echo \"\" > /tmp/installdump" WAIT
+' ' sDump = ""
+' ' sErr = ""
+' ' 'hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR
READ
+' ' hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" WAIT 'FOR READ
+' ' WAIT 1
+' ' IF hproc.State = Process.Running THEN
+' ' REPEAT
+' ' WAIT 1
+' ' MdlInstallSys.UPDATE_STEP_PROGRESS(sTargetSize,
iTlzSize)
+' '
+' ' ' figure out the progress again
+' '
+' ' UNTIL
+' ' hproc.State = Process.Stopped
+' ' sDump = File.Load("/tmp/installdump")
+' '
+' ' IF InStr(sDump, "FAILED") > 0 THEN
+' ' ERROR
+' ' RETURN 1
+' ' ELSE
+' ' IF FrmInstallSys.pbInstallProg.Value <> 1
THEN
+' ' FrmInstallSys.pbInstallProg.Value = 1
+' ' END IF
+' ' END IF
+' ' END IF
+' ' INC iPkgNum
+' ' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+' ' END IF
+' ' END IF
+' ' NEXT
+' ' NEXT
+' ' END
+' '
+' '
+' '
+' '
+' ' ' ' ' PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES_OLD() AS Integer
+' ' ' ' '
+' ' ' ' ' DIM i, iret AS Integer
+' ' ' ' ' DIM sPkg AS String
+' ' ' ' ' DIM cb AS CheckBox
+' ' ' ' ' DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
+' ' ' ' ' DIM sPkgLoc AS String
+' ' ' ' ' DIM sFile AS String[]
+' ' ' ' ' DIM sLine AS String
+' ' ' ' ' DIM sConfig AS String
+' ' ' ' ' DIM ii AS Integer
+' ' ' ' ' ' needs to read PACKAES.TXT to get package name and
location
+' ' ' ' '
+' ' ' ' ' 'sFile = Split(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"), "\n")
+' ' ' ' ' ii = 0
+' ' ' ' ' sConfig = "WORKINGDIR=" & ClsGlobal.sTargetMnt &/ "home"
&/ "ftp" &/ "pub" &/ "veclinux" & "\n" &
+' ' ' ' ' "SOURCE=" & ClsGlobal.sSourceMnt &/ "packages"
+' ' ' ' '
+' ' ' ' ' File.Save(Temp("sources"))
+' ' ' ' ' IF Exist(ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux")
= FALSE THEN
+' ' ' ' ' MKDIR ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux"
+' ' ' ' ' END IF
+' ' ' ' ' SHELL "slapt-get -u -c " & Temp("sources") WAIT
+' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' ' ' ' IF cb.value = TRUE THEN
+' ' ' ' ' 'spkg = cb.Text
+' ' ' ' ' INC ii
+' ' ' ' ' NEXT
+' ' ' ' '
+' ' ' ' ' ' now to install them
+' ' ' ' '
+' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' ' ' ' IF cb.Value = TRUE THEN
+' ' ' ' ' sPkg =
+' ' ' ' '
+' ' ' ' '
+' ' ' ' ' FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
+' ' ' ' ' sPkg = ClsPkgSel.arrPkgs[i]
+' ' ' ' ' PRINT " + Install " & sPkgPath &/ sPkg
+' ' ' ' ' iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+' ' ' ' ' IF iret <> 0 THEN
+' ' ' ' ' RETURN iret
+' ' ' ' ' END IF
+' ' ' ' ' PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+' ' ' ' ' NEXT
+' ' ' ' ' END
PUBLIC FUNCTION INSTALL_USER_SELECTED_BULKS() AS Integer
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Mon Oct 6 12:13:55 2008
@@ -18,8 +18,8 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
- PRIVATE iPkgCnt AS Integer
- PRIVATE iPkgNum AS Integer = 0
+ PUBLIC iPkgCnt AS Integer
+ PUBLIC iPkgNum AS Integer = 0
@@ -789,6 +789,7 @@
INC iPkgNum
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+
'Message(sTlzPath & "<br>" & sTlzName)
NEXT
|
|
From: <cod...@go...> - 2008-10-05 02:03:31
|
Author: rbistolfi
Date: Sat Oct 4 18:40:08 2008
New Revision: 212
Modified:
branches/iVL/.lang/es.mo
branches/iVL/.lang/es.po
Log:
Put all to lowercase in es.po to fix accents issue
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 Sat Oct 4 18:40:08 2008
@@ -10,1035 +10,895 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
+#: FrmNetConf.class:159
+msgid "192.168.1.254"
+msgstr ""
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "Instaladaor Gráfico de VectorLinux"
+#: FrmPartSel.class:149
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "Acerca del particionado en Linux"
-#: FMain.class:229
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr ""
-"Por favor espere, el instalador intentará ejecutar la herramienta de "
-"particionado"
+#: FrmRootPass.class:28
+msgid "About the root account"
+msgstr "Acerca de la cuenta del usuario root"
-#: FMain.class:231
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Por favor espere mientras el instalador analiza su particonado
actual."
+#: MdlNetConf.module:250
+msgid "Access Point"
+msgstr "Punto de Accesso (Access Point)"
-#: FMain.class:231
-msgid "This may take a while ..."
-msgstr "Esto puede tardar unos minutos ..."
+#: FrmUserAdd.class:112
+msgid "Add Users"
+msgstr "Agregar Usuarios"
-#: FMain.class:245
-msgid ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
-msgstr ""
-"Debes seleccionar una partición para \"/\" (raíz). Allí sera instalado
el "
-"sistema operativo"
+#: MdlLiloOsList.module:366
+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"
-#: FMain.class:301
-msgid "Skipping lilo setup"
-msgstr "Salteando configuración de LILO"
+#: MdlNetConf.module:290
+msgid "Automatic settings via DHCP."
+msgstr "Configuración automática utilizando DHCP"
-#: FMain.class:405
-msgid "Process Overview"
-msgstr "Resumen del proceso"
+#: MdlNetConf.module:166
+msgid "Automatically activate this interface at start-up"
+msgstr "Activar esta interfaz automáticamente al arrancar"
-#: FMain.class:425
-msgid "Next"
-msgstr "Siguiente"
+#: MdlSummarize.module:57
+msgid "BULK PACKAGES:"
+msgstr "Paquetes por categoría"
#: FMain.class:431
msgid "Back"
msgstr "Regresar"
-#: FMain.class:437
-msgid "Exit Installation"
-msgstr "Cancelar Instalación"
+#: FrmLilo.class:250
+msgid "Boot Default"
+msgstr "Arranque por defecto"
+
+#: MdlCore.module:510
+msgid "Boot Menu Options"
+msgstr "Opciones de arranque"
+
+#: MdlConfLilo.module:97
+msgid "Boot loader has been setup successfully"
+msgstr "El cargador de arranque ha sido configurado con éxito"
+
+#: FrmLilo.class:228
+msgid "Bootsplash Extra high"
+msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
+
+#: FrmLilo.class:228
+msgid "Bootsplash High"
+msgstr "Resolución del arranque gráfico (bootsplash) alta"
+
+#: FrmLilo.class:228
+msgid "Bootsplash Med"
+msgstr "Resolución del arranque gráfico (bootsplash) media"
+
+#: MdlCore.module:413
+msgid "Build Date: "
+msgstr "Compilado el: "
#: FMain.class:453
msgid "Button1"
msgstr ""
-#: FrmDiskPart.class:115
-msgid "Disk Partitioning:"
-msgstr "Particionado de disco:"
+#: MdlInstallCustom.module:376
+msgid "Calculating package count ... Please wait"
+msgstr "Calculando el número de paquetes ... Por favor espere"
-#: FrmEmbUsrAdd.class:20 MdlCore.module:513
-msgid "User Accounts"
-msgstr "Usuarios"
+#: MdlCore.module:491
+msgid "Cannot find SETUP.CONF"
+msgstr "No se pudo encontrar SETUP.CONF"
-#: FrmEmbUsrAdd.class:23
-msgid "Create initial user accounts"
-msgstr "Crear la cuenta del usuario inicial"
+#: FrmPartSel.class:183
+msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
+msgstr "Selecciona esta casilla si hay una instalación Windows en tu
sistema o otra partición Windows (FAT, FAT32, NTFS) que quieras montar
automáticamente al arrancar el ordenador"
+
+#: FrmUserAdd.class:116
+msgid "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
+msgstr "Elige un nombre único para cada usuario. Es necesario ingresar las
contraseñas dos veces. Puedes crear todas las cuentas de usuarios que
desees"
+
+#: FrmZoneSet.class:120
+msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
+msgstr "Elige como funciona el reloj de esta máquina. Si tienes dudas
elige UTC/GMT"
+
+#: FrmZoneSet.class:108
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Selecciona la zona horaria del área donde vives"
+
+#: FrmPkgSel.class:22
+msgid "Choose your installation mode"
+msgstr "Selecciona el modo de instalación"
+
+#: FrmPkgSel.class:60
+msgid "Choose your optional components to install."
+msgstr "Selecciona los componentes opcionales a instalar."
+
+#: FrmSelISO.class:73
+msgid "Click"
+msgstr "Haz click en"
#: FrmEmbUsrAdd.class:23
msgid "Click the button below to create a new user account."
msgstr "Presiona el botón para crear una nueva cuenta de usuario."
-#: FrmEmbUsrAdd.class:23
-msgid ""
-"New user accounts can also be created after the install process is
completed."
-msgstr ""
-"Podras crear nuevas cuentas de usuario también luego del proceso de "
-"instalación."
+#: FrmZoneSet.class:113
+msgid "ComboBox1"
+msgstr "-"
-#: FrmEmbUsrAdd.class:130
-msgid "New User Account"
-msgstr "Nueva cuenta de usuario"
+#: FrmNetConf.class:123
+msgid "Computer Name"
+msgstr "Nombre Local"
-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr ""
-"Por favor espere mientras VectorLinux prepara su sistema para instalacion"
+#: FrmLilo.class:185
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Confuguración de LILO"
+
+#: FrmUserAdd.class:153
+msgid "Create User"
+msgstr "Agregar Usuario"
+
+#: FrmEmbUsrAdd.class:23
+msgid "Create initial user accounts"
+msgstr "Crear la cuenta del usuario inicial"
#: FrmHostPrep.class:135
msgid "Current Status"
msgstr "Estado Actual"
-#: FrmHostPrep.class:139 FrmLilo.class:202 FrmPartScheme.class:125
-#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:243
-#: FrmSummary.class:87
-msgid "TextLabel1"
-msgstr "-"
-
#: FrmInstallSys.class:70
msgid "Current Step"
msgstr "Este paso"
-#: FrmInstallSys.class:192
-msgid "Vectorlinux is currently being installed to your system... Please
wait"
-msgstr "Por favor espere mientras VectorLinux se instala en su sistema"
-
-#: FrmInstallSys.class:201
-msgid "Installing ..."
-msgstr "Instalando..."
-
-#: FrmInstallSys.class:215
-msgid "Total progress"
-msgstr "Progreso Total"
-
#: FrmInstallSys.class:220
msgid "Current Step "
msgstr "Este paso"
-#: FrmLangSel.class:81
-msgid "Select your language"
-msgstr "Selecciona tu idioma"
-
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "Aceptación de licencia"
+#: MdlSummarize.module:55
+msgid "Custom"
+msgstr ""
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: FrmPkgSel.class:112
+msgid "Custom Install"
+msgstr "Instalación Personalizada"
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "De acuerdo"
+#: FrmPartSel.class:184
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detectar volúmenes con sistemas Windows"
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No estoy de acuerdo"
+#: MdlCore.module:502
+msgid "Disk Partitioning"
+msgstr "Particionado de disco"
-#: FrmLilo.class:35
-msgid ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
-msgstr ""
-"los siguientes Sistemas Operativos han sido detectados en su ordenador. "
-"Selecciona la opción deseada"
+#: FrmPartScheme.class:110
+msgid "Disk Partitioning Options"
+msgstr "Opciones de particionado de disco"
-#: FrmLilo.class:35
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
-msgstr ""
-"para cada uno de ellos seleccionando cada pestaña. Para continuar con
los "
-"valores seleccionados por defecto simplemente haz click en "
+#: FrmDiskPart.class:115
+msgid "Disk Partitioning:"
+msgstr "Particionado de disco:"
-#: FrmLilo.class:121
-msgid "Standard"
-msgstr "Estandar"
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
+msgid "Do not format"
+msgstr "No Formatear"
-#: FrmLilo.class:185
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Confuguración de LILO"
+#: MdlInstallSys.module:190 MdlWinDrives.module:119
+msgid "Do not mount"
+msgstr "No montar"
#: FrmLilo.class:190
msgid "Don't Install Lilo"
msgstr "No quiero instalar LILO"
-#: FrmLilo.class:196 FrmNetConf.class:139
-msgid "Tab 0"
-msgstr "-"
+#: MdlNetConf.module:290
+msgid "Dynamic Host Control Protocol"
+msgstr "Dynamic Host Control Protocol (DHCP)"
-#: FrmLilo.class:214
-msgid "Target"
-msgstr "-"
+#: MdlNetConf.module:231
+msgid "Encryption key"
+msgstr "Clave encriptada"
-#: FrmLilo.class:220
-msgid "Video Resolution"
-msgstr "Resolucion de pantalla"
+#: MdlNetConf.module:205
+msgid "Encryption type"
+msgstr "Tipo de encriptación"
-#: FrmLilo.class:228
-msgid "Bootsplash Med"
-msgstr "Resolución del arranque gráfico (bootsplash) media"
+#: FrmRootPass.class:129 FrmUserAdd.class:131
+msgid "Enter Password"
+msgstr "Ingresa contraseña"
-#: FrmLilo.class:228
-msgid "Bootsplash High"
-msgstr "Resolución del arranque gráfico (bootsplash) alta"
+#: MdlInstallSys.module:506
+msgid "Error occurred while installing"
+msgstr "Ha ocurrido un error durante la instalación"
-#: FrmLilo.class:228
-msgid "Bootsplash Extra high"
-msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
+#: MdlInstallCustom.module:456
+msgid "Error while installing "
+msgstr "Error al instalar "
-#: FrmLilo.class:233
-msgid "Prompt Timeout"
-msgstr "Esperar"
+#: MdlInstallCustom.module:67
+msgid "Error while installing required system software. "
+msgstr "Error al instalar el software base. "
-#: FrmLilo.class:244
-msgid "Seconds"
-msgstr "Segundos"
+#: MdlInstallCustom.module:76
+msgid "Error while installing system configuration. "
+msgstr "Error al instalar la configuración del sistema. "
-#: FrmLilo.class:250
-msgid "Boot Default"
-msgstr "Arranque por defecto"
-
-#: FrmNetConf.class:56
-msgid "Network Interfaces"
-msgstr "Dispositivos de red"
-
-#: FrmNetConf.class:123
-msgid "Computer Name"
-msgstr "Nombre Local"
-
-#: FrmNetConf.class:146
-msgid "Manual DNS Server Specification"
-msgstr "Configuración Manual de servidores de nombres (DNS)"
-
-#: FrmNetConf.class:151
-msgid "Primary DNS Server"
-msgstr "Servidor de nombres primario (DNS)"
-
-#: FrmNetConf.class:159
-msgid "192.168.1.254"
-msgstr ""
+#: FMain.class:437
+msgid "Exit Installation"
+msgstr "Cancelar Instalación"
-#: FrmNetConf.class:164
-msgid "Secondary DNS Server"
-msgstr "Servidor de nombres (DNS) secundario"
+#: MdlPartSel.module:86
+msgid "FILESYSTEM"
+msgstr "Sistema de archivos"
-#: FrmNetConf.class:177 MdlCore.module:514
-msgid "Network Configuration"
-msgstr "Configuración de red"
+#: MdlInstallSys.module:783
+msgid "Failed to install"
+msgstr "La instalación ha fallado"
-#: FrmPartScheme.class:59
-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 ""
-"Selecciona esta opción si ya dispones de una instalación de Linux que "
-"quieras sobreescribir o si las particines Linux ya existen en tu disco
duro."
+#: MdlCore.module:501
+msgid "Find installation media"
+msgstr "Buscar medio de instalación"
-#: FrmPartScheme.class:59
-msgid "This option will overwrite any existing data in the selected
partitions"
-msgstr "Esta opción sobreescribirá los datos de las particiones
seleccionadas"
+#: MdlInstallSys.module:627
+msgid "Finished intalling Bulks"
+msgstr "Instalación de paquetes finalizada"
-#: FrmPartScheme.class:59
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-msgstr ""
-"Usa esta opción si ya haz preparado tus particiones utilizando el
instalador "
-"de VectorLinux"
+#: FrmRootPass.class:13
+msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess"
+msgstr "Por motivos de seguridad, deberías utilizar una clave fácil de
recordar, pero difícil de adivinar"
-#: FrmPartScheme.class:68
-msgid ""
-"Select this option is you wish to create, more or resize partitions in
order "
-"to make room for your new VectorLinux installation."
-msgstr ""
-"Selecciona esta opción si deseas crear o redimensionar particiones para "
-"conseguir espacio para tu nueva instalación de VectorLinux."
+#: MdlSummarize.module:67
+msgid "Full"
+msgstr "Completa"
-#: FrmPartScheme.class:68
-msgid ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
-msgstr "Esta opción es la más segura si quieres conservar otras
instalaciones."
+#: FrmPkgSel.class:107
+msgid "Full Install"
+msgstr "Instalacion Completa"
-#: FrmPartScheme.class:110
-msgid "Disk Partitioning Options"
-msgstr "Opciones de particionado de disco"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "Instaladaor Gráfico de VectorLinux"
-#: FrmPartScheme.class:115
-msgid "Use existing disk partitions"
-msgstr "Utilizar las particiones existentes en mi disco duro"
+#: MdlNetConf.module:407
+msgid "Gateway Address"
+msgstr "Dirección de Puerta de Enlace"
-#: FrmPartScheme.class:120
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modificaré mi disco duro para hacer lugar para la nueva
instalación"
+#: MdlDiskPart.module:53
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr "No se encontró Gparted en el sistema. Por favor, instala Gparted
y prueba de nuevo"
-#: FrmPartSel.class:149
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "ACERCA DEL PARTICIONADO EN LInUX"
+#: MdlNetConf.module:126
+msgid "Hardware Address"
+msgstr "Dirección MAC"
-#: FrmPartSel.class:149
-msgid ""
-"Linux is a modular operating system. This means that is has the ability
to "
-"store system and"
-msgstr ""
-"Linux es un sistema operativo modular. Esto significa que tiene la
capacidad "
-"de alojar el sistema y"
+#: MdlCore.module:515
+msgid "Hardware Configuration"
+msgstr "Configuración de hardware"
-#: FrmPartSel.class:149
-msgid ""
-"user data separately for added data security. You may install the system
to "
-"a single partition"
-msgstr ""
-"datos del usuario separadamente para incrementar la seguridad de sus
datos. "
-"Puedes instalar el sistema en una única partición"
+#: FrmPartSel.class:189
+msgid "Help"
+msgstr "Ayuda"
-#: FrmPartSel.class:149
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
-msgstr ""
-"simplemente seleccionando un valor para \"/\" en esta pantalla. El resto
es "
-"opcional. Lo siguiente es un"
+#: MdlSummarize.module:55
+msgid "INSTALL TYPE:"
+msgstr "Tipo de instalación:"
-#: FrmPartSel.class:149
-msgid "suggested setup for a typical Linux installation"
-msgstr "configuración recomendada para una instalación típica de Linux"
+#: MdlNetConf.module:362
+msgid "IP Address"
+msgstr "Dirección IP"
-#: FrmPartSel.class:149
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
-msgstr ""
-"Utilizada para almacenar los datos del sistema. Esta instalación en "
-"particular requiere un mínimo de"
+#: MdlNetConf.module:290
+msgid "If in doubt, choose this option"
+msgstr "Si dudas, elige esta opción"
-#: FrmPartSel.class:149
-msgid "for this"
-msgstr "para esto"
+#: MdlLiloOsList.module:94
+msgid "Include this Operating System in the boot menu"
+msgstr "Incluir este sistema operativo en el menú de arranque"
-#: FrmPartSel.class:149
-msgid ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
-msgstr ""
-"pero deberías considerar un valor más alto para asegurarte espacio para "
-"software adicional que desees instlar luego"
+#: MdlLiloOsList.module:143
+msgid "Include this installation in the boot menu"
+msgstr "Incluir esta instalación en el menú de arranque"
-#: FrmPartSel.class:149
-msgid "in case you wish to."
-msgstr "en caso que lo desees."
+#: MdlLiloOsList.module:282
+msgid "Include this operating system in the boot menu"
+msgstr "Incluir este sistema operativo en el menú de arranque"
-#: FrmPartSel.class:149
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
-msgstr ""
-"Utilizada para almacenar los ficheros del usuario, documentos, imágenes, "
-"videos, etc. Puedes asignar tanto espacio como desees"
+#: MdlLiloOsList.module:314
+msgid "Initial Ram Disk"
+msgstr "Disco Ram inicial"
-#: FrmPartSel.class:149
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Normalmente querrías utilizar tu partición más grande para esto."
+#: MdlCore.module:508
+msgid "Install Operating System"
+msgstr "Instalación del sistema operativo"
-#: FrmPartSel.class:149
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-msgstr ""
-"Utilizar una partición Swap es recomendado si tu cantidad de memoria RAM
es "
-"inferior a 1GB. El monto sugerido "
+#: MdlCore.module:505
+msgid "Installation"
+msgstr "Instalación"
-#: FrmPartSel.class:149
-msgid "for this is"
-msgstr "para esto es"
+#: MdlCore.module:506
+msgid "Installation Summary"
+msgstr "Resumen del proceso"
-#: FrmPartSel.class:149
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr ""
-"pero también puede ser calculada duplicando el tamaño de tu memoria RAM"
+#: MdlInstallSys.module:733
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Fase de instalación completada. Vamos a por la configuración"
-#: FrmPartSel.class:174
-msgid "Please select the partitions you wish to use and how to use them"
-msgstr ""
-"For favor, seleccione las secciones del disco que desea usar, y también
como "
-"usarlas"
+#: MdlInstallSys.module:468
+msgid "Installing"
+msgstr "Instalando"
-#: FrmPartSel.class:183
-msgid ""
-"Check this box if you have a Windows installation on your system or any "
-"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
-"soon as your computer starts"
-msgstr ""
-"Selecciona esta casilla si hay una instalación Windows en tu sistema o
otra "
-"partición Windows (FAT, FAT32, NTFS) que quieras montar automáticamente
al "
-"arrancar el ordenador"
+#: FrmInstallSys.class:201
+msgid "Installing ..."
+msgstr "Instalando..."
-#: FrmPartSel.class:184
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detectar volúmenes con sistemas Windows"
+#: MdlInstallSys.module:822
+msgid "Installing Final configuration files..."
+msgstr "Instalando los últimos ficheros de configuración ..."
-#: FrmPartSel.class:189
-msgid "Help"
-msgstr "Ayuda"
+#: MdlInstallSys.module:772
+msgid "Installing Required Package ..."
+msgstr "Instalando paquetes requeridos ..."
-#: FrmPkgSel.class:22
-msgid "Choose your installation mode"
-msgstr "Selecciona el modo de instalación"
+#: MdlInstallSys.module:736
+msgid "Installing default system configuration and required software."
+msgstr "Instalando el software necesario y las configuraciones por
defecto."
#: FrmPkgSel.class:51
msgid "Installs everything in your VectorLinux media to your system"
msgstr "Instalar todo lo que incluye el medio de instalación en tu disco
duro"
-#: FrmPkgSel.class:60
-msgid "Choose your optional components to install."
-msgstr "Selecciona los componentes opcionales a instalar."
-
-#: FrmPkgSel.class:107
-msgid "Full Install"
-msgstr "Instalacion Completa"
-
-#: FrmPkgSel.class:112
-msgid "Custom Install"
-msgstr "Instalación Personalizada"
-
-#: FrmPkgsel2.class:21
-msgid "Select your indivirual packages to install."
-msgstr "Selecciona paquetes individuales para su instalación."
-
-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "Para instalarlos todos, simplemente presiona Sigiente"
-
-#: FrmRootPass.class:6
-msgid "System Administrator Password"
-msgstr "Contraseña del administrador del sistema"
+#: MdlNetConf.module:147
+msgid "Interface Type"
+msgstr "Tipo de interfaz"
-#: FrmRootPass.class:13
-msgid "Most other every-day taks do not require administrative
priviledges."
-msgstr "Las tareas diarias no requieren privilegios de administrador"
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"
+msgstr "Es posible instalar VectorLinux entu sistema, pero derías
particionar el disco primero"
-#: FrmRootPass.class:13
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
-msgstr ""
-"Por motivos de seguridad, deberías utilizar una clave fácil de recordar, "
-"pero difícil de adivinar"
+#: MdlLiloOsList.module:338
+msgid "Kernel boot options"
+msgstr "Opciones de arranque de kernel"
-#: FrmRootPass.class:28
-msgid "About the root account"
-msgstr "Acerca de la cuenta del usuario root"
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "Aceptación de licencia"
-#: FrmRootPass.class:43
-msgid ""
-"Passwords do not match. Please enter the same password twice for
accuracy."
-msgstr ""
-"Las contraseñas no coinciden. Por favor ingrese la misma contraseña dos "
-"veces para estar seguros de que es la que Usted verdaderamente desea."
+#: MdlLiloOsList.module:152
+msgid "Label"
+msgstr "Etiqueta"
-#: FrmRootPass.class:101
-msgid ""
-"The linux root account is pre-assigned to be used as the system "
-"administrator's account. This account is used to perform system-wide
changes "
-"such as software upgrades, managing user accounts etc. \n"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The root password must be entered twice for ensured accuracy. When
choosing "
-"a root password, think of something easy for you to remember, but hard
for "
-"others to guess."
-msgstr ""
-"La cuenta root en los sistemas Linux está diseñada como la cuenta del "
-"administrador del sistema. Es utilizada para realizar tareas de "
-"mantenimiento del sistema globales, tales como actualizaciones de
software, "
-"gestionar los permisos o crear nuevos usuarios, etc. \n"
-"\n"
-"La mayoría de las otras operaciones no requieren privilegios de "
-"administrador.\n"
-"La contraseña para el usuario root deberá ser ingresada dos veces para "
-"asegurar que es la contraseña deseada. Al elegir la contraseña de "
-"administrador, piensa en algo fácil de recordar, pero al mismo tiempo "
-"difícil de adivinar para los otros. "
+#: MdlCore.module:500
+msgid "Language Selection"
+msgstr "Seleccion de idioma"
-#: FrmRootPass.class:107 MdlCore.module:512
-msgid "System Administrator"
-msgstr "Administrador del sistema"
+#: MdlConfLilo.module:95
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo ha devuelto un error. Por favor, lee más abajo"
-#: FrmRootPass.class:118
-msgid "Re-Enter Password"
-msgstr "Vuelva a ingresar la contraseña"
+#: FrmPartSel.class:149
+msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
+msgstr "Linux es un sistema operativo modular. Esto significa que tiene la
capacidad de alojar el sistema y"
-#: FrmRootPass.class:129 FrmUserAdd.class:131
-msgid "Enter Password"
-msgstr "Ingresa contraseña"
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Cargando Gparted ... Por favor espere"
-#: FrmRootPass.class:134
-msgid "Set Password"
-msgstr "Define tu contraseña"
+#: FrmZoneSet.class:115
+msgid "LocalTime"
+msgstr "Hora Local"
-#: FrmSelISO.class:29 MdlCore.module:250
-msgid "No Installable Media Found"
-msgstr "No se encontró ningún medio instalable"
+#: MdlCore.module:413
+msgid "MINIMUM REQUIREMENTS"
+msgstr "Requerimientos mínimos del sistema"
-#: FrmSelISO.class:73
-msgid "Click"
-msgstr "Haz click en"
+#: MdlPartSel.module:77
+msgid "MOUNT POINT"
+msgstr "Punto de montaje"
-#: FrmSelISO.class:73
-msgid "to begin installating"
-msgstr "para comenzar la instalación"
+#: MdlWinDrives.module:81
+msgid "MOUNT TO"
+msgstr "Montar en"
-#: FrmSelISO.class:98
-msgid "Unable to identify distro."
-msgstr "No se pudo detectar la distribución."
+#: FrmNetConf.class:146
+msgid "Manual DNS Server Specification"
+msgstr "Configuración Manual de servidores de nombres (DNS)"
#: FrmSelISO.class:133
msgid "Minimum Disk Space Requirements"
msgstr "Requerimientos mínimos de espacio en disco"
-#: FrmSelISO.class:232
-msgid "No installable images found."
-msgstr "No se encontró ninguna imagen que se pueda instalar"
+#: FrmPartScheme.class:120
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Modificaré mi disco duro para hacer lugar para la nueva
instalación"
-#: FrmSelISO.class:238
-msgid ""
-"Select which VectorLinux version you wish to install from the list below"
-msgstr "Selectiona la imagen que deseas instalar de la lista"
+#: FrmRootPass.class:13
+msgid "Most other every-day taks do not require administrative
priviledges."
+msgstr "Las tareas diarias no requieren privilegios de administrador"
-#: FrmSelISO.class:248
-msgid "Search Again"
-msgstr "Buscar nuevamente"
+#: MdlLiloOsList.module:293
+msgid "Name"
+msgstr "Nombre"
-#: FrmUserAdd.class:112
-msgid "Add Users"
-msgstr "Agregar Usuarios"
+#: MdlLiloOsList.module:75
+msgid "Name "
+msgstr "Nombre "
-#: FrmUserAdd.class:116
-msgid ""
-"Choose a unique name for each user. Enter the password for twice for "
-"accuracy. You can make as many users as you want, and when you are
finished "
-"click next to continue."
-msgstr ""
-"Elige un nombre único para cada usuario. Es necesario ingresar las "
-"contraseñas dos veces. Puedes crear todas las cuentas de usuarios que
desees"
+#: FrmNetConf.class:177 MdlCore.module:514
+msgid "Network Configuration"
+msgstr "Configuración de red"
-#: FrmUserAdd.class:121
-msgid "Username"
-msgstr "Nombre de usuario"
+#: FrmNetConf.class:56
+msgid "Network Interfaces"
+msgstr "Dispositivos de red"
-#: FrmUserAdd.class:142
-msgid "ReEnter Password"
-msgstr "Vuelva a ingresar la contraseña"
+#: FrmEmbUsrAdd.class:130
+msgid "New User Account"
+msgstr "Nueva cuenta de usuario"
-#: FrmUserAdd.class:153
-msgid "Create User"
-msgstr "Agregar Usuario"
+#: FrmEmbUsrAdd.class:23
+msgid "New user accounts can also be created after the install process is
completed."
+msgstr "Podras crear nuevas cuentas de usuario también luego del proceso
de instalación."
-#: FrmWinDrives.class:72
-msgid "Select the windows partitions you would like to mount during boot"
-msgstr "Selecciona qué volumenes usados por Windows deseas acceder desde
Linux"
+#: FMain.class:425
+msgid "Next"
+msgstr "Siguiente"
-#: FrmZoneSet.class:21
-msgid "Timezone configuration"
-msgstr "Configuración de la Zona Horaria"
+#: FrmSelISO.class:29 MdlCore.module:250
+msgid "No Installable Media Found"
+msgstr "No se encontró ningún medio instalable"
-#: FrmZoneSet.class:99
-msgid "Set TimeZone"
-msgstr "Configura la Zona Horaria"
+#: MdlWinDrives.module:181
+msgid "No Windows partitions detected"
+msgstr "Particiones Windows no detectadas en tu sistema"
-#: FrmZoneSet.class:108
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Selecciona la zona horaria del área donde vives"
+#: FrmSelISO.class:232
+msgid "No installable images found."
+msgstr "No se encontró ninguna imagen que se pueda instalar"
-#: FrmZoneSet.class:113
-msgid "ComboBox1"
-msgstr "-"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "No estoy de acuerdo"
-#: FrmZoneSet.class:115
-msgid "LocalTime"
-msgstr "Hora Local"
+#: MdlNetConf.module:218
+msgid "None"
+msgstr "Ninguno"
-#: FrmZoneSet.class:115
-msgid "UTC"
-msgstr "UTC"
+#: MdlInstallSys.module:142 MdlPartSel.module:148
+msgid "Not Used"
+msgstr "Sin usar"
-#: FrmZoneSet.class:120
-msgid ""
-"Choose how\n"
-"your hardware clock is set up.\n"
-"Choose UTC if you know that the clock is set up to\n"
-"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
-"Choose localtime since most PCs are setup this way."
-msgstr ""
-"Elige como funciona el reloj de esta máquina. Si tienes dudas elige
UTC/GMT"
+#: MdlSummarize.module:61
+msgid "OPTIONAL PACKAGES:"
+msgstr "Paquetes opcionales"
-#: MdlConfLilo.module:95
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo ha devuelto un error. Por favor, lee más abajo"
+#: MdlSummarize.module:49
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+msgstr "Particiones Windows que se montarán al inicio del sistema."
-#: MdlConfLilo.module:97
-msgid "Boot loader has been setup successfully"
-msgstr "El cargador de arranque ha sido configurado con éxito"
+#: MdlLiloOsList.module:270
+msgid "Operating system installed in "
+msgstr "Sistema operativo montado en"
-#: MdlCore.module:234
-msgid "Scanning system for installable media. Please wait ..."
-msgstr "Buscando medios de instalación en el sistema. Por favor espere ..."
+#: MdlPartSel.module:67 MdlWinDrives.module:71
+msgid "PARTITION"
+msgstr "Partición"
-#: MdlCore.module:252
-msgid ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
-msgstr ""
-"El instalador no ha podido encontrar ningún medio instalable en tu
sistema. "
-"Por favor inserta Vectorlinux"
+#: MdlSummarize.module:28
+msgid "PARTITIONING LAYOUT"
+msgstr "Diseño del particionado"
-#: MdlCore.module:252
-msgid "installation CD and click "
-msgstr "CD de instalación y haz click en"
+#: MdlInstallSys.module:362
+msgid "Packages have been installed in your system. Please click"
+msgstr "Los paquetes han sido instalados en tu sistema. Por favor haga
click"
-#: MdlCore.module:252
-msgid "to try again"
-msgstr "para intentarlo nuevamente"
+#: FrmRootPass.class:43
+msgid "Passwords do not match. Please enter the same password twice for
accuracy."
+msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña dos veces para estar seguros de que es la que Usted
verdaderamente desea."
-#: MdlCore.module:413
-msgid "Build Date: "
-msgstr "Compilado el: "
+#: MdlPartSel.module:293
+msgid "Please select only one "
+msgstr "Por favor, seleccione solo una"
-#: MdlCore.module:413
-msgid "MINIMUM REQUIREMENTS"
-msgstr "Requerimientos mínimos del sistema"
+#: FrmPartSel.class:174
+msgid "Please select the partitions you wish to use and how to use them"
+msgstr "For favor, seleccione las secciones del disco que desea usar, y
también como usarlas"
-#: MdlCore.module:418
-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 ""
-"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"
+#: FMain.class:231
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Por favor espere mientras el instalador analiza su particonado
actual."
-#: MdlCore.module:491
-msgid "Cannot find SETUP.CONF"
-msgstr "No se pudo encontrar SETUP.CONF"
+#: FMain.class:229
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "Por favor espere, el instalador intentará ejecutar la herramienta
de particionado"
+
+#: MdlNetConf.module:105
+msgid "Plugged-in"
+msgstr "Conectado"
#: MdlCore.module:499
msgid "Preparation"
msgstr "Preparación"
-#: MdlCore.module:500
-msgid "Language Selection"
-msgstr "Seleccion de idioma"
-
-#: MdlCore.module:501
-msgid "Find installation media"
-msgstr "Buscar medio de instalación"
-
-#: MdlCore.module:502
-msgid "Disk Partitioning"
-msgstr "Particionado de disco"
-
-#: MdlCore.module:503
-msgid "Software Selection"
-msgstr "Selección de software"
-
-#: MdlCore.module:505
-msgid "Installation"
-msgstr "Instalación"
+#: FrmNetConf.class:151
+msgid "Primary DNS Server"
+msgstr "Servidor de nombres primario (DNS)"
-#: MdlCore.module:506
-msgid "Installation Summary"
+#: FMain.class:405
+msgid "Process Overview"
msgstr "Resumen del proceso"
-#: MdlCore.module:508
-msgid "Install Operating System"
-msgstr "Instalación del sistema operativo"
+#: FrmLilo.class:233
+msgid "Prompt Timeout"
+msgstr "Esperar"
-#: MdlCore.module:509
-msgid "System Configuration"
-msgstr "Configurar el sistema"
+#: FrmRootPass.class:118
+msgid "Re-Enter Password"
+msgstr "Vuelva a ingresar la contraseña"
-#: MdlCore.module:510
-msgid "Boot Menu Options"
-msgstr "Opciones de arranque"
+#: FrmUserAdd.class:142
+msgid "ReEnter Password"
+msgstr "Vuelva a ingresar la contraseña"
#: MdlCore.module:511
msgid "Regional Settings"
msgstr "Opciones de regionalización"
-#: MdlCore.module:515
-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 ""
-"El instalador no ha podido determinar el tipo de disco duro en tu
sistema."
+#: MdlNetConf.module:274
+msgid "STATUS:"
+msgstr "Estado Actual:"
-#: MdlDiskPart.module:46
-msgid ""
-"It is still possible to install VectorLinux on your system, but you need
to "
-"pre-partition your disks first"
-msgstr ""
-"Es posible instalar VectorLinux entu sistema, pero derías particionar el "
-"disco primero"
+#: MdlCore.module:234
+msgid "Scanning system for installable media. Please wait ..."
+msgstr "Buscando medios de instalación en el sistema. Por favor espere ..."
-#: MdlDiskPart.module:53
-msgid ""
-"Gparted was not found on this system. Please install gparted and try
again"
-msgstr ""
-"No se encontró Gparted en el sistema. Por favor, instala Gparted y
prueba "
-"de nuevo"
+#: FrmSelISO.class:248
+msgid "Search Again"
+msgstr "Buscar nuevamente"
-#: MdlDiskPart.module:57
-msgid "Loading gparted ... Please wait"
-msgstr "Cargando Gparted ... Por favor espere"
+#: FrmNetConf.class:164
+msgid "Secondary DNS Server"
+msgstr "Servidor de nombres (DNS) secundario"
-#: MdlDiskPart.module:90
-msgid ""
-"Setup is unable to successfully run gparted on this system. This may be
a "
-"sign of "
-msgstr ""
-"El programa de instalación no pudo ejecutar Gparted en tu sistema. Esto "
-"puede ser señal de"
+#: FrmLilo.class:244
+msgid "Seconds"
+msgstr "Segundos"
-#: MdlDiskPart.module:90
-msgid "a bad install media. Setup cannot continue."
-msgstr ""
-"error en el medio de instalación. El programa de instalación no puede "
-"continuar."
+#: FrmWinDrives.class:72
+msgid "Select the windows partitions you would like to mount during boot"
+msgstr "Selecciona qué volumenes usados por Windows deseas acceder desde
Linux"
-#: MdlDiskPart.module:95
-msgid "Several windows found. I will take the first one!"
-msgstr "Se han encontrado varios windows. Cogeré el primero!"
+#: FrmPartScheme.class:59
+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 "Selecciona esta opción si ya dispones de una instalación de Linux
que quieras sobreescribir o si las particines Linux ya existen en tu disco
duro."
-#: MdlInstallCustom.module:43
-msgid "There as been an error while installing required system software. "
-msgstr "Ha ocurrido un error durante la instalación del software base. "
+#: FrmPartScheme.class:68
+msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
+msgstr "Selecciona esta opción si deseas crear o redimensionar particiones
para conseguir espacio para tu nueva instalación de VectorLinux."
-#: MdlInstallCustom.module:51
-msgid ""
-"There has been an error while installing optional software to your
system. "
-msgstr "Ha ocurrido un error durante la instalación del software
opcional. "
+#: FrmSelISO.class:238
+msgid "Select which VectorLinux version you wish to install from the list
below"
+msgstr "Selectiona la imagen que deseas instalar de la lista"
-#: MdlInstallCustom.module:59
-msgid ""
-"There has been an error while installing optional software to your
system."
-msgstr "Ha ocurrido un error mientras se instalaba el software opcional."
+#: FrmPkgsel2.class:21
+msgid "Select your indivirual packages to install."
+msgstr "Selecciona paquetes individuales para su instalación."
-#: MdlInstallCustom.module:67
-msgid "Error while installing required system software. "
-msgstr "Error al instalar el software base. "
+#: FrmLangSel.class:81
+msgid "Select your language"
+msgstr "Selecciona tu idioma"
-#: MdlInstallCustom.module:76
-msgid "Error while installing system configuration. "
-msgstr "Error al instalar la configuración del sistema. "
+#: FrmRootPass.class:134
+msgid "Set Password"
+msgstr "Define tu contraseña"
-#: MdlInstallCustom.module:83
-msgid "Unable to install kernels. "
-msgstr "No se pudieron instalar los kernels. "
+#: FrmZoneSet.class:99
+msgid "Set TimeZone"
+msgstr "Configura la Zona Horaria"
-#: MdlInstallCustom.module:94
-msgid ""
-"Vectorlinux is now installed in your system. Please click next to
configure "
-"it."
-msgstr ""
-"Vectorlinux se ha instalado en tu ordenador. Por favor, clica next para "
-"configurarlo."
+#: MdlNetConf.module:179
+msgid "Setup Mode"
+msgstr "Modo de configuración"
-#: MdlInstallCustom.module:95
-msgid ""
-"packages have been Installed. Please click next to move on to System "
-"Configuration."
-msgstr ""
-"paquetes han sido instalados. Por favor presiona Siguiente para
configurar "
-"el sistema."
+#: MdlCore.module:418
+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 "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"
-#: MdlInstallCustom.module:376
-msgid "Calculating package count ... Please wait"
-msgstr "Calculando el número de paquetes ... Por favor espere"
+#: MdlDiskPart.module:90
+msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
+msgstr "El programa de instalación no pudo ejecutar Gparted en tu sistema.
Esto puede ser señal de"
-#: MdlInstallCustom.module:424
-msgid "Total packages to be installed = "
-msgstr "Paquetes a instalar = "
+#: MdlCore.module:252
+msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
+msgstr "El instalador no ha podido encontrar ningún medio instalable en tu
sistema. Por favor inserta Vectorlinux"
-#: MdlInstallCustom.module:456
-msgid "Error while installing "
-msgstr "Error al instalar "
+#: MdlDiskPart.module:95
+msgid "Several windows found. I will take the first one!"
+msgstr "Se han encontrado varios windows. Cogeré el primero!"
-#: MdlInstallSys.module:118
-msgid "Writing new /etc/fstab to system"
-msgstr "Escribiendo el nuevo /etc/fstab en el sistema"
+#: FMain.class:301
+msgid "Skipping lilo setup"
+msgstr "Salteando configuración de LILO"
-#: MdlInstallSys.module:142 MdlPartSel.module:148
-msgid "Not Used"
-msgstr "Sin usar"
+#: MdlCore.module:503
+msgid "Software Selection"
+msgstr "Selección de software"
-#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
-msgid "Do not format"
-msgstr "No Formatear"
+#: FrmLilo.class:121
+msgid "Standard"
+msgstr "Estandar"
-#: MdlInstallSys.module:190 MdlWinDrives.module:119
-msgid "Do not mount"
-msgstr "No montar"
+#: MdlNetConf.module:340
+msgid "Static IP Address Settings"
+msgstr "Confiduración de IP estática"
-#: MdlInstallSys.module:361
-msgid "Vectorlinux is now installed in your system. Please click"
-msgstr "VectorLinux ha sido instalado e tu sistema. Por favor presiona"
+#: MdlNetConf.module:385
+msgid "Subnet Mask"
+msgstr "Máscara de subred"
-#: MdlInstallSys.module:361
-msgid "to configure it."
-msgstr "para configurarla."
+#: FrmRootPass.class:107 MdlCore.module:512
+msgid "System Administrator"
+msgstr "Administrador del sistema"
-#: MdlInstallSys.module:362
-msgid "Packages have been installed in your system. Please click"
-msgstr "Los paquetes han sido instalados en tu sistema. Por favor haga
click"
+#: FrmRootPass.class:6
+msgid "System Administrator Password"
+msgstr "Contraseña del administrador del sistema"
-#: MdlInstallSys.module:468
-msgid "Installing"
-msgstr "Instalando"
+#: MdlCore.module:509
+msgid "System Configuration"
+msgstr "Configurar el sistema"
-#: MdlInstallSys.module:506
-msgid "Error occurred while installing"
-msgstr "Ha ocurrido un error durante la instalación"
+#: FrmLilo.class:196 FrmNetConf.class:139
+msgid "Tab 0"
+msgstr "-"
-#: MdlInstallSys.module:571
-msgid "Vectorlinux is now being installed. Please wait..."
-msgstr "Vectorlinux se está instalando. Por favor, espere ..."
+#: FrmLilo.class:214
+msgid "Target"
+msgstr "-"
-#: MdlInstallSys.module:615
-msgid "There has been an error extracting"
-msgstr "Ha ourrido un error en la extracción"
+#: FrmLicense.class:104
+msgid "TextArea1"
+msgstr "-"
-#: MdlInstallSys.module:627
-msgid "Finished intalling Bulks"
-msgstr "Instalación de paquetes finalizada"
+#: FrmSummary.class:87
+msgid "TextLabel1"
+msgstr "-"
-#: MdlInstallSys.module:733
-msgid "Installation phase complete. Ready for configuration"
-msgstr "Fase de instalación completada. Vamos a por la configuración"
+#: FrmLilo.class:35
+msgid "The following Operating Systems have been detected on this
computer. Choose your desired option"
+msgstr "los siguientes Sistemas Operativos han sido detectados en su
ordenador. Selecciona la opción deseada"
-#: MdlInstallSys.module:736
-msgid "Installing default system configuration and required software."
-msgstr "Instalando el software necesario y las configuraciones por
defecto."
+#: FrmRootPass.class:101
+msgid "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
+msgstr "La cuenta root en los sistemas Linux está diseñada como la cuenta
del administrador del sistema. Es utilizada para realizar tareas de
mantenimiento del sistema globales, tales como actualizaciones de software,
gestionar los permisos o crear nuevos usuarios, etc. \n\nLa mayoría de las
otras operaciones no requieren privilegios de administrador.\nLa contraseña
para el usuario root deberá ser ingresada dos veces para asegurar que es la
contraseña deseada. Al elegir la contraseña de administrador, piensa en
algo fácil de recordar, pero al mismo tiempo difícil de adivinar para los
otros. "
-#: MdlInstallSys.module:772
-msgid "Installing Required Package ..."
-msgstr "Instalando paquetes requeridos ..."
+#: MdlInstallCustom.module:43
+msgid "There as been an error while installing required system software. "
+msgstr "Ha ocurrido un error durante la instalación del software base. "
-#: MdlInstallSys.module:783
-msgid "Failed to install"
-msgstr "La instalación ha fallado"
+#: MdlInstallSys.module:615
+msgid "There has been an error extracting"
+msgstr "Ha ourrido un error en la extracción"
-#: MdlInstallSys.module:822
-msgid "Installing Final configuration files..."
-msgstr "Instalando los últimos ficheros de configuración ..."
+#: MdlInstallCustom.module:59
+msgid "There has been an error while installing optional software to your
system."
+msgstr "Ha ocurrido un error mientras se instalaba el software opcional."
-#: MdlLiloOsList.module:67
-msgid "Windows installation found in "
-msgstr "Instalaciones de Windows encontradas en "
+#: MdlInstallCustom.module:51
+msgid "There has been an error while installing optional software to your
system. "
+msgstr "Ha ocurrido un error durante la instalación del software
opcional. "
-#: MdlLiloOsList.module:75
-msgid "Name "
-msgstr "Nombre "
+#: MdlPartFrmt.module:121
+msgid "There has been an error while trying to format "
+msgstr "Ha ocurrido un error mientras se intentaba formatear la partición."
-#: MdlLiloOsList.module:94
-msgid "Include this Operating System in the boot menu"
-msgstr "Incluir este sistema operativo en el menú de arranque"
+#: FMain.class:231
+msgid "This may take a while ..."
+msgstr "Esto puede tardar unos minutos ..."
-#: MdlLiloOsList.module:143
-msgid "Include this installation in the boot menu"
-msgstr "Incluir esta instalación en el menú de arranque"
+#: FrmPartScheme.class:68
+msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
+msgstr "Esta opción es la más segura si quieres conservar otras
instalaciones."
-#: MdlLiloOsList.module:152
-msgid "Label"
-msgstr "Etiqueta"
+#: FrmPartScheme.class:59
+msgid "This option will overwrite any existing data in the selected
partitions"
+msgstr "Esta opción sobreescribirá los datos de las particiones
seleccionadas"
-#: MdlLiloOsList.module:270
-msgid "Operating system installed in "
-msgstr "Sistema operativo montado en"
+#: MdlNetConf.module:290
+msgid "This will work if you use a cable or DSL modem on a home network."
+msgstr "Esto funcionará si tienes cable o módem DSL en una red casera."
-#: MdlLiloOsList.module:282
-msgid "Include this operating system in the boot menu"
-msgstr "Incluir este sistema operativo en el menú de arranque"
+#: FrmZoneSet.class:21
+msgid "Timezone configuration"
+msgstr "Configuración de la Zona Horaria"
-#: MdlLiloOsList.module:293
-msgid "Name"
-msgstr "Nombre"
+#: FrmPkgsel2.class:21
+msgid "To install them all, just click next"
+msgstr "Para instalarlos todos, simplemente presiona Sigiente"
-#: MdlLiloOsList.module:314
-msgid "Initial Ram Disk"
-msgstr "Disco Ram inicial"
+#: MdlInstallCustom.module:424
+msgid "Total packages to be installed = "
+msgstr "Paquetes a instalar = "
-#: MdlLiloOsList.module:338
-msgid "Kernel boot options"
-msgstr "Opciones de arranque de kernel"
+#: FrmInstallSys.class:215
+msgid "Total progress"
+msgstr "Progreso Total"
-#: MdlLiloOsList.module:366
-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"
+#: FrmPartSel.class:149
+msgid "Typically, you want to use the largest partition for this."
+msgstr "Normalmente querrías utilizar tu partición más grande para esto."
-#: MdlNetConf.module:93
-msgid "Wired"
-msgstr "Cableado"
+#: FrmZoneSet.class:115
+msgid "UTC"
+msgstr "UTC"
-#: MdlNetConf.module:96
-msgid "Wireless"
-msgstr "Inalámbrico"
+#: FrmSelISO.class:98
+msgid "Unable to identify distro."
+msgstr "No se pudo detectar la distribución."
-#: MdlNetConf.module:105
-msgid "Plugged-in"
-msgstr "Conectado"
+#: MdlInstallCustom.module:83
+msgid "Unable to install kernels. "
+msgstr "No se pudieron instalar los kernels. "
#: MdlNetConf.module:107
msgid "Unplugged"
msgstr "Desconectado"
-#: MdlNetConf.module:126
-msgid "Hardware Address"
-msgstr "Dirección MAC"
-
-#: MdlNetConf.module:147
-msgid "Interface Type"
-msgstr "Tipo de interfaz"
+#: FrmPartScheme.class:115
+msgid "Use existing disk partitions"
+msgstr "Utilizar las particiones existentes en mi disco duro"
-#: MdlNetConf.module:166
-msgid "Automatically activate this interface at start-up"
-msgstr "Activar esta interfaz automáticamente al arrancar"
+#: FrmPartScheme.class:59
+msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
+msgstr "Usa esta opción si ya haz preparado tus particiones utilizando el
instalador de VectorLinux"
-#: MdlNetConf.module:179
-msgid "Setup Mode"
-msgstr "Modo de configuración"
+#: FrmPartSel.class:149
+msgid "Used to store system data. This particular install requires a
minimum of"
+msgstr "Utilizada para almacenar los datos del sistema. Esta instalación
en particular requiere un mínimo de"
-#: MdlNetConf.module:205
-msgid "Encryption type"
-msgstr "Tipo de encriptación"
+#: FrmPartSel.class:149
+msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
+msgstr "Utilizada para almacenar los ficheros del usuario, documentos,
imágenes, videos, etc. Puedes asignar tanto espacio como desees"
-#: MdlNetConf.module:218
-msgid "None"
-msgstr "Ninguno"
+#: FrmEmbUsrAdd.class:20 MdlCore.module:513
+msgid "User Accounts"
+msgstr "Usuarios"
-#: MdlNetConf.module:231
-msgid "Encryption key"
-msgstr "Clave encriptada"
+#: FrmUserAdd.class:121
+msgid "Username"
+msgstr "Nombre de usuario"
-#: MdlNetConf.module:250
-msgid "Access Point"
-msgstr "Punto de Accesso (Access Point)"
+#: FrmPartSel.class:149
+msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
+msgstr "Utilizar una partición Swap es recomendado si tu cantidad de
memoria RAM es inferior a 1GB. El monto sugerido "
-#: MdlNetConf.module:274
-msgid "STATUS:"
-msgstr "Estado Actual:"
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "Instalador de VectorLinux"
-#: MdlNetConf.module:290
-msgid "Dynamic Host Control Protocol"
-msgstr "Dynamic Host Control Protocol (DHCP)"
+#: MdlDiskPart.module:46
+msgid "VectorLinux is unable to determine the type of hard disks on your
system."
+msgstr "El instalador no ha podido determinar el tipo de disco duro en tu
sistema."
-#: MdlNetConf.module:290
-msgid "Automatic settings via DHCP."
-msgstr "Configuración automática utilizando DHCP"
+#: FrmInstallSys.class:192
+msgid "Vectorlinux is currently being installed to your system... Please
wait"
+msgstr "Por favor espere mientras VectorLinux se instala en su sistema"
-#: MdlNetConf.module:290
-msgid "This will work if you use a cable or DSL modem on a home network."
-msgstr "Esto funcionará si tienes cable o módem DSL en una red casera."
+#: MdlInstallSys.module:571
+msgid "Vectorlinux is now being installed. Please wait..."
+msgstr "Vectorlinux se está instalando. Por favor, espere ..."
-#: MdlNetConf.module:290
-msgid "If in doubt, choose this option"
-msgstr "Si dudas, elige esta opción"
+#: MdlInstallSys.module:361
+msgid "Vectorlinux is now installed in your system. Please click"
+msgstr "VectorLinux ha sido instalado e tu sistema. Por favor presiona"
-#: MdlNetConf.module:340
-msgid "Static IP Address Settings"
-msgstr "Confiduración de IP estática"
+#: MdlInstallCustom.module:94
+msgid "Vectorlinux is now installed in your system. Please click next to
configure it."
+msgstr "Vectorlinux se ha instalado en tu ordenador. Por favor, clica
next para configurarlo."
-#: MdlNetConf.module:362
-msgid "IP Address"
-msgstr "Dirección IP"
+#: FrmHostPrep.class:130
+msgid "Vectorlinux is preparing your system for installation. Please wait."
+msgstr "Por favor espere mientras VectorLinux prepara su sistema para
instalacion"
-#: MdlNetConf.module:385
-msgid "Subnet Mask"
-msgstr "Máscara de subred"
+#: FrmLilo.class:220
+msgid "Video Resolution"
+msgstr "Resolucion de pantalla"
-#: MdlNetConf.module:407
-msgid "Gateway Address"
-msgstr "Dirección de Puerta de Enlace"
+#: MdlWinDrives.module:55
+msgid "Windows Partitions Detected"
+msgstr "Particiones Windows detectadas"
-#: MdlPartFrmt.module:121
-msgid "There has been an error while trying to format "
-msgstr "Ha ocurrido un error mientras se intentaba formatear la partición."
+#: MdlLiloOsList.module:67
+msgid "Windows installation found in "
+msgstr "Instalaciones de Windows encontradas en "
-#: MdlPartSel.module:67 MdlWinDrives.module:71
-msgid "PARTITION"
-msgstr "PARTICIÓN"
+#: MdlNetConf.module:93
+msgid "Wired"
+msgstr "Cableado"
-#: MdlPartSel.module:77
-msgid "MOUNT POINT"
-msgstr "Punto de montaje"
+#: MdlNetConf.module:96
+msgid "Wireless"
+msgstr "Inalámbrico"
-#: MdlPartSel.module:86
-msgid "FILESYSTEM"
-msgstr "Sistema de archivos"
+#: MdlInstallSys.module:118
+msgid "Writing new /etc/fstab to system"
+msgstr "Escribiendo el nuevo /etc/fstab en el sistema"
-#: MdlPartSel.module:293
-msgid "Please select only one "
-msgstr "Por favor, seleccione solo una"
+#: FrmLicense.class:110
+msgid "Yes, I Agree to the License Agreement"
+msgstr "De acuerdo"
-#: MdlPartSel.module:293
-msgid "partition"
-msgstr "partición"
+#: FMain.class:245
+msgid "You must select a \"/\" partition. This is the target where the
system will install to"
+msgstr "Debes seleccionar una partición para \"/\" (raíz). Allí sera
instalado el sistema operativo"
-#: MdlSummarize.module:28
-msgid "PARTITIONING LAYOUT"
-msgstr "DISEÑO DEL PARTICIONADO"
+#: MdlDiskPart.module:90
+msgid "a bad install media. Setup cannot continue."
+msgstr "error en el medio de instalación. El programa de instalación no
puede continuar."
-#: MdlSummarize.module:49
-msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
-msgstr "PARTICIONES WINDOWS MONTADAS EN EL ARRANQUE DEL SISTEMA."
+#: FrmPartSel.class:149
+msgid "but can also be calculated as 2 times your ammount of RAM"
+msgstr "pero también puede ser calculada duplicando el tamaño de tu
memoria RAM"
-#: MdlSummarize.module:55
-msgid "INSTALL TYPE:"
-msgstr "Tipo de instalación:"
+#: FrmPartSel.class:149
+msgid "but you should considear a higher value to make sure you have room
to install additional software"
+msgstr "pero deberías considerar un valor más alto para asegurarte espacio
para software adicional que desees instlar luego"
-#: MdlSummarize.module:55
-msgid "Custom"
-msgstr ""
+#: FrmPartSel.class:149
+msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
+msgstr "simplemente seleccionando un valor para \"/\" en esta pantalla. El
resto es opcional. Lo siguiente es un"
-#: MdlSummarize.module:57
-msgid "BULK PACKAGES:"
-msgstr "PAQUETES POR CATEGORÍA"
+#: FrmLilo.class:35
+msgid "for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click"
+msgstr "para cada uno de ellos seleccionando cada pestaña. Para continuar
con los valores seleccionados por defecto simplemente haz click en "
-#: MdlSummarize.module:61
-msgid "OPTIONAL PACKAGES:"
-msgstr "PAQUETES OPCIONALES"
+#: FrmPartSel.class:149
+msgid "for this"
+msgstr "para esto"
-#: MdlSummarize.module:67
-msgid "Full"
-msgstr "Completa"
+#: FrmPartSel.class:149
+msgid "for this is"
+msgstr "para esto es"
-#: MdlWinDrives.module:55
-msgid "Windows Partitions Detected"
-msgstr "Particiones Windows detectadas"
+#: FrmPartSel.class:149
+msgid "in case you wish to."
+msgstr "en caso que lo desees."
-#: MdlWinDrives.module:81
-msgid "MOUNT TO"
-msgstr "Montar en"
+#: MdlCore.module:252
+msgid "installation CD and click "
+msgstr "CD de instalación y haz click en"
-#: MdlWinDrives.module:181
-msgid "No Windows partitions detected"
-msgstr "Particiones Windows no detectadas en tu sistema"
+#: MdlZoneSet.module:28
+msgid "localtime"
+msgstr "Hora local"
#: MdlZoneSet.module:27
msgid "localtime-copied-from"
msgstr "Hora-local-copiada-de"
-#: MdlZoneSet.module:28
-msgid "localtime"
-msgstr "Hora local"
+#: MdlInstallCustom.module:95
+msgid "packages have been Installed. Please click next to move on to
System Configuration."
+msgstr "paquetes han sido instalados. Por favor presiona Siguiente para
configurar el sistema."
+
+#: MdlPartSel.module:293
+msgid "partition"
+msgstr "partición"
+
+#: FrmPartSel.class:149
+msgid "suggested setup for a typical Linux installation"
+msgstr "configuración recomendada para una instalación típica de Linux"
+
+#: FrmSelISO.class:73
+msgid "to begin installating"
+msgstr "para comenzar la instalación"
+
+#: MdlInstallSys.module:361
+msgid "to configure it."
+msgstr "para configurarla."
+
+#: MdlCore.module:252
+msgid "to try again"
+msgstr "para intentarlo nuevamente"
+
+#: FrmPartSel.class:149
+msgid "user data separately for added data security. You may install the
system to a single partition"
+msgstr "datos del usuario separadamente para incrementar la seguridad de
sus datos. Puedes instalar el sistema en una única partición"
+
|
|
From: <cod...@go...> - 2008-10-04 14:08:33
|
Author: rbistolfi
Date: Sat Oct 4 07:07:13 2008
New Revision: 211
Modified:
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/en_US.po
branches/iVL/.lang/es.mo
branches/iVL/.lang/es.po
Log:
Small es translation update.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Sat Oct 4 07:07:13 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSetup.module
+# /home/rbistolfi/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Sat Oct 4 07:07:13 2008
@@ -84,7 +84,7 @@
msgstr ""
"New user accounts can also be created after the install process is
completed."
-#: FrmEmbUsrAdd.class:128
+#: FrmEmbUsrAdd.class:130
msgid "New User Account"
msgstr "New User Account"
@@ -718,30 +718,30 @@
msgid "There as been an error while installing required system software. "
msgstr "There as been an error while installing required system software. "
-#: MdlInstallCustom.module:50
+#: MdlInstallCustom.module:51
msgid ""
"There has been an error while installing optional software to your
system. "
msgstr ""
"There has been an error while installing optional software to your
system. "
-#: MdlInstallCustom.module:57
+#: MdlInstallCustom.module:59
msgid ""
"There has been an error while installing optional software to your
system."
msgstr ""
-#: MdlInstallCustom.module:65
+#: MdlInstallCustom.module:67
msgid "Error while installing required system software. "
msgstr "Error while installing required system software. "
-#: MdlInstallCustom.module:72
+#: MdlInstallCustom.module:76
msgid "Error while installing system configuration. "
msgstr "Error while installing system configuration. "
-#: MdlInstallCustom.module:79
+#: MdlInstallCustom.module:83
msgid "Unable to install kernels. "
msgstr "Unable to install kernels. "
-#: MdlInstallCustom.module:90
+#: MdlInstallCustom.module:94
msgid ""
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
@@ -749,7 +749,7 @@
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
-#: MdlInstallCustom.module:91
+#: MdlInstallCustom.module:95
msgid ""
"packages have been Installed. Please click next to move on to System "
"Configuration."
@@ -757,15 +757,15 @@
"packages have been Installed. Please click next to move on to System "
"Configuration."
-#: MdlInstallCustom.module:263
+#: MdlInstallCustom.module:376
msgid "Calculating package count ... Please wait"
msgstr "Calculating package count ... Please wait"
-#: MdlInstallCustom.module:311
+#: MdlInstallCustom.module:424
msgid "Total packages to be installed = "
msgstr "Total packages to be installed = "
-#: MdlInstallCustom.module:343
+#: MdlInstallCustom.module:456
msgid "Error while installing "
msgstr "Error while installing "
@@ -785,47 +785,58 @@
msgid "Do not mount"
msgstr "Do not mount"
-#: MdlInstallSys.module:358
+#: MdlInstallSys.module:361
msgid "Vectorlinux is now installed in your system. Please click"
msgstr "Vectorlinux is now installed in your system. Please click"
-#: MdlInstallSys.module:358
+#: MdlInstallSys.module:361
msgid "to configure it."
msgstr "to configure it."
-#: MdlInstallSys.module:359
+#: MdlInstallSys.module:362
msgid "Packages have been installed in your system. Please click"
msgstr "Packages have been installed to your system. Please click"
-#: MdlInstallSys.module:455
+#: MdlInstallSys.module:468
msgid "Installing"
msgstr "Installing"
-#: MdlInstallSys.module:542
+#: MdlInstallSys.module:506
+#, fuzzy
+msgid "Error occurred while installing"
+msgstr "Error while installing "
+
+#: MdlInstallSys.module:571
msgid "Vectorlinux is now being installed. Please wait..."
msgstr "Vectorlinux is now being installed. Please wait..."
-#: MdlInstallSys.module:585
+#: MdlInstallSys.module:615
msgid "There has been an error extracting"
msgstr "There has been an error extracting"
-#: MdlInstallSys.module:597
+#: MdlInstallSys.module:627
msgid "Finished intalling Bulks"
msgstr "Finished intalling Bulks"
-#: MdlInstallSys.module:700
+#: MdlInstallSys.module:733
msgid "Installation phase complete. Ready for configuration"
msgstr "Installation phase complete. Ready for configuration"
-#: MdlInstallSys.module:703
+#: MdlInstallSys.module:736
msgid "Installing default system configuration and required software."
msgstr "Installing default system configuration and required software."
-#: MdlInstallSys.module:733
-msgid "Installing Required Packages ..."
+#: MdlInstallSys.module:772
+#, fuzzy
+msgid "Installing Required Package ..."
msgstr "Installing Required Packages ..."
-#: MdlInstallSys.module:786
+#: MdlInstallSys.module:783
+#, fuzzy
+msgid "Failed to install"
+msgstr "Unable to install kernels. "
+
+#: MdlInstallSys.module:822
msgid "Installing Final configuration files..."
msgstr "Installing final configuration files ..."
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 Sat Oct 4 07:07:13 2008
@@ -87,7 +87,7 @@
"Podras crear nuevas cuentas de usuario también luego del proceso de "
"instalación."
-#: FrmEmbUsrAdd.class:128
+#: FrmEmbUsrAdd.class:130
msgid "New User Account"
msgstr "Nueva cuenta de usuario"
@@ -725,29 +725,29 @@
msgid "There as been an error while installing required system software. "
msgstr "Ha ocurrido un error durante la instalación del software base. "
-#: MdlInstallCustom.module:50
+#: MdlInstallCustom.module:51
msgid ""
"There has been an error while installing optional software to your
system. "
msgstr "Ha ocurrido un error durante la instalación del software
opcional. "
-#: MdlInstallCustom.module:57
+#: MdlInstallCustom.module:59
msgid ""
"There has been an error while installing optional software to your
system."
msgstr "Ha ocurrido un error mientras se instalaba el software opcional."
-#: MdlInstallCustom.module:65
+#: MdlInstallCustom.module:67
msgid "Error while installing required system software. "
msgstr "Error al instalar el software base. "
-#: MdlInstallCustom.module:72
+#: MdlInstallCustom.module:76
msgid "Error while installing system configuration. "
msgstr "Error al instalar la configuración del sistema. "
-#: MdlInstallCustom.module:79
+#: MdlInstallCustom.module:83
msgid "Unable to install kernels. "
msgstr "No se pudieron instalar los kernels. "
-#: MdlInstallCustom.module:90
+#: MdlInstallCustom.module:94
msgid ""
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
@@ -755,7 +755,7 @@
"Vectorlinux se ha instalado en tu ordenador. Por favor, clica next para "
"configurarlo."
-#: MdlInstallCustom.module:91
+#: MdlInstallCustom.module:95
msgid ""
"packages have been Installed. Please click next to move on to System "
"Configuration."
@@ -763,15 +763,15 @@
"paquetes han sido instalados. Por favor presiona Siguiente para
configurar "
"el sistema."
-#: MdlInstallCustom.module:263
+#: MdlInstallCustom.module:376
msgid "Calculating package count ... Please wait"
msgstr "Calculando el número de paquetes ... Por favor espere"
-#: MdlInstallCustom.module:311
+#: MdlInstallCustom.module:424
msgid "Total packages to be installed = "
msgstr "Paquetes a instalar = "
-#: MdlInstallCustom.module:343
+#: MdlInstallCustom.module:456
msgid "Error while installing "
msgstr "Error al instalar "
@@ -791,47 +791,55 @@
msgid "Do not mount"
msgstr "No montar"
-#: MdlInstallSys.module:358
+#: MdlInstallSys.module:361
msgid "Vectorlinux is now installed in your system. Please click"
msgstr "VectorLinux ha sido instalado e tu sistema. Por favor presiona"
-#: MdlInstallSys.module:358
+#: MdlInstallSys.module:361
msgid "to configure it."
msgstr "para configurarla."
-#: MdlInstallSys.module:359
+#: MdlInstallSys.module:362
msgid "Packages have been installed in your system. Please click"
msgstr "Los paquetes han sido instalados en tu sistema. Por favor haga
click"
-#: MdlInstallSys.module:455
+#: MdlInstallSys.module:468
msgid "Installing"
msgstr "Instalando"
-#: MdlInstallSys.module:542
+#: MdlInstallSys.module:506
+msgid "Error occurred while installing"
+msgstr "Ha ocurrido un error durante la instalación"
+
+#: MdlInstallSys.module:571
msgid "Vectorlinux is now being installed. Please wait..."
msgstr "Vectorlinux se está instalando. Por favor, espere ..."
-#: MdlInstallSys.module:585
+#: MdlInstallSys.module:615
msgid "There has been an error extracting"
msgstr "Ha ourrido un error en la extracción"
-#: MdlInstallSys.module:597
+#: MdlInstallSys.module:627
msgid "Finished intalling Bulks"
msgstr "Instalación de paquetes finalizada"
-#: MdlInstallSys.module:700
+#: MdlInstallSys.module:733
msgid "Installation phase complete. Ready for configuration"
msgstr "Fase de instalación completada. Vamos a por la configuración"
-#: MdlInstallSys.module:703
+#: MdlInstallSys.module:736
msgid "Installing default system configuration and required software."
msgstr "Instalando el software necesario y las configuraciones por
defecto."
-#: MdlInstallSys.module:733
-msgid "Installing Required Packages ..."
-msgstr "Instalando paquetes necesarios ..."
+#: MdlInstallSys.module:772
+msgid "Installing Required Package ..."
+msgstr "Instalando paquetes requeridos ..."
+
+#: MdlInstallSys.module:783
+msgid "Failed to install"
+msgstr "La instalación ha fallado"
-#: MdlInstallSys.module:786
+#: MdlInstallSys.module:822
msgid "Installing Final configuration files..."
msgstr "Instalando los últimos ficheros de configuración ..."
|
|
From: <cod...@go...> - 2008-10-03 20:50:27
|
Author: M0...@gm...
Date: Fri Oct 3 13:49:48 2008
New Revision: 210
Modified:
branches/iVL/MdlInstallCustom.module
Log:
Custom install fix in progress
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Fri Oct 3 13:49:48 2008
@@ -45,6 +45,7 @@
END IF
iRet = ME.INSTALL_USER_SELECTED_BULKS()
+ 'Message("Installing user-selected bulks")
PRINT "INSTALING USER-SELECTED BULK PACKAGES"
IF iRet <> 0 THEN
Message.Error(("There has been an error while installing optional
software to your system. ") & gb.newline & sErr)
@@ -52,6 +53,7 @@
END IF
iret = ME.INSTALL_USER_SELECTED_PACKAGES()
+ 'Message("Installing user-selected packages")
PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
IF iRet <> 0 THEN
Message.Error(("There has been an error while installing optional
software to your system.") & gb.newline & sErr)
@@ -213,25 +215,134 @@
NEXT
END
-
PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES() AS Integer
- DIM i, iret AS Integer
- DIM sPkg AS String
- DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
-
- FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
- sPkg = ClsPkgSel.arrPkgs[i]
- PRINT " + Install " & sPkgPath &/ sPkg
- iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+ DIM i AS Integer
+ DIM sFile AS String[]
+ DIM sLine AS String
+ DIM sRawFile AS String
+ DIM sTlzPath AS String
+ DIM sTlzName AS String
+ DIM sTlzDesc AS String
+ DIM iTlzSize AS Integer
+ DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
+ DIM sTargetSize AS Variant
+ DIM cb AS CheckBox
+ DIM sName AS String
+
+ sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
+
+ sFile = Split(sRawFile, "\n")
+
+ FOR EACH cb IN MdlPkgSel.Pkgs
+ sName = Trim(cb.text)
+
+
+ FOR i = 0 TO sFile.count - 1
+ sLine = Trim(sFile[i])
+ IF InStr(sLine, sName) THEN
+ IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
+ sTlzName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
+ sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
+ sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
+ iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
+ 'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
+ 'iTlzSize = Trim(iTlzSize)
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName
& " ..."
+ FrmInstallSys.pbInstallProg.Value = 0.0
+
+ 'IF sTlzName = sName THEN
+
+
+ PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
+ ' install each package
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+ sTargetSize = Trim(CStr(sTargetSize))
+ SHELL "echo \"\" > /tmp/installdump" WAIT
+ sDump = ""
+ sErr = ""
+ 'hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" WAIT 'FOR READ
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 1
+ MdlInstallSys.UPDATE_STEP_PROGRESS(sTargetSize,
iTlzSize)
+
+ ' figure out the progress again
+
+ UNTIL
+ hproc.State = Process.Stopped
+ sDump = File.Load("/tmp/installdump")
+
+ IF InStr(sDump, "FAILED") > 0 THEN
+ ERROR
+ RETURN 1
+ ELSE
+ IF FrmInstallSys.pbInstallProg.Value <> 1 THEN
+ FrmInstallSys.pbInstallProg.Value = 1
+ END IF
+ END IF
+ END IF
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ END IF
+ END IF
+ NEXT
NEXT
END
+
+
+' ' ' PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES_OLD() AS Integer
+' ' '
+' ' ' DIM i, iret AS Integer
+' ' ' DIM sPkg AS String
+' ' ' DIM cb AS CheckBox
+' ' ' DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
+' ' ' DIM sPkgLoc AS String
+' ' ' DIM sFile AS String[]
+' ' ' DIM sLine AS String
+' ' ' DIM sConfig AS String
+' ' ' DIM ii AS Integer
+' ' ' ' needs to read PACKAES.TXT to get package name and location
+' ' '
+' ' ' 'sFile = Split(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"), "\n")
+' ' ' ii = 0
+' ' ' sConfig = "WORKINGDIR=" & ClsGlobal.sTargetMnt &/ "home"
&/ "ftp" &/ "pub" &/ "veclinux" & "\n" &
+' ' ' "SOURCE=" & ClsGlobal.sSourceMnt &/ "packages"
+' ' '
+' ' ' File.Save(Temp("sources"))
+' ' ' IF Exist(ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux") =
FALSE THEN
+' ' ' MKDIR ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux"
+' ' ' END IF
+' ' ' SHELL "slapt-get -u -c " & Temp("sources") WAIT
+' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' ' IF cb.value = TRUE THEN
+' ' ' 'spkg = cb.Text
+' ' ' INC ii
+' ' ' NEXT
+' ' '
+' ' ' ' now to install them
+' ' '
+' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' ' IF cb.Value = TRUE THEN
+' ' ' sPkg =
+' ' '
+' ' '
+' ' ' FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
+' ' ' sPkg = ClsPkgSel.arrPkgs[i]
+' ' ' PRINT " + Install " & sPkgPath &/ sPkg
+' ' ' iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+' ' ' IF iret <> 0 THEN
+' ' ' RETURN iret
+' ' ' END IF
+' ' ' PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+' ' ' NEXT
+' ' ' END
+
+
PUBLIC FUNCTION INSTALL_USER_SELECTED_BULKS() AS Integer
DIM SPkg AS String
@@ -244,7 +355,7 @@
'install the packages now
PRINT " + Install " & sPkgPath &/ sPkg
'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
- iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
IF iRet <> 0 THEN
RETURN 1
END IF
@@ -366,8 +477,9 @@
PUBLIC FUNCTION INSTALL_THIS_BULK(sBulkPath AS String) AS Integer
- DIM vSize AS Variant
- DIM vTargetSize AS Variant
+ DIM vSize AS Integer
+ DIM vTargetSize AS Integer
+
DIM sDesc AS String
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
@@ -381,7 +493,7 @@
SHELL "echo \"\" > /tmp/installdump" WAIT
sErr = ""
IF vSize <> "" THEN
- SHELL "export gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo
$gsize | cut -f3 -d \' \'" TO vTargetSize
+ SHELL "gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo $gsize
| cut -f3 -d \' \'" TO vTargetSize
END IF
FrmInstallSys.pbInstallProg.Value = 0
INC iPkgNum
@@ -398,7 +510,8 @@
' do the progress updating here
FrmInstallSys.tlCurrPkg.Text = Trim(sDesc)
IF vSize <> "" THEN
- MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
+ 'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
+ MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize)
END IF
UNTIL
hproc.State = Process.Stopped
@@ -415,7 +528,7 @@
PUBLIC FUNCTION INSTALL_THIS_PACKAGE(sPackagePath AS String) AS Integer
DIM vSize AS Variant
- DIM vTargetSize AS Variant
+ DIM vTargetSize AS Integer
sDump = ""
@@ -424,7 +537,7 @@
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize
IF vSize <> "" THEN
- SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo
$gsize | cut -f3 -d \' \'" TO vTargetSize
+ SHELL "gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo $gsize
| cut -f3 -d \' \'" TO vTargetSize
END IF
FrmInstallSys.pbInstallProg.Value = 0
INC iPkgNum
@@ -441,7 +554,9 @@
WAIT 1
' do the progress bar updating here
IF vSize <> "" THEN
- MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
+ 'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
+ MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, CInt(vSize))
+
END IF
UNTIL
hproc.state = Process.Stopped
|
|
From: <cod...@go...> - 2008-10-03 19:14:28
|
Author: M0...@gm...
Date: Fri Oct 3 12:13:24 2008
New Revision: 209
Modified:
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/installer.gambas
Log:
- Fixed problem with prograssbar while installing packages and
packages/required for full install
- Fixed progressbar meter at installing CONF packages
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Oct 3 12:13:24 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.101
+Version=0.0.102
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Fri Oct 3 12:13:24 2008
@@ -1,3 +1,2 @@
-- Fixed problem with ucase(string) in partitioning scheme window
-- Updated binary
-- Removed blank spaces off strings (to keep translations in consistency)
+- Fixed problem with prograssbar while installing packages and
packages/required for full install
+- Fixed progressbar meter at installing CONF packages
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Fri Oct 3 12:13:24 2008
@@ -66,7 +66,9 @@
RETURN
END IF
- iret = ME.INSTALL_CONF_PACKAGES()
+ 'iret = ME.INSTALL_CONF_PACKAGES()
+ '/ USE THE FUNCTION IN MDLINSTALLSYS.MODULE DOES THE EXACT SAME THING
AND HAS PROGRESS UPDATING
+ iret = MdlInstallSys.INSTALL_CONFIG_PACKAGES()
PRINT "INSTALLING CONFIGURATION PACKAGES"
IF iret <> 0 THEN
Message.Error(("Error while installing system configuration. ") &
gb.NewLine & sErr)
@@ -154,43 +156,43 @@
END
-PUBLIC FUNCTION INSTALL_CONF_PACKAGES() AS Integer
-
- DIM sOutput, sLine, sPkg, sPkgPath AS String
- DIM i, iret AS Integer
- DIM sList, sLinearr AS String[]
-
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep
^CONF" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sList = Split(sOutput, "\n")
- FOR i = 0 TO sList.Count - 1
- sLine = sList[i]
- sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
- sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
- sLinearr = Split(sPkg, ":")
- sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
- ' install it now
- PRINT " + Install " & sPkgPath
- 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
- iret = ME.INSTALL_THIS_BULK(sPkgPath)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- PRINT " ! " & sPkgPath & " is installed"
- NEXT
- ELSE ' single CONF line
- sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
- sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
- sLinearr = Split(sPkg, ":")
- sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
- 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
- iret = ME.INSTALL_THIS_BULK(sPkgPath)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- END IF
-END
+' ' PUBLIC FUNCTION INSTALL_CONF_PACKAGES() AS Integer
+' '
+' ' DIM sOutput, sLine, sPkg, sPkgPath AS String
+' ' DIM i, iret AS Integer
+' ' DIM sList, sLinearr AS String[]
+' '
+' ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^CONF" TO sOutput
+' ' sOutput = Trim(sOutput)
+' ' IF InStr(sOutput, "\n") > 0 THEN
+' ' sList = Split(sOutput, "\n")
+' ' FOR i = 0 TO sList.Count - 1
+' ' sLine = sList[i]
+' ' sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+' ' sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
+' ' sLinearr = Split(sPkg, ":")
+' ' sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
+' ' ' install it now
+' ' PRINT " + Install " & sPkgPath
+' ' 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+' ' iret = ME.INSTALL_THIS_BULK(sPkgPath)
+' ' IF iret <> 0 THEN
+' ' RETURN iret
+' ' END IF
+' ' PRINT " ! " & sPkgPath & " is installed"
+' ' NEXT
+' ' ELSE ' single CONF line
+' ' sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
+' ' sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
+' ' sLinearr = Split(sPkg, ":")
+' ' sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
+' ' 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+' ' iret = ME.INSTALL_THIS_BULK(sPkgPath)
+' ' IF iret <> 0 THEN
+' ' RETURN iret
+' ' END IF
+' ' END IF
+' ' END
PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Oct 3 12:13:24 2008
@@ -305,7 +305,7 @@
DIM iret AS Integer
ClsGlobal.sTargetMnt = "/mnt/target"
-
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
WITH FMain
.tvPlan["Inst1"].Selected = TRUE
.tvPlan["Inst1"].Picture = MdlCore.sNowPic
@@ -314,36 +314,39 @@
iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
'Message.Info("Total packages = " & iPkgCnt)
+ PRINT "Total packages to be installed " & iPkgCnt
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
+
iret = ME.INSTALL_BULK_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing bulks ... exit"
RETURN
END IF
PRINT "installing packages"
- MdlSetup.SHOW_PROGRESS_CONTROLS()
+
iret = ME.INSTALL_PACKAGES_NEW()
IF iret <> 0 THEN
PRINT "error installing packages ... exit"
RETURN
END IF
PRINT "Installing packages/required"
- MdlSetup.SHOW_PROGRESS_CONTROLS()
+ 'MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_REQUIRED_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing packages/required ... exit"
RETURN
END IF
PRINT "installing CONFIG packages from SETUP.CONF"
- MdlSetup.SHOW_PROGRESS_CONTROLS()
+ 'MdlSetup.SHOW_PROGRESS_CONTROLS()
+
iret = ME.INSTALL_CONFIG_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing config packages ... exit"
RETURN
END IF
PRINT "installing kernels"
- MdlSetup.SHOW_PROGRESS_CONTROLS()
+ 'MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = MdlInstallCustom.INSTALL_KERNELS()
IF iret <> 0 THEN
PRINT "Error installing kernels ... exit "
@@ -391,7 +394,10 @@
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
PRINT "installing " & ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName
INC iPkgNum
- ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt &/ "packages"
&/ sPkgPath &/ sPkgName)
+ 'ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt &/ "packages"
&/ sPkgPath &/ sPkgName)
+ ' move the process here locally
+ SHELL "echo \"\" /tmp/installdump" WAIT
+ hproc = SHELL "installpkg " &
ClsGlobal.sSourceMnt &/ "packages" &/ sPkgPath &/ sPkgName & " -R " &
ClsGlobal.sTargetMnt & " 2> /tmp/installdump"
WAIT
IF hproc.State = Process.Running THEN
REPEAT
@@ -401,6 +407,12 @@
UNTIL
hproc.State = Process.Stopped
END IF
+ IF InStr(sDump, "FAILED") > 0 THEN
+ PRINT sPkgName & " failed to install "
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
END IF
FrmInstallSys.pbInstallProg.Value = 1
WAIT
@@ -728,9 +740,10 @@
PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer
DIM i AS Integer
- DIM sFile AS String[]
- DIM sLine AS String
- DIM sRawFile AS String
+ DIM sList AS String[]
+ DIM sRawList AS String
+ 'DIM sRawFile AS String
+
DIM sTlzPath AS String
DIM sTlzName AS String
DIM sTlzDesc AS String
@@ -740,52 +753,46 @@
MdlCore.LOCK_GUI()
SHELL "echo \"\" > /tmp/installdump" WAIT
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
- SHELL "ls " & ClsGlobal.sSourceMnt &/ "packages/required/*.t?z" TO
sRawFile
- sRawFile = Trim(sRawFile)
- sFile = Split(sRawFile, "\n")
- iTlzTotal = sFile.Count
- FOR i = 0 TO sFile.count - 1
- sLine = Trim(sFile[i])
- 'INC iPkgNum
- sTlzPath = Trim(sLine)
- sTlzName = File.Name(sTlzPath)
- ' now install the package with the information we already have
- PRINT sTlzName & sTlzPath
- 'sDump = ""
- 'sErr = ""
- 'FrmInstallSys.tlCurrPkg.Text = "Installing " &
File.Name(sTlzPath) & " ..."
+
+ '/ NO PACKAGE SIZE DATA AVAILABLE FOR PACKAGES/REQUIRED.
+ 'PROGRESS CALCULATION IS BASED ON iCurrTlz/ITlzTotal
+
+
+ SHELL "ls " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z " TO sRawList
+ sRawList = Trim(sRawList)
+ sList = Split(sRawList, "\n")
+ iTlzTotal = sList.Count - 1
+ 'Message(iTlzTotal)
+ FOR i = 0 TO sList.count - 1
+ sTlzPath = Trim(sList[i])
+ sTlzName = File.Name(sTlzPath)
+ FrmInstallSys.pbInstallProg.Value = i / iTlzTotal
+ ' clear the dump
+ SHELL "echo \' \' > /tmp/installdump" WAIT
FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & sTlzName
- FrmInstallSys.pbInstallProg.Value = 0.0
-
- 'figure out the progress again
- ' for this one we will need to count the
packages, and base our progress on the number of packages
- ' installed vs the total number of packags
- 'iCurrTlz = i
-
- 'hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- 'ME.PACKAGE_INSTALL(sTlzPath) ' Do this locally instead
- hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'WAIT
- WAIT 1
+ hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
+ WAIT
IF hproc.State = Process.Running THEN
REPEAT
- WAIT 2
-
- FrmInstallSys.pbInstallProg.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iTlzTotal, iCurrTlz)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- UNTIL
- hproc.State = Process.Stopped
-' INC iPkgNum
- END IF
- NEXT
- FrmInstallSys.pbInstallProg.Value = 1
- WAIT 1
- sDump = File.Load("/tmp/installdump")
- IF InStr(sDump, "FAILED") > 0 THEN
- PRINT "Error installing packages/required"
- RETURN 1
- ELSE
- RETURN 0
- END IF
+ WAIT
+ UNTIL hproc.State = Process.Stopped
+ END IF
+ sDump = ""
+ sDump = File.Load("/tmp/installdump")
+ IF InStr(sDUmp, "FAILED") > 0 THEN
+ Message.Error(sTlzName & Space(1) & ("Failed to
install"))
+
+ RETURN 1
+ END IF
+
+
+
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+
+ 'Message(sTlzPath & "<br>" & sTlzName)
+ NEXT
+
END
@@ -796,37 +803,50 @@
DIM sPkg AS String
DIM sCOnfLine AS String
DIM sPkgPath AS String
- DIM i AS Integer
+ DIM i, ipkgsize AS Integer
+ DIM itgtsize AS Integer
SHELL "echo \"\" > /tmp/installdump" WAIT
- PRINT "Installing final system configuration"
+ 'PRINT "Installing final system configuration"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sRawList
'Message.Info(sRawList)
- PRINT sRawList & " config"
+ 'PRINT sRawList & " config"
- PRINT "Found a single CONF package... Installing it now"
+ 'PRINT "Found a single CONF package... Installing it now"
sRawList = Trim(sRawList)
- sLinarr = Split(sRawList, ":")
- sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) -
InStr(sLinarr[0], "\'"))
+ sList = Split(sRawList, "\n")
+ FOR i = 0 TO sList.count - 1
+
+ sLinarr = Split(Trim(sList[i]), ":")
+ sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) -
InStr(sLinarr[0], "\'"))
' now install the package
- FrmInstallSys.tlCurrPkg.Text = ("Installing Final
configuration files...")
- INC iPkgNum
+ FrmInstallSys.tlCurrPkg.Text = ("Installing Final
configuration files...") & File.Name(sPkgPath)
+
'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/
sPkgPath)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ SHELL "i=$(df | grep " & ClsGlobal.sSourceMnt & ") ;
echo $i | cut -f 3 -d \' \'" TO itgtsize
+
+
+ FrmInstallSys.pbInstallProg.Value = i / sList.Count - 1
+ hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/
sPkgPath)
+
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
+ ME.UPDATE_STEP_PROGRESS(itgtsize, sLinArr[1])
UNTIL
hproc.State = Process.Stopped
END IF
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
' END IF
sDump = File.Load("/tmp/installdump")
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
RETURN 0
- END IF
+ END IF
+ NEXT
END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-03 00:36:50
|
Author: M0...@gm...
Date: Thu Oct 2 14:33:39 2008
New Revision: 208
Modified:
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
Revised install modules
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Oct 2 14:33:39 2008
@@ -259,11 +259,7 @@
DIM sOutArr AS String[]
DIM cb AS CheckBox
- 'MdlPkgSel.GET_USER_BULK_SELECTION()
- 'MdlPkgSel.GET_USER_PKG_SELECTION()
- 'Message.Info(ClsPkgSel.arrBulks.Count & " from selected bulks" & "<br>"
&
- 'ClsPkgSel.arrPkgs.Count & " from selected packages")
- 'RETURN
+
PRINT ("Calculating package count ... Please wait")
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^BULK | grep required" TO sOutput
sOutput = Trim(sOutput)
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Oct 2 14:33:39 2008
@@ -505,13 +505,15 @@
sErr = ""
INC iPkgNum
'hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- IF Right(sPath_To_Package, 3) LIKE "t?z" THEN
- hproc = SHELL "installpkg " & sPath_To_Package & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" WAIT 'FOR
READ
- WAIT
- sDump = File.Load("/tmp/installdump")
- IF InStr(sDump, "FAILED") > 0 THEN
- Message.Error(("Unable to install") & Space(1) &
sPath_To_Package)
- END IF
+ 'IF Right(sPath_To_Package, 3) LIKE "t?z" THEN
+ IF File.Ext(sPath_To_Package) LIKE "t?z" THEN
+ 'SHELL "echo \"\" > /tmp/installdump"
+ hproc = SHELL " installpkg " & sPath_To_Package & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" WAIT 'FOR
READ
+ ' WAIT
+ ' sDump = File.Load("/tmp/installdump")
+ ' IF InStr(sDump, "FAILED") > 0 THEN
+ ' Message.Error(("Unable to install") & Space(1) &
sPath_To_Package)
+ ' END IF
ENDIF
END
@@ -739,19 +741,21 @@
SHELL "echo \"\" > /tmp/installdump" WAIT
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
SHELL "ls " & ClsGlobal.sSourceMnt &/ "packages/required/*.t?z" TO
sRawFile
+ sRawFile = Trim(sRawFile)
sFile = Split(sRawFile, "\n")
iTlzTotal = sFile.Count
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
'INC iPkgNum
sTlzPath = Trim(sLine)
+ sTlzName = File.Name(sTlzPath)
' now install the package with the information we already have
PRINT sTlzName & sTlzPath
'sDump = ""
'sErr = ""
'FrmInstallSys.tlCurrPkg.Text = "Installing " &
File.Name(sTlzPath) & " ..."
- FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Packages ...")
- 'FrmInstallSys.pbInstallProg.Value = 0.0
+ FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & sTlzName
+ FrmInstallSys.pbInstallProg.Value = 0.0
'figure out the progress again
' for this one we will need to count the
packages, and base our progress on the number of packages
@@ -759,7 +763,8 @@
'iCurrTlz = i
'hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- ME.PACKAGE_INSTALL(sTlzPath)
+ 'ME.PACKAGE_INSTALL(sTlzPath) ' Do this locally instead
+ hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'WAIT
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Oct 2 14:33:39 2008
@@ -192,7 +192,7 @@
' END IF
' NEXT
' iQTY = sList.Count
- SHELL "find " & ClsGlobal.sSourceMnt & " -name *.tlz|wc -l" TO iQTY
+ SHELL "find " & ClsGlobal.sSourceMnt & " -name \"*.tlz\"|wc -l" TO
iQTY
ELSE ' GOING FOR CUSTOM INSTALL
END IF
|
|
From: <cod...@go...> - 2008-10-02 18:01:37
|
Author: M0...@gm...
Date: Thu Oct 2 11:00:49 2008
New Revision: 207
Modified:
branches/iVL/.project
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/installer.gambas
Log:
Attemp to deal with the out of memmory error
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Oct 2 11:00:49 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.100
+Version=0.0.101
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Oct 2 11:00:49 2008
@@ -136,14 +136,18 @@
sKernelPath = ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/ sLabel
IF Exist(sKernelPath) THEN
sDump = ""
+ SHELL "echo \"\" > /tmp/installdump" WAIT
sErr = ""
- hproc = SHELL "cp " & sKernelPath & Space(1) & ClsGlobal.sTargetMnt
&/ "boot" &/ "vmlinuz-" & sKernName FOR READ
+ hproc = SHELL "cp " & sKernelPath & Space(1) & ClsGlobal.sTargetMnt
&/ "boot" &/ "vmlinuz-" & sKernName & " 2> /tmp/installdump" 'FOR READ
WAIT 3
- IF InStr(sDump, "FAILED") > 0 THEN
- RETURN 1
- ELSE
- RETURN 0
- END IF
+ IF hproc.State = Process.Stopped THEN
+ sDump = File.Load("/tmp/installdump")
+ IF InStr(sDump, "FAILED") > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+ END IF
END IF
'SHELL "cp " & ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/
NEXT
@@ -370,24 +374,27 @@
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sBulkPath) & " | cut -f 3 -d :" TO sDesc
- IF Right(sDesc) = "\'" THEN
- sDesc = Left(sDesc, RInStr(sDesc, "\'") - 1)
- END IF
+ ' IF Right(sDesc) = "\'" THEN
+ ' sDesc = Left(sDesc, RInStr(sDesc, "\'") - 1)
+ ' END IF
+ sDesc = Replace(sDesc, "\'", "")
vSize = Trim(CStr(vSize))
sDump = ""
+ SHELL "echo \"\" > /tmp/installdump" WAIT
sErr = ""
IF vSize <> "" THEN
- SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo
$gsize | cut -f3 -d \' \'" TO vTargetSize
+ SHELL "export gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo
$gsize | cut -f3 -d \' \'" TO vTargetSize
END IF
FrmInstallSys.pbInstallProg.Value = 0
INC iPkgNum
PRINT " Installing " & sBulkPath
- MdlSetup.SHOW_PROGRESS_CONTROLS()
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
- hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
WAIT 1
IF hproc.State = Process.Running THEN
WAIT 1
+ 'sDump = File.Load("/tmp/installdump")
REPEAT
WAIT 1
' do the progress updating here
@@ -397,6 +404,7 @@
END IF
UNTIL
hproc.State = Process.Stopped
+ sDump = File.Load("/tmp/installdump")
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
@@ -411,7 +419,9 @@
DIM vSize AS Variant
DIM vTargetSize AS Variant
+
sDump = ""
+ SHELL "echo \"\" > /tmp/installdump" WAIT
sErr = ""
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize
@@ -425,7 +435,7 @@
FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
IF Right(sPackagePath, 3) LIKE "t?z" THEN
- hproc = SHELL "installpkg " & sPackagePath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "installpkg " & sPackagePath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
ENDIF
WAIT 1
IF hproc.State = Process.Running THEN
@@ -438,6 +448,8 @@
UNTIL
hproc.state = Process.Stopped
' now do the error checking here and return a value
+ sDump = File.Load("/tmp/installdump")
+
IF InStr(sDump, "FAILED") > 0 THEN
'ERROR HAS OCCURRED
RETURN 1
@@ -451,13 +463,20 @@
END
-PUBLIC SUB Process_read()
-
- DIM sLine AS String
- READ #LAST, sLine, -256
- sDump = sDump & gb.NewLine & sLine
- PRINT sLine
-END
+' PUBLIC SUB Process_read()
+'
+' DIM sLine AS String
+' READ #LAST, sLine, -256
+' sDump = sDump & gb.NewLine & sLine
+' PRINT sLine
+' END
+' PUBLIC SUB Process_kill()
+'
+' DIM sDump AS String = File.Load("/tmp/installdump")
+' IF InStr(sDump, "FAILED") > 0 THEN
+' Message.Error("The install process has returned an error.")
+'
+' END
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Oct 2 11:00:49 2008
@@ -406,6 +406,7 @@
WAIT
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
NEXT
+ INC iPkgNum
'error check
IF InStr(sDump, "FAILED") > 0 THEN
PRINT sPkgName & " failed to install "
@@ -454,7 +455,7 @@
PRINT "installing " & sBulkPath
FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &
sBulkDesc & " ..."
'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/
sBulkPath)
- hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulkPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\'" FOR READ
+ hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulkPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
PRINT sBulkPath
WAIT 1
IF hproc.State = Process.Running THEN
@@ -486,17 +487,31 @@
sDump = ""
sErr = ""
- hproc = SHELL "lzmadec <" & sPath_to_bulk & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "lzmadec <" & sPath_to_bulk & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" WAIT 'FOR
READ
+ WAIT
+ sDump = File.Load("/tmp/installdump")
+ IF InStr(sDump, "FAILED") > 0 THEN
+ Message.Error(("Error occurred while installing") & Space(1) &
sPath_to_bulk)
+ RETURN
+ END IF
+
END
PUBLIC SUB PACKAGE_INSTALL(sPath_To_Package AS String)
sDump = ""
+ SHELL "echo \"\" > /tmp/installdump" WAIT
sErr = ""
+ INC iPkgNum
'hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
IF Right(sPath_To_Package, 3) LIKE "t?z" THEN
- hproc = SHELL "installpkg " & sPath_To_Package & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "installpkg " & sPath_To_Package & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" WAIT 'FOR
READ
+ WAIT
+ sDump = File.Load("/tmp/installdump")
+ IF InStr(sDump, "FAILED") > 0 THEN
+ Message.Error(("Unable to install") & Space(1) &
sPath_To_Package)
+ END IF
ENDIF
END
@@ -569,7 +584,7 @@
sErr = ""
MdlCore.LOCK_GUI()
'inc iPkgNum
- hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " | tar
-xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " | tar
-xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" 'FOR READ
WAIT 2
IF hproc.State = Process.Running THEN
@@ -579,6 +594,7 @@
UNTIL
hproc.State = Process.Stopped
' error check
+ sDump = File.Load("/tmp/installdump")
IF InStr(sDump, "FAILED") > 0 THEN
Message.Error(("There has been an error
extracting") & Space(1) & sPakDesc & gb.NewLine &
"<b>ERROR</b>" & gb.NewLine &
@@ -631,7 +647,7 @@
IF iVal > FrmInstallSys.pbInstallProg.Value THEN
FrmInstallSys.pbInstallProg.Value = iVal
END IF
- PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &
iVal & "%"
+ 'PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &
iVal & "%"
END
@@ -667,20 +683,23 @@
' install each package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO sTargetSize
sTargetSize = Trim(CStr(sTargetSize))
-
+ SHELL "echo \"\" > /tmp/installdump" WAIT
sDump = ""
sErr = ""
'hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath &/
sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" WAIT 'FOR READ
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
WAIT 1
UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize)
+
' figure out the progress again
UNTIL
hproc.State = Process.Stopped
+ sDump = File.Load("/tmp/installdump")
+
IF InStr(sDump, "FAILED") > 0 THEN
ERROR
RETURN 1
@@ -717,13 +736,14 @@
DIM iTlzTotal AS Integer = 0
DIM iCurrTlz AS Integer '= 0
MdlCore.LOCK_GUI()
+ SHELL "echo \"\" > /tmp/installdump" WAIT
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
SHELL "ls " & ClsGlobal.sSourceMnt &/ "packages/required/*.t?z" TO
sRawFile
sFile = Split(sRawFile, "\n")
iTlzTotal = sFile.Count
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
- INC iPkgNum
+ 'INC iPkgNum
sTlzPath = Trim(sLine)
' now install the package with the information we already have
PRINT sTlzName & sTlzPath
@@ -736,7 +756,7 @@
'figure out the progress again
' for this one we will need to count the
packages, and base our progress on the number of packages
' installed vs the total number of packags
- iCurrTlz = i
+ 'iCurrTlz = i
'hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
ME.PACKAGE_INSTALL(sTlzPath)
@@ -754,7 +774,7 @@
NEXT
FrmInstallSys.pbInstallProg.Value = 1
WAIT 1
-
+ sDump = File.Load("/tmp/installdump")
IF InStr(sDump, "FAILED") > 0 THEN
PRINT "Error installing packages/required"
RETURN 1
@@ -772,7 +792,7 @@
DIM sCOnfLine AS String
DIM sPkgPath AS String
DIM i AS Integer
-
+ SHELL "echo \"\" > /tmp/installdump" WAIT
PRINT "Installing final system configuration"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sRawList
'Message.Info(sRawList)
@@ -796,6 +816,7 @@
hproc.State = Process.Stopped
END IF
' END IF
+ sDump = File.Load("/tmp/installdump")
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
@@ -804,13 +825,13 @@
END
-PUBLIC SUB Process_read()
-
- DIM sLine AS String
- READ #LAST, sLine, -256
- sDump = sDump & gb.NewLine & sLine
- PRINT sLine
-END
+' ' PUBLIC SUB Process_read()
+' '
+' ' DIM sLine AS String
+' ' READ #LAST, sLine, -256
+' ' sDump = sDump & gb.NewLine & sLine
+' ' PRINT sLine
+' ' END
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-02 15:08:41
|
Author: M0...@gm...
Date: Thu Oct 2 08:06:57 2008
New Revision: 206
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/installer.gambas
Log:
Reset startup class \n
update binary
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/ClsGlobal.class
+# /home/moe/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/ClsPartSel.class
+# /home/moe/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/ClsWinDrives.class
+# /home/moe/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmDiskPart.class
+# /home/moe/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmLicense.class
+# /home/moe/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmPartSel.class
+# /home/moe/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmSelISO.class
+# /home/moe/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmSummary.class
+# /home/moe/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmWinDrives.class
+# /home/moe/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlCore.module
+# /home/moe/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlDiskPart.module
+# /home/moe/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlObjSizer.module
+# /home/moe/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlPkgSel.module
+# /home/moe/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSetup.module
+# /home/moe/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSummarize.module
+# /home/moe/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Oct 2 08:06:57 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlWinDrives.module
+# /home/moe/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Oct 2 08:06:57 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmRootPass
-Version=0.0.99
+Startup=MdlCore
+Version=0.0.100
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-02 15:03:33
|
Author: M0...@gm...
Date: Thu Oct 2 08:01:40 2008
New Revision: 205
Modified:
branches/iVL/FrmEmbUsrAdd.class
branches/iVL/FrmRootPass.class
Log:
Copied useradd.gambas to run it from the resulting install
Modified: branches/iVL/FrmEmbUsrAdd.class
==============================================================================
--- branches/iVL/FrmEmbUsrAdd.class (original)
+++ branches/iVL/FrmEmbUsrAdd.class Thu Oct 2 08:01:40 2008
@@ -41,7 +41,9 @@
DIM iID AS Integer = ME.Embedder1.Id
- SHELL "$PWD/adduser.gambas " & iID & Space(1) & ME.ClientWidth &
Space(1) & ME.clientHeight
+ SHELL "cp $PWD/adduser.gambas " & ClsGlobal.sTargetMnt &/ "usr" &/ "bin"
WAIT
+ 'SHELL "$PWD/adduser.gambas " & iID & Space(1) & ME.ClientWidth &
Space(1) & ME.clientHeight
+ SHELL "chroot " & ClsGlobal.sTargetMnt & "; /usr/bin/adduser.gambas " &
iID & Space(1) & ME.ClientWidth & Space(1) & ME.ClientH
MdlCore.LOCK_GUI()
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Thu Oct 2 08:01:40 2008
@@ -21,9 +21,9 @@
END WITH
WITH FMain
- ' .tvPlan["Conf1"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf2"].picture = MdlCore.sNowPic
- ' .tvPlan["Conf2"].Selected = TRUE
+ .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf2"].picture = MdlCore.sNowPic
+ .tvPlan["Conf2"].Selected = TRUE
END WITH
ME.Frame1.text = Space(1) & ("About the root account") & Space(1)
END
|
|
From: <cod...@go...> - 2008-10-02 14:59:33
|
Author: M0...@gm...
Date: Thu Oct 2 07:57:58 2008
New Revision: 204
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.project
branches/iVL/FrmNetConf.class
branches/iVL/FrmRootPass.class
branches/iVL/MdlNetConf.module
Log:
Changed instances of gb.space() to space()
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Oct 2 07:57:58 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/.project
+# /home/moe/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Oct 2 07:57:58 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FMain.class
+# /home/moe/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Oct 2 07:57:58 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmPartScheme.class
+# /home/moe/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Oct 2 07:57:58 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmPkgSel.class
+# /home/moe/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Oct 2 07:57:58 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlPartSel.module
+# /home/moe/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Oct 2 07:57:58 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmRootPass
Version=0.0.99
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Thu Oct 2 07:57:58 2008
@@ -53,7 +53,7 @@
FOR EACH cb IN MdlNetConf.objCombos
cb.Refresh
NEXT
- ME.frmNetDevices.Text = gb.Space(1) & ("Network Interfaces") & Space(1)
+ ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
END
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Thu Oct 2 07:57:58 2008
@@ -21,11 +21,11 @@
END WITH
WITH FMain
- .tvPlan["Conf1"].Picture = MdlCore.sDonePic
- .tvPlan["Conf2"].picture = MdlCore.sNowPic
- .tvPlan["Conf2"].Selected = TRUE
+ ' .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf2"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf2"].Selected = TRUE
END WITH
- ME.Frame1.text = gb.Space(1) & ("About the root account") & gb.space(1)
+ ME.Frame1.text = Space(1) & ("About the root account") & Space(1)
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Thu Oct 2 07:57:58 2008
@@ -337,7 +337,7 @@
frmDetails = NEW Frame(FrmNetConf.TSNetDevices) AS "STaticDetails"
WITH frmDetails
.Move(ileft, itop + 8)
- .text = gb.Space(1) & ("Static IP Address Settings") & gb.Space(1)
+ .text = Space(1) & ("Static IP Address Settings") & Space(1)
FOR EACH txtbox IN objIntTypes
IF txtbox.tag = LAST.tag THEN
IF txtbox.text = ("Wired") THEN
|
|
From: <cod...@go...> - 2008-10-01 23:26:45
|
Author: rbistolfi
Date: Wed Oct 1 16:25:18 2008
New Revision: 203
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.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
Log:
Updated es translation
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsGlobal.class
+# /home/rbistolfi/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsPartSel.class
+# /home/rbistolfi/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsWinDrives.class
+# /home/rbistolfi/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FMain.class
+# /home/rbistolfi/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmDiskPart.class
+# /home/rbistolfi/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmLicense.class
+# /home/rbistolfi/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartScheme.class
+# /home/rbistolfi/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartSel.class
+# /home/rbistolfi/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPkgSel.class
+# /home/rbistolfi/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSelISO.class
+# /home/rbistolfi/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSummary.class
+# /home/rbistolfi/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmWinDrives.class
+# /home/rbistolfi/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlCore.module
+# /home/rbistolfi/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlDiskPart.module
+# /home/rbistolfi/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlObjSizer.module
+# /home/rbistolfi/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPartSel.module
+# /home/rbistolfi/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPkgSel.module
+# /home/rbistolfi/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSetup.module
+# /home/rbistolfi/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSummarize.module
+# /home/rbistolfi/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Oct 1 16:25:18 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlWinDrives.module
+# /home/rbistolfi/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Wed Oct 1 16:25:18 2008
@@ -10,797 +10,868 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmNetConf.class:159
-msgid "192.168.1.254"
-msgstr "-"
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "VectorLinux Installer"
-#: FrmPartSel.class:149
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "GUI installer for Vector linux"
-#: FrmRootPass.class:28
-msgid "About the root account"
-msgstr ""
+#: FMain.class:229
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "Please wait while setup attempts to run the partitioning utility"
-#: MdlNetConf.module:250
-msgid "Access Point"
-msgstr "ESSID"
+#: FMain.class:231
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Please wait while setup analyses your current partition setup."
-#: FrmUserAdd.class:112
-msgid "Add Users"
-msgstr "Add Users"
+#: FMain.class:231
+msgid "This may take a while ..."
+msgstr "This may take a while ..."
-#: MdlLiloOsList.module:366
-msgid "Add option to boot this Operating system into Text mode"
-msgstr "Add option to boot this Operating system into Text mode"
+#: FMain.class:245
+msgid ""
+"You must select a \"/\" partition. This is the target where the system
will "
+"install to"
+msgstr ""
+"You must select a \"/\" partition. This is the target where the system
will "
+"install to"
-#: MdlNetConf.module:290
-msgid "Automatic settings via DHCP."
-msgstr "Automatic settings via DHCP."
+#: FMain.class:301
+msgid "Skipping lilo setup"
+msgstr "Skipping lilo setup per user request"
-#: MdlNetConf.module:166
-msgid "Automatically activate this interface at start-up"
-msgstr "Automatically activate this interface at start-up"
+#: FMain.class:405
+msgid "Process Overview"
+msgstr "Process Overview"
-#: MdlSummarize.module:57
-msgid "BULK PACKAGES:"
-msgstr "BULK PACKAGES:"
+#: FMain.class:425
+msgid "Next"
+msgstr "Next"
#: FMain.class:431
msgid "Back"
msgstr "Back"
-#: FrmLilo.class:250
-msgid "Boot Default"
-msgstr "Boot Default"
-
-#: MdlCore.module:510
-msgid "Boot Menu Options"
-msgstr "Boot Menu Options"
-
-#: MdlConfLilo.module:97
-msgid "Boot loader has been setup successfully"
-msgstr "Boot loader has been setup successfully"
-
-#: FrmLilo.class:228
-msgid "Bootsplash Extra high"
-msgstr "Bootsplash Extra High"
-
-#: FrmLilo.class:228
-msgid "Bootsplash High"
-msgstr "Bootsplash High"
-
-#: FrmLilo.class:228
-msgid "Bootsplash Med"
-msgstr "Bootsplash Med"
-
-#: MdlCore.module:413
-msgid "Build Date: "
-msgstr "Build Date: "
+#: FMain.class:437
+msgid "Exit Installation"
+msgstr "Exit Installation"
#: FMain.class:453
msgid "Button1"
msgstr "-"
-#: MdlInstallCustom.module:263
-msgid "Calculating package count ... Please wait"
-msgstr "Calculating package count ... Please wait"
-
-#: MdlCore.module:491
-msgid "Cannot find SETUP.CONF"
-msgstr "Cannot find SETUP.CONF"
-
-#: FrmPartSel.class:183
-msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
-msgstr "Check this box if you have a Windows installation on your system
or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts"
-
-#: FrmUserAdd.class:116
-msgid "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
-msgstr "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
-
-#: FrmZoneSet.class:120
-msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
-msgstr "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
-
-#: FrmZoneSet.class:108
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Choose the correct timezone for the area in which you live."
-
-#: FrmPkgSel.class:22
-msgid "Choose your installation mode"
-msgstr "Choose your installation mode"
+#: FrmDiskPart.class:115
+msgid "Disk Partitioning:"
+msgstr "Disk Partitioning:"
-#: FrmPkgSel.class:60
-msgid "Choose your optional components to install."
-msgstr ""
+#: FrmEmbUsrAdd.class:20 MdlCore.module:513
+msgid "User Accounts"
+msgstr "User Accounts"
-#: FrmSelISO.class:73
-msgid "Click"
-msgstr "Click"
+#: FrmEmbUsrAdd.class:23
+msgid "Create initial user accounts"
+msgstr "Create initial user accounts"
#: FrmEmbUsrAdd.class:23
msgid "Click the button below to create a new user account."
msgstr "Click the button below to create a new user account."
-#: FrmZoneSet.class:113
-msgid "ComboBox1"
-msgstr "-"
-
-#: FrmNetConf.class:123
-msgid "Computer Name"
-msgstr "Computer Name"
-
-#: FrmLilo.class:185
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Configure and install lilo (Linux Boot Loader)"
+#: FrmEmbUsrAdd.class:23
+msgid ""
+"New user accounts can also be created after the install process is
completed."
+msgstr ""
+"New user accounts can also be created after the install process is
completed."
-#: FrmUserAdd.class:153
-msgid "Create User"
-msgstr "Create User"
+#: FrmEmbUsrAdd.class:128
+msgid "New User Account"
+msgstr "New User Account"
-#: FrmEmbUsrAdd.class:23
-msgid "Create initial user accounts"
-msgstr "Create initial user accounts"
+#: FrmHostPrep.class:130
+msgid "Vectorlinux is preparing your system for installation. Please wait."
+msgstr "Vectorlinux is preparing your system for installation. Please
wait."
#: FrmHostPrep.class:135
msgid "Current Status"
msgstr "Current Status"
+#: FrmHostPrep.class:139 FrmLilo.class:202 FrmPartScheme.class:125
+#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:243
+#: FrmSummary.class:87
+msgid "TextLabel1"
+msgstr "-"
+
#: FrmInstallSys.class:70
msgid "Current Step"
msgstr "Current Step"
+#: FrmInstallSys.class:192
+msgid "Vectorlinux is currently being installed to your system... Please
wait"
+msgstr "Vectorlinux is currently being installed to your system... Please
wait"
+
+#: FrmInstallSys.class:201
+msgid "Installing ..."
+msgstr "Installing ..."
+
+#: FrmInstallSys.class:215
+msgid "Total progress"
+msgstr "Total progress"
+
#: FrmInstallSys.class:220
msgid "Current Step "
msgstr "Current Step "
-#: MdlSummarize.module:55
-msgid "Custom"
-msgstr "Custom"
+#: FrmLangSel.class:81
+msgid "Select your language"
+msgstr "Select your language"
-#: FrmPkgSel.class:112
-msgid "Custom Install"
-msgstr "Custom Install"
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "LICENSE AGREEMENT"
-#: FrmPartSel.class:184
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
+#: FrmLicense.class:104
+msgid "TextArea1"
+msgstr "-"
-#: MdlCore.module:502
-msgid "Disk Partitioning"
-msgstr "Disk Partitioning"
+#: FrmLicense.class:110
+msgid "Yes, I Agree to the License Agreement"
+msgstr "Yes, I Agree to the License Agreement"
-#: FrmPartScheme.class:110
-msgid "Disk Partitioning Options"
-msgstr "Disk Partitioning Options"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "No, I Do Not Agree"
-#: FrmDiskPart.class:115
-msgid "Disk Partitioning:"
-msgstr "Disk Partitioning:"
+#: FrmLilo.class:35
+msgid ""
+"The following Operating Systems have been detected on this computer.
Choose "
+"your desired option"
+msgstr ""
+"The following Operating Systems have been detected on this computer.
Choose "
+"your desired option"
-#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
-msgid "Do not format"
-msgstr "Do not format"
+#: FrmLilo.class:35
+msgid ""
+"for each one of them by clicking on each tab. To proceed with the
default "
+"pre-set values, simply click"
+msgstr ""
+"for each one of them by clicking on each tab. To proceed with the
default "
+"pre-set values, simply click"
-#: MdlInstallSys.module:190 MdlWinDrives.module:119
-msgid "Do not mount"
-msgstr "Do not mount"
+#: FrmLilo.class:121
+msgid "Standard"
+msgstr "Standard"
+
+#: FrmLilo.class:185
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Configure and install lilo (Linux Boot Loader)"
#: FrmLilo.class:190
msgid "Don't Install Lilo"
msgstr "Don't Install Lilo"
-#: MdlNetConf.module:290
-msgid "Dynamic Host Control Protocol"
-msgstr "Dynamic Host Control Protocol"
-
-#: MdlNetConf.module:231
-msgid "Encryption key"
-msgstr "Encryption Key"
+#: FrmLilo.class:196 FrmNetConf.class:139
+msgid "Tab 0"
+msgstr "-"
-#: MdlNetConf.module:205
-msgid "Encryption type"
-msgstr "Encryption type"
+#: FrmLilo.class:214
+msgid "Target"
+msgstr "Target"
-#: FrmRootPass.class:129 FrmUserAdd.class:131
-msgid "Enter Password"
-msgstr "Enter Password"
+#: FrmLilo.class:220
+msgid "Video Resolution"
+msgstr "Video Resolution"
-#: MdlInstallCustom.module:343
-msgid "Error while installing "
-msgstr "Error while installing "
+#: FrmLilo.class:228
+msgid "Bootsplash Med"
+msgstr "Bootsplash Med"
-#: MdlInstallCustom.module:65
-msgid "Error while installing required system software. "
-msgstr "Error while installing required system software. "
+#: FrmLilo.class:228
+msgid "Bootsplash High"
+msgstr "Bootsplash High"
-#: MdlInstallCustom.module:72
-msgid "Error while installing system configuration. "
-msgstr "Error while installing system configuration. "
+#: FrmLilo.class:228
+msgid "Bootsplash Extra high"
+msgstr "Bootsplash Extra High"
-#: FMain.class:437
-msgid "Exit Installation"
-msgstr "Exit Installation"
+#: FrmLilo.class:233
+msgid "Prompt Timeout"
+msgstr "Prompt Timeout"
-#: MdlPartSel.module:86
-msgid "FILESYSTEM"
-msgstr "FYLESYSTEM"
-
-#: MdlCore.module:501
-msgid "Find installation media"
-msgstr "Find installation media"
-
-#: MdlInstallSys.module:597
-msgid "Finished intalling Bulks"
-msgstr "Finished intalling Bulks"
+#: FrmLilo.class:244
+msgid "Seconds"
+msgstr "Seconds"
-#: FrmRootPass.class:13
-msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess"
-msgstr "For added security, use a password that is easy for you to
remember, but hard for others to guess"
+#: FrmLilo.class:250
+msgid "Boot Default"
+msgstr "Boot Default"
-#: MdlSummarize.module:67
-msgid "Full"
-msgstr "Full"
+#: FrmNetConf.class:56
+msgid "Network Interfaces"
+msgstr ""
-#: FrmPkgSel.class:107
-msgid "Full Install"
-msgstr "Full Install"
+#: FrmNetConf.class:123
+msgid "Computer Name"
+msgstr "Computer Name"
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "GUI installer for Vector linux"
+#: FrmNetConf.class:146
+msgid "Manual DNS Server Specification"
+msgstr "Manual DNS Server Specification"
-#: MdlNetConf.module:407
-msgid "Gateway Address"
-msgstr "Gateway Address"
+#: FrmNetConf.class:151
+msgid "Primary DNS Server"
+msgstr "Primary DNS Server"
-#: MdlDiskPart.module:53
-msgid "Gparted was not found on this system. Please install gparted and
try again"
-msgstr "Gparted was not found on this system. Please install gparted and
try again"
+#: FrmNetConf.class:159
+msgid "192.168.1.254"
+msgstr "-"
-#: MdlNetConf.module:126
-msgid "Hardware Address"
-msgstr "Hardware Address"
+#: FrmNetConf.class:164
+msgid "Secondary DNS Server"
+msgstr "Secondary DNS Server"
-#: MdlCore.module:515
-msgid "Hardware Configuration"
-msgstr "Hardware Configuration"
+#: FrmNetConf.class:177 MdlCore.module:514
+msgid "Network Configuration"
+msgstr "Network Configuration"
-#: FrmPartSel.class:189
-msgid "Help"
-msgstr "Help"
+#: FrmPartScheme.class:59
+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 ""
+"Select this option if you already have a linux installation that you wish
to "
+"overwrite or if a linux parition scheme exists in your hard disk"
-#: MdlSummarize.module:55
-msgid "INSTALL TYPE:"
-msgstr "INSTALL TYPE:"
+#: FrmPartScheme.class:59
+msgid "This option will overwrite any existing data in the selected
partitions"
+msgstr ""
+"This option will overwrite any existing data in the selected partitions"
-#: MdlNetConf.module:362
-msgid "IP Address"
-msgstr "IP Address"
+#: FrmPartScheme.class:59
+msgid ""
+"Use this option if you already prepared your partitions using the "
+"VectorLinux installer"
+msgstr ""
+"Use this option if you already prepared your partitions using the "
+"VectorLinux installer"
-#: MdlNetConf.module:290
-msgid "If in doubt, choose this option"
-msgstr "If in doubt, choose this option"
+#: FrmPartScheme.class:68
+msgid ""
+"Select this option is you wish to create, more or resize partitions in
order "
+"to make room for your new VectorLinux installation."
+msgstr ""
+"Select this option if you wish to create, move or resize partitions in
order "
+"to make room for your new VectorLinux installation."
-#: MdlLiloOsList.module:94
-msgid "Include this Operating System in the boot menu"
-msgstr "Include this Operating System in the boot menu"
+#: FrmPartScheme.class:68
+msgid ""
+"This option is the safest choice if you have other existing
installations "
+"that you wish to keep."
+msgstr ""
+"This option is the safest choice if you have other existing
installations "
+"that you wish to keep."
-#: MdlLiloOsList.module:143
-msgid "Include this installation in the boot menu"
-msgstr "Include this installation in the boot menu"
+#: FrmPartScheme.class:110
+msgid "Disk Partitioning Options"
+msgstr "Disk Partitioning Options"
-#: MdlLiloOsList.module:282
-msgid "Include this operating system in the boot menu"
-msgstr "Include this operating system in the boot menu"
+#: FrmPartScheme.class:115
+msgid "Use existing disk partitions"
+msgstr "Use existing disk partitions"
-#: MdlLiloOsList.module:314
-msgid "Initial Ram Disk"
-msgstr "Initial Ram Disk"
+#: FrmPartScheme.class:120
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Modify my disk partitions to make room for new installation"
-#: MdlCore.module:508
-msgid "Install Operating System"
-msgstr "Install Operating System"
+#: FrmPartSel.class:149
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
-#: MdlCore.module:505
-msgid "Installation"
-msgstr "Installation"
+#: FrmPartSel.class:149
+msgid ""
+"Linux is a modular operating system. This means that is has the ability
to "
+"store system and"
+msgstr ""
+"Linux is a modular operating system. This means that it has the ability
to "
+"store system and"
-#: MdlCore.module:506
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#: FrmPartSel.class:149
+msgid ""
+"user data separately for added data security. You may install the system
to "
+"a single partition"
+msgstr ""
+"user data separately for added data security. You may install the system
to "
+"a single partition"
-#: MdlInstallSys.module:700
-msgid "Installation phase complete. Ready for configuration"
-msgstr "Installation phase complete. Ready for configuration"
+#: FrmPartSel.class:149
+msgid ""
+"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
+"following is a"
+msgstr ""
+"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
+"following is a"
-#: MdlInstallSys.module:455
-msgid "Installing"
-msgstr "Installing"
+#: FrmPartSel.class:149
+msgid "suggested setup for a typical Linux installation"
+msgstr "suggested setup for a typical Linux installation"
-#: FrmInstallSys.class:201
-msgid "Installing ..."
-msgstr "Installing ..."
+#: FrmPartSel.class:149
+msgid ""
+"Used to store system data. This particular install requires a minimum of"
+msgstr ""
+"Used to store system data. This particular install requires a minimum of"
-#: MdlInstallSys.module:786
-msgid "Installing Final configuration files..."
-msgstr "Installing final configuration files ..."
+#: FrmPartSel.class:149
+msgid "for this"
+msgstr "for this"
-#: MdlInstallSys.module:733
-msgid "Installing Required Packages ..."
-msgstr "Installing Required Packages ..."
+#: FrmPartSel.class:149
+msgid ""
+"but you should considear a higher value to make sure you have room to "
+"install additional software"
+msgstr ""
+"but you should considear a higher value to make sure you have room to "
+"install additional software"
-#: MdlInstallSys.module:703
-msgid "Installing default system configuration and required software."
-msgstr "Installing default system configuration and required software."
+#: FrmPartSel.class:149
+msgid "in case you wish to."
+msgstr "in case you wish to."
-#: FrmPkgSel.class:51
-msgid "Installs everything in your VectorLinux media to your system"
+#: FrmPartSel.class:149
+msgid ""
+"Used to store user documents, pictures, videos. Give yourself as much
room "
+"as you want"
msgstr ""
+"Used to store user documents, pictures, videos. Give yourself as much
room "
+"as you want"
-#: MdlNetConf.module:147
-msgid "Interface Type"
-msgstr "Interface Type"
+#: FrmPartSel.class:149
+msgid "Typically, you want to use the largest partition for this."
+msgstr "Typically, you want to use the largest partition for this."
-#: MdlDiskPart.module:46
-msgid "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"
-msgstr "It is still possible to install VectorLinux on your system, but
you need to pre-partition your disk first"
+#: FrmPartSel.class:149
+msgid ""
+"Using a swap partition is suggested if your total RAM is less than 1GB. "
+"Suggested ammount"
+msgstr ""
+"Using a swap partition is suggested if your total RAM is less than 1GB. "
+"Suggested ammount"
-#: MdlLiloOsList.module:338
-msgid "Kernel boot options"
-msgstr "Kernel boot options"
+#: FrmPartSel.class:149
+msgid "for this is"
+msgstr "for this is"
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "LICENSE AGREEMENT"
+#: FrmPartSel.class:149
+msgid "but can also be calculated as 2 times your ammount of RAM"
+msgstr "but can also be calculated as 2 times your ammount of RAM"
-#: MdlLiloOsList.module:152
-msgid "Label"
-msgstr "Label"
+#: FrmPartSel.class:174
+msgid "Please select the partitions you wish to use and how to use them"
+msgstr "Please select the partitions you wish to use and how to use them"
-#: MdlCore.module:500
-msgid "Language Selection"
-msgstr "Language Selection"
+#: FrmPartSel.class:183
+msgid ""
+"Check this box if you have a Windows installation on your system or any "
+"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
+"soon as your computer starts"
+msgstr ""
+"Check this box if you have a Windows installation on your system or any "
+"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
+"soon as your computer starts"
-#: MdlConfLilo.module:95
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo returned an error. Please see below"
+#: FrmPartSel.class:184
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
-#: FrmPartSel.class:149
-msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
-msgstr "Linux is a modular operating system. This means that it has the
ability to store system and"
+#: FrmPartSel.class:189
+msgid "Help"
+msgstr "Help"
-#: MdlDiskPart.module:57
-msgid "Loading gparted ... Please wait"
-msgstr "Loagind gparted ... Please wait"
+#: FrmPkgSel.class:22
+msgid "Choose your installation mode"
+msgstr "Choose your installation mode"
-#: FrmZoneSet.class:115
-msgid "LocalTime"
-msgstr "LocalTime"
+#: FrmPkgSel.class:51
+msgid "Installs everything in your VectorLinux media to your system"
+msgstr ""
-#: MdlCore.module:413
-msgid "MINIMUM REQUIREMENTS"
-msgstr "MINIMUM REQUIREMENTS"
+#: FrmPkgSel.class:60
+msgid "Choose your optional components to install."
+msgstr ""
-#: MdlPartSel.module:77
-msgid "MOUNT POINT"
-msgstr "MOUNT POINT"
+#: FrmPkgSel.class:107
+msgid "Full Install"
+msgstr "Full Install"
-#: MdlWinDrives.module:81
-msgid "MOUNT TO"
-msgstr "MOUNT TO"
+#: FrmPkgSel.class:112
+msgid "Custom Install"
+msgstr "Custom Install"
-#: FrmNetConf.class:146
-msgid "Manual DNS Server Specification"
-msgstr "Manual DNS Server Specification"
+#: FrmPkgsel2.class:21
+msgid "Select your indivirual packages to install."
+msgstr "Select your individual packages to install"
-#: FrmSelISO.class:133
-msgid "Minimum Disk Space Requirements"
-msgstr "Minimum Disk Space Requirements"
+#: FrmPkgsel2.class:21
+msgid "To install them all, just click next"
+msgstr "To install them all, just click next"
-#: FrmPartScheme.class:120
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modify my disk partitions to make room for new installation"
+#: FrmRootPass.class:6
+msgid "System Administrator Password"
+msgstr "System Administrator Password"
#: FrmRootPass.class:13
msgid "Most other every-day taks do not require administrative
priviledges."
msgstr "Most other every-day tasks do not require administrative
priviledges."
-#: MdlLiloOsList.module:293
-msgid "Name"
-msgstr "Name"
+#: FrmRootPass.class:13
+msgid ""
+"For added security, use a password that is easy for you to remember, but "
+"hard for others to guess"
+msgstr ""
+"For added security, use a password that is easy for you to remember, but "
+"hard for others to guess"
-#: MdlLiloOsList.module:75
-msgid "Name "
-msgstr "Name "
+#: FrmRootPass.class:28
+msgid "About the root account"
+msgstr ""
-#: FrmNetConf.class:177 MdlCore.module:514
-msgid "Network Configuration"
-msgstr "Network Configuration"
+#: FrmRootPass.class:43
+msgid ""
+"Passwords do not match. Please enter the same password twice for
accuracy."
+msgstr ""
-#: FrmNetConf.class:56
-msgid "Network Interfaces"
+#: FrmRootPass.class:101
+msgid ""
+"The linux root account is pre-assigned to be used as the system "
+"administrator's account. This account is used to perform system-wide
changes "
+"such as software upgrades, managing user accounts etc. \n"
+"\n"
+"Most other operations do not require administrative priviledges.\n"
+"The root password must be entered twice for ensured accuracy. When
choosing "
+"a root password, think of something easy for you to remember, but hard
for "
+"others to guess."
msgstr ""
+"The linux root account is pre-assigned to be used as the system "
+"administrator's account. This account is used to perform system-wide
changes "
+"such as software upgrades, managing user accounts etc. \n"
+"\n"
+"Most other operations do not require administrative priviledges.\n"
+"The root password must be entered twice for ensured accuracy. When
choosing "
+"a root password, think of something easy for you to remember, but hard
for "
+"others to guess."
-#: FrmEmbUsrAdd.class:128
-msgid "New User Account"
-msgstr "New User Account"
+#: FrmRootPass.class:107 MdlCore.module:512
+msgid "System Administrator"
+msgstr "System Administrator"
-#: FrmEmbUsrAdd.class:23
-msgid "New user accounts can also be created after the install process is
completed."
-msgstr "New user accounts can also be created after the install process is
completed."
+#: FrmRootPass.class:118
+msgid "Re-Enter Password"
+msgstr "Re-Enter Password"
-#: FMain.class:425
-msgid "Next"
-msgstr "Next"
+#: FrmRootPass.class:129 FrmUserAdd.class:131
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: FrmRootPass.class:134
+msgid "Set Password"
+msgstr "Set Password"
#: FrmSelISO.class:29 MdlCore.module:250
msgid "No Installable Media Found"
msgstr "No Installable Media Found"
-#: MdlWinDrives.module:181
-msgid "No Windows partitions detected"
-msgstr "No Windows partitions detected"
-
-#: FrmSelISO.class:232
-msgid "No installable images found."
-msgstr "No installable images found."
-
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No, I Do Not Agree"
-
-#: MdlNetConf.module:218
-msgid "None"
-msgstr "None"
+#: FrmSelISO.class:73
+msgid "Click"
+msgstr "Click"
-#: MdlInstallSys.module:142 MdlPartSel.module:148
-msgid "Not Used"
-msgstr "Not Used"
+#: FrmSelISO.class:73
+msgid "to begin installating"
+msgstr "to begin installating"
-#: MdlSummarize.module:61
-msgid "OPTIONAL PACKAGES:"
-msgstr "OPTIONAL PACKAGES:"
+#: FrmSelISO.class:98
+msgid "Unable to identify distro."
+msgstr "Unable to identify distro."
-#: MdlSummarize.module:49
-msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
-msgstr "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+#: FrmSelISO.class:133
+msgid "Minimum Disk Space Requirements"
+msgstr "Minimum Disk Space Requirements"
-#: MdlLiloOsList.module:270
-msgid "Operating system installed in "
-msgstr "Operating system installed in"
+#: FrmSelISO.class:232
+msgid "No installable images found."
+msgstr "No installable images found."
-#: MdlPartSel.module:67 MdlWinDrives.module:71
-msgid "PARTITION"
-msgstr "PARTITION"
+#: FrmSelISO.class:238
+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"
-#: MdlSummarize.module:28
-msgid "PARTITIONING LAYOUT"
-msgstr "PARTITION LAYOUT"
+#: FrmSelISO.class:248
+msgid "Search Again"
+msgstr "Search Again"
-#: MdlInstallSys.module:359
-msgid "Packages have been installed in your system. Please click"
-msgstr "Packages have been installed to your system. Please click"
+#: FrmUserAdd.class:112
+msgid "Add Users"
+msgstr "Add Users"
-#: FrmRootPass.class:43
-msgid "Passwords do not match. Please enter the same password twice for
accuracy."
+#: FrmUserAdd.class:116
+msgid ""
+"Choose a unique name for each user. Enter the password for twice for "
+"accuracy. You can make as many users as you want, and when you are
finished "
+"click next to continue."
msgstr ""
+"Choose a unique name for each user. Enter the password for twice for "
+"accuracy. You can make as many users as you want, and when you are
finished "
+"click next to continue."
-#: MdlPartSel.module:293
-msgid "Please select only one "
-msgstr "Please select only one "
+#: FrmUserAdd.class:121
+msgid "Username"
+msgstr "Username"
-#: FrmPartSel.class:174
-msgid "Please select the partitions you wish to use and how to use them"
-msgstr "Please select the partitions you wish to use and how to use them"
+#: FrmUserAdd.class:142
+msgid "ReEnter Password"
+msgstr "ReEnter Password"
-#: FMain.class:231
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Please wait while setup analyses your current partition setup."
+#: FrmUserAdd.class:153
+msgid "Create User"
+msgstr "Create User"
-#: FMain.class:229
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr "Please wait while setup attempts to run the partitioning utility"
+#: FrmWinDrives.class:72
+msgid "Select the windows partitions you would like to mount during boot"
+msgstr "Select the windows partitions you would like to mount during boot"
-#: MdlNetConf.module:105
-msgid "Plugged-in"
-msgstr "Plugged-in"
+#: FrmZoneSet.class:21
+msgid "Timezone configuration"
+msgstr "Timezone configuration"
-#: MdlCore.module:499
-msgid "Preparation"
-msgstr "Preparation"
+#: FrmZoneSet.class:99
+msgid "Set TimeZone"
+msgstr "Set TimeZone"
-#: FrmNetConf.class:151
-msgid "Primary DNS Server"
-msgstr "Primary DNS Server"
+#: FrmZoneSet.class:108
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Choose the correct timezone for the area in which you live."
-#: FMain.class:405
-msgid "Process Overview"
-msgstr "Process Overview"
+#: FrmZoneSet.class:113
+msgid "ComboBox1"
+msgstr "-"
-#: FrmLilo.class:233
-msgid "Prompt Timeout"
-msgstr "Prompt Timeout"
+#: FrmZoneSet.class:115
+msgid "LocalTime"
+msgstr "LocalTime"
-#: FrmRootPass.class:118
-msgid "Re-Enter Password"
-msgstr "Re-Enter Password"
+#: FrmZoneSet.class:115
+msgid "UTC"
+msgstr "UTC"
-#: FrmUserAdd.class:142
-msgid "ReEnter Password"
-msgstr "ReEnter Password"
+#: FrmZoneSet.class:120
+msgid ""
+"Choose how\n"
+"your hardware clock is set up.\n"
+"Choose UTC if you know that the clock is set up to\n"
+"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
+"Choose localtime since most PCs are setup this way."
+msgstr ""
+"Choose how\n"
+"your hardware clock is set up.\n"
+"Choose UTC if you know that the clock is set up to\n"
+"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
+"Choose localtime since most PCs are setup this way."
-#: MdlCore.module:511
-msgid "Regional Settings"
-msgstr "Regional Settings"
+#: MdlConfLilo.module:95
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo returned an error. Please see below"
-#: MdlNetConf.module:274
-msgid "STATUS:"
-msgstr "STATUS:"
+#: MdlConfLilo.module:97
+msgid "Boot loader has been setup successfully"
+msgstr "Boot loader has been setup successfully"
#: MdlCore.module:234
msgid "Scanning system for installable media. Please wait ..."
msgstr "Scanning system for installable media. Please wait ..."
-#: FrmSelISO.class:248
-msgid "Search Again"
-msgstr "Search Again"
-
-#: FrmNetConf.class:164
-msgid "Secondary DNS Server"
-msgstr "Secondary DNS Server"
-
-#: FrmLilo.class:244
-msgid "Seconds"
-msgstr "Seconds"
-
-#: FrmWinDrives.class:72
-msgid "Select the windows partitions you would like to mount during boot"
-msgstr "Select the windows partitions you would like to mount during boot"
-
-#: FrmPartScheme.class:59
-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 "Select this option if you already have a linux installation that
you wish to overwrite or if a linux parition scheme exists in your hard
disk"
-
-#: FrmPartScheme.class:68
-msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
-msgstr "Select this option if you wish to create, move or resize
partitions in order to make room for your new VectorLinux installation."
-
-#: FrmSelISO.class:238
-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"
-
-#: FrmPkgsel2.class:21
-msgid "Select your indivirual packages to install."
-msgstr "Select your individual packages to install"
+#: MdlCore.module:252
+msgid ""
+"Setup was unable to find any installable media on your system. Please
insert "
+"your VectorLinux "
+msgstr ""
+"Setup was unable to find any installable media on your system. Please
insert "
+"your VectorLinux "
-#: FrmLangSel.class:81
-msgid "Select your language"
-msgstr "Select your language"
+#: MdlCore.module:252
+msgid "installation CD and click "
+msgstr "installation CD and click "
-#: FrmRootPass.class:134
-msgid "Set Password"
-msgstr "Set Password"
+#: MdlCore.module:252
+msgid "to try again"
+msgstr "to try again"
-#: FrmZoneSet.class:99
-msgid "Set TimeZone"
-msgstr "Set TimeZone"
+#: MdlCore.module:413
+msgid "Build Date: "
+msgstr "Build Date: "
-#: MdlNetConf.module:179
-msgid "Setup Mode"
-msgstr "Setup Mode"
+#: MdlCore.module:413
+msgid "MINIMUM REQUIREMENTS"
+msgstr "MINIMUM REQUIREMENTS"
#: MdlCore.module:418
-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 "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
+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 ""
+"Setup is unable to find SETUP.CONF in your install media. This could be "
+"symptoms of a bad burn or a bad ISO"
-#: MdlDiskPart.module:90
-msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
-msgstr "Setup is unable to successfully run gparted on this system. This
may be a sign of"
+#: MdlCore.module:491
+msgid "Cannot find SETUP.CONF"
+msgstr "Cannot find SETUP.CONF"
-#: MdlCore.module:252
-msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
-msgstr "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
+#: MdlCore.module:499
+msgid "Preparation"
+msgstr "Preparation"
-#: MdlDiskPart.module:95
-msgid "Several windows found. I will take the first one!"
-msgstr "Several windows found. I will take the first one!"
+#: MdlCore.module:500
+msgid "Language Selection"
+msgstr "Language Selection"
-#: FMain.class:301
-msgid "Skipping lilo setup"
-msgstr "Skipping lilo setup per user request"
+#: MdlCore.module:501
+msgid "Find installation media"
+msgstr "Find installation media"
+
+#: MdlCore.module:502
+msgid "Disk Partitioning"
+msgstr "Disk Partitioning"
#: MdlCore.module:503
msgid "Software Selection"
msgstr "Software Selection"
-#: FrmLilo.class:121
-msgid "Standard"
-msgstr "Standard"
+#: MdlCore.module:505
+msgid "Installation"
+msgstr "Installation"
-#: MdlNetConf.module:340
-msgid "Static IP Address Settings"
-msgstr ""
+#: MdlCore.module:506
+msgid "Installation Summary"
+msgstr "Installation Summary"
-#: MdlNetConf.module:385
-msgid "Subnet Mask"
-msgstr "Subnet Mask"
-
-#: FrmRootPass.class:107 MdlCore.module:512
-msgid "System Administrator"
-msgstr "System Administrator"
-
-#: FrmRootPass.class:6
-msgid "System Administrator Password"
-msgstr "System Administrator Password"
+#: MdlCore.module:508
+msgid "Install Operating System"
+msgstr "Install Operating System"
#: MdlCore.module:509
msgid "System Configuration"
msgstr "System Configuration"
-#: FrmLilo.class:196 FrmNetConf.class:139
-msgid "Tab 0"
-msgstr "-"
+#: MdlCore.module:510
+msgid "Boot Menu Options"
+msgstr "Boot Menu Options"
-#: FrmLilo.class:214
-msgid "Target"
-msgstr "Target"
+#: MdlCore.module:511
+msgid "Regional Settings"
+msgstr "Regional Settings"
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: MdlCore.module:515
+msgid "Hardware Configuration"
+msgstr "Hardware Configuration"
-#: FrmSummary.class:87
-msgid "TextLabel1"
-msgstr "-"
+#: MdlDiskPart.module:46
+msgid ""
+"VectorLinux is unable to determine the type of hard disks on your system."
+msgstr ""
+"VectorLinux is unable to determine the type of hard disks on your system."
-#: FrmLilo.class:35
-msgid "The following Operating Systems have been detected on this
computer. Choose your desired option"
-msgstr "The following Operating Systems have been detected on this
computer. Choose your desired option"
+#: MdlDiskPart.module:46
+msgid ""
+"It is still possible to install VectorLinux on your system, but you need
to "
+"pre-partition your disks first"
+msgstr ""
+"It is still possible to install VectorLinux on your system, but you need
to "
+"pre-partition your disk first"
-#: FrmRootPass.class:101
-msgid "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
-msgstr "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
+#: MdlDiskPart.module:53
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+"Gparted was not found on this system. Please install gparted and try
again"
+
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Loagind gparted ... Please wait"
+
+#: MdlDiskPart.module:90
+msgid ""
+"Setup is unable to successfully run gparted on this system. This may be
a "
+"sign of "
+msgstr ""
+"Setup is unable to successfully run gparted on this system. This may be
a "
+"sign of"
+
+#: MdlDiskPart.module:90
+msgid "a bad install media. Setup cannot continue."
+msgstr "a bad install media. Setup cannot continue."
+
+#: MdlDiskPart.module:95
+msgid "Several windows found. I will take the first one!"
+msgstr "Several windows found. I will take the first one!"
#: MdlInstallCustom.module:43
msgid "There as been an error while installing required system software. "
msgstr "There as been an error while installing required system software. "
-#: MdlInstallSys.module:585
-msgid "There has been an error extracting"
-msgstr "There has been an error extracting"
-
-#: MdlInstallCustom.module:57
-msgid "There has been an error while installing optional software to your
system."
-msgstr ""
-
#: MdlInstallCustom.module:50
-msgid "There has been an error while installing optional software to your
system. "
-msgstr "There has been an error while installing optional software to your
system. "
+msgid ""
+"There has been an error while installing optional software to your
system. "
+msgstr ""
+"There has been an error while installing optional software to your
system. "
-#: MdlPartFrmt.module:121
-msgid "There has been an error while trying to format "
+#: MdlInstallCustom.module:57
+msgid ""
+"There has been an error while installing optional software to your
system."
msgstr ""
-#: FMain.class:231
-msgid "This may take a while ..."
-msgstr "This may take a while ..."
+#: MdlInstallCustom.module:65
+msgid "Error while installing required system software. "
+msgstr "Error while installing required system software. "
-#: FrmPartScheme.class:68
-msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
-msgstr "This option is the safest choice if you have other existing
installations that you wish to keep."
+#: MdlInstallCustom.module:72
+msgid "Error while installing system configuration. "
+msgstr "Error while installing system configuration. "
-#: FrmPartScheme.class:59
-msgid "This option will overwrite any existing data in the selected
partitions"
-msgstr "This option will overwrite any existing data in the selected
partitions"
+#: MdlInstallCustom.module:79
+msgid "Unable to install kernels. "
+msgstr "Unable to install kernels. "
-#: MdlNetConf.module:290
-msgid "This will work if you use a cable or DSL modem on a home network."
-msgstr "This will work if you use a cable or DSL modem on a home network."
+#: MdlInstallCustom.module:90
+msgid ""
+"Vectorlinux is now installed in your system. Please click next to
configure "
+"it."
+msgstr ""
+"Vectorlinux is now installed in your system. Please click next to
configure "
+"it."
-#: FrmZoneSet.class:21
-msgid "Timezone configuration"
-msgstr "Timezone configuration"
+#: MdlInstallCustom.module:91
+msgid ""
+"packages have been Installed. Please click next to move on to System "
+"Configuration."
+msgstr ""
+"packages have been Installed. Please click next to move on to System "
+"Configuration."
-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "To install them all, just click next"
+#: MdlInstallCustom.module:263
+msgid "Calculating package count ... Please wait"
+msgstr "Calculating package count ... Please wait"
#: MdlInstallCustom.module:311
msgid "Total packages to be installed = "
msgstr "Total packages to be installed = "
-#: FrmInstallSys.class:215
-msgid "Total progress"
-msgstr "Total progress"
+#: MdlInstallCustom.module:343
+msgid "Error while installing "
+msgstr "Error while installing "
-#: FrmPartSel.class:149
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Typically, you want to use the largest partition for this."
+#: MdlInstallSys.module:118
+msgid "Writing new /etc/fstab to system"
+msgstr "Writing new /etc/fstab to system"
-#: FrmZoneSet.class:115
-msgid "UTC"
-msgstr "UTC"
+#: MdlInstallSys.module:142 MdlPartSel.module:148
+msgid "Not Used"
+msgstr "Not Used"
-#: FrmSelISO.class:98
-msgid "Unable to identify distro."
-msgstr "Unable to identify distro."
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
+msgid "Do not format"
+msgstr "Do not format"
-#: MdlInstallCustom.module:79
-msgid "Unable to install kernels. "
-msgstr "Unable to install kernels. "
+#: MdlInstallSys.module:190 MdlWinDrives.module:119
+msgid "Do not mount"
+msgstr "Do not mount"
-#: MdlNetConf.module:107
-msgid "Unplugged"
-msgstr "Unplugged"
+#: MdlInstallSys.module:358
+msgid "Vectorlinux is now installed in your system. Please click"
+msgstr "Vectorlinux is now installed in your system. Please click"
-#: FrmPartScheme.class:115
-msgid "Use existing disk partitions"
-msgstr "Use existing disk partitions"
+#: MdlInstallSys.module:358
+msgid "to configure it."
+msgstr "to configure it."
-#: FrmPartScheme.class:59
-msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
-msgstr "Use this option if you already prepared your partitions using the
VectorLinux installer"
+#: MdlInstallSys.module:359
+msgid "Packages have been installed in your system. Please click"
+msgstr "Packages have been installed to your system. Please click"
-#: FrmPartSel.class:149
-msgid "Used to store system data. This particular install requires a
minimum of"
-msgstr "Used to store system data. This particular install requires a
minimum of"
+#: MdlInstallSys.module:455
+msgid "Installing"
+msgstr "Installing"
-#: FrmPartSel.class:149
-msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
-msgstr "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
+#: MdlInstallSys.module:542
+msgid "Vectorlinux is now being installed. Please wait..."
+msgstr "Vectorlinux is now being installed. Please wait..."
-#: FrmEmbUsrAdd.class:20 MdlCore.module:513
-msgid "User Accounts"
-msgstr "User Accounts"
+#: MdlInstallSys.module:585
+msgid "There has been an error extracting"
+msgstr "There has been an error extracting"
-#: FrmUserAdd.class:121
-msgid "Username"
-msgstr "Username"
+#: MdlInstallSys.module:597
+msgid "Finished intalling Bulks"
+msgstr "Finished intalling Bulks"
-#: FrmPartSel.class:149
-msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
-msgstr "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
+#: MdlInstallSys.module:700
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Installation phase complete. Ready for configuration"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "VectorLinux Installer"
+#: MdlInstallSys.module:703
+msgid "Installing default system configuration and required software."
+msgstr "Installing default system configuration and required software."
-#: MdlDiskPart.module:46
-msgid "VectorLinux is unable to determine the type of hard disks on your
system."
-msgstr "VectorLinux is unable to determine the type of hard disks on your
system."
+#: MdlInstallSys.module:733
+msgid "Installing Required Packages ..."
+msgstr "Installing Required Packages ..."
-#: FrmInstallSys.class:192
-msgid "Vectorlinux is currently being installed to your system... Please
wait"
-msgstr "Vectorlinux is currently being installed to your system... Please
wait"
+#: MdlInstallSys.module:786
+msgid "Installing Final configuration files..."
+msgstr "Installing final configuration files ..."
-#: MdlInstallSys.module:542
-msgid "Vectorlinux is now being installed. Please wait..."
-msgstr "Vectorlinux is now being installed. Please wait..."
+#: MdlLiloOsList.module:67
+msgid "Windows installation found in "
+msgstr "Windows installation found in "
-#: MdlInstallSys.module:358
-msgid "Vectorlinux is now installed in your system. Please click"
-msgstr "Vectorlinux is now installed in your system. Please click"
+#: MdlLiloOsList.module:75
+msgid "Name "
+msgstr "Name "
-#: MdlInstallCustom.module:90
-msgid "Vectorlinux is now installed in your system. Please click next to
configure it."
-msgstr "Vectorlinux is now installed in your system. Please click next to
configure it."
+#: MdlLiloOsList.module:94
+msgid "Include this Operating System in the boot menu"
+msgstr "Include this Operating System in the boot menu"
-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr "Vectorlinux is preparing your system for installation. Please
wait."
+#: MdlLiloOsList.module:143
+msgid "Include this installation in the boot menu"
+msgstr "Include this installation in the boot menu"
-#: FrmLilo.class:220
-msgid "Video Resolution"
-msgstr "Video Resolution"
+#: MdlLiloOsList.module:152
+msgid "Label"
+msgstr "Label"
-#: MdlWinDrives.module:55
-msgid "Windows Partitions Detected"
-msgstr "Windows Partitions Detected"
+#: MdlLiloOsList.module:270
+msgid "Operating system installed in "
+msgstr "Operating system installed in"
-#: MdlLiloOsList.module:67
-msgid "Windows installation found in "
-msgstr "Windows installation found in "
+#: MdlLiloOsList.module:282
+msgid "Include this operating system in the boot menu"
+msgstr "Include this operating system in the boot menu"
+
+#: MdlLiloOsList.module:293
+msgid "Name"
+msgstr "Name"
+
+#: MdlLiloOsList.module:314
+msgid "Initial Ram Disk"
+msgstr "Initial Ram Disk"
+
+#: MdlLiloOsList.module:338
+msgid "Kernel boot options"
+msgstr "Kernel boot options"
+
+#: MdlLiloOsList.module:366
+msgid "Add option to boot this Operating system into Text mode"
+msgstr "Add option to boot this Operating system into Text mode"
#: MdlNetConf.module:93
msgid "Wired"
@@ -810,87 +881,150 @@
msgid "Wireless"
msgstr "Wireless"
-#: MdlInstallSys.module:118
-msgid "Writing new /etc/fstab to system"
-msgstr "Writing new /etc/fstab to system"
+#: MdlNetConf.module:105
+msgid "Plugged-in"
+msgstr "Plugged-in"
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "Yes, I Agree to the License Agreement"
+#: MdlNetConf.module:107
+msgid "Unplugged"
+msgstr "Unplugged"
-#: FMain.class:245
-msgid "You must select a \"/\" partition. This is the target where the
system will install to"
-msgstr "You must select a \"/\" partition. This is the target where the
system will install to"
+#: MdlNetConf.module:126
+msgid "Hardware Address"
+msgstr "Hardware Address"
-#: MdlDiskPart.module:90
-msgid "a bad install media. Setup cannot continue."
-msgstr "a bad install media. Setup cannot continue."
+#: MdlNetConf.module:147
+msgid "Interface Type"
+msgstr "Interface Type"
-#: FrmPartSel.class:149
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr "but can also be calculated as 2 times your ammount of RAM"
+#: MdlNetConf.module:166
+msgid "Automatically activate this interface at start-up"
+msgstr "Automatically activate this interface at start-up"
-#: FrmPartSel.class:149
-msgid "but you should considear a higher value to make sure you have room
to install additional software"
-msgstr "but you should considear a higher value to make sure you have room
to install additional software"
+#: MdlNetConf.module:179
+msgid "Setup Mode"
+msgstr "Setup Mode"
-#: FrmPartSel.class:149
-msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
-msgstr "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
+#: MdlNetConf.module:205
+msgid "Encryption type"
+msgstr "Encryption type"
-#: FrmLilo.class:35
-msgid "for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click"
-msgstr "for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click"
+#: MdlNetConf.module:218
+msgid "None"
+msgstr "None"
-#: FrmPartSel.class:149
-msgid "for this"
-msgstr "for this"
+#: MdlNetConf.module:231
...
[truncated message content] |
|
From: <cod...@go...> - 2008-10-01 21:14:54
|
Author: m0e.lnx
Date: Wed Oct 1 14:09:57 2008
New Revision: 201
Modified:
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/en_US.mo
branches/iVL/.lang/en_US.po
branches/iVL/DevLog
branches/iVL/FrmNetConf.class
branches/iVL/FrmNetConf.form
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmRootPass.form
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlNetConf.module
branches/iVL/MdlPartSel.module
Log:
- Fixed problem with ucase(string) in partitioning scheme window
- Updated binary
- Removed blank spaces off strings (to keep translations in consistency)
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Oct 1 14:09:57 2008
@@ -18,6 +18,14 @@
msgid "Choose your installation mode"
msgstr ""
+#: FrmPkgSel.class:51
+msgid "Installs everything in your VectorLinux media to your system"
+msgstr ""
+
+#: FrmPkgSel.class:60
+msgid "Choose your optional components to install."
+msgstr ""
+
#: FrmPkgSel.class:101
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Oct 1 14:09:57 2008
@@ -39,6 +39,6 @@
msgstr ""
#: MdlPartSel.module:293
-msgid " partition"
+msgid "partition"
msgstr ""
Modified: branches/iVL/.lang/en_US.mo
==============================================================================
Binary files. No diff available.
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Wed Oct 1 14:09:57 2008
@@ -10,1033 +10,887 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "VectorLinux Installer"
+#: FrmNetConf.class:159
+msgid "192.168.1.254"
+msgstr "-"
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "GUI installer for Vector linux"
+#: FrmPartSel.class:149
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
-#: FMain.class:229
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr "Please wait while setup attempts to run the partitioning utility"
+#: FrmRootPass.class:28
+msgid "About the root account"
+msgstr ""
-#: FMain.class:231
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Please wait while setup analyses your current partition setup."
+#: MdlNetConf.module:250
+msgid "Access Point"
+msgstr "ESSID"
-#: FMain.class:231
-msgid "This may take a while ..."
-msgstr "This may take a while ..."
+#: FrmUserAdd.class:112
+msgid "Add Users"
+msgstr "Add Users"
-#: FMain.class:245
-msgid ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
-msgstr ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
+#: MdlLiloOsList.module:366
+msgid "Add option to boot this Operating system into Text mode"
+msgstr "Add option to boot this Operating system into Text mode"
-#: FMain.class:300
-msgid "Skipping lilo setup"
-msgstr "Skipping lilo setup per user request"
+#: MdlNetConf.module:290
+msgid "Automatic settings via DHCP."
+msgstr "Automatic settings via DHCP."
-#: FMain.class:404
-msgid "Process Overview"
-msgstr "Process Overview"
+#: MdlNetConf.module:166
+msgid "Automatically activate this interface at start-up"
+msgstr "Automatically activate this interface at start-up"
-#: FMain.class:424
-msgid "Next"
-msgstr "Next"
+#: MdlSummarize.module:57
+msgid "BULK PACKAGES:"
+msgstr "BULK PACKAGES:"
-#: FMain.class:430
+#: FMain.class:431
msgid "Back"
msgstr "Back"
-#: FMain.class:436
-msgid "Exit Installation"
-msgstr "Exit Installation"
+#: FrmLilo.class:250
+msgid "Boot Default"
+msgstr "Boot Default"
-#: FMain.class:452
-msgid "Button1"
-msgstr "-"
+#: MdlCore.module:510
+msgid "Boot Menu Options"
+msgstr "Boot Menu Options"
-#: FrmDiskPart.class:115
-msgid "Disk Partitioning:"
-msgstr "Disk Partitioning:"
+#: MdlConfLilo.module:97
+msgid "Boot loader has been setup successfully"
+msgstr "Boot loader has been setup successfully"
-#: FrmEmbUsrAdd.class:112
-msgid "New User Account"
-msgstr "New User Account"
+#: FrmLilo.class:228
+msgid "Bootsplash Extra high"
+msgstr "Bootsplash Extra High"
-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr "Vectorlinux is preparing your system for installation. Please
wait."
+#: FrmLilo.class:228
+msgid "Bootsplash High"
+msgstr "Bootsplash High"
-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Current Status"
+#: FrmLilo.class:228
+msgid "Bootsplash Med"
+msgstr "Bootsplash Med"
-#: FrmHostPrep.class:139 FrmLilo.class:203 FrmPartScheme.class:125
-#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:243
-#: FrmSummary.class:87
-msgid "TextLabel1"
+#: MdlCore.module:413
+msgid "Build Date: "
+msgstr "Build Date: "
+
+#: FMain.class:453
+msgid "Button1"
msgstr "-"
-#: FrmInstallSys.class:50
-msgid "Current Step"
-msgstr "Current Step"
+#: MdlInstallCustom.module:263
+msgid "Calculating package count ... Please wait"
+msgstr "Calculating package count ... Please wait"
-#: FrmInstallSys.class:170
-msgid "Vectorlinux is currently being installed to your system... Please
wait"
-msgstr "Vectorlinux is currently being installed to your system... Please
wait"
+#: MdlCore.module:491
+msgid "Cannot find SETUP.CONF"
+msgstr "Cannot find SETUP.CONF"
-#: FrmInstallSys.class:179
-msgid "Installing ..."
-msgstr "Installing ..."
+#: FrmPartSel.class:183
+msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
+msgstr "Check this box if you have a Windows installation on your system
or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts"
-#: FrmInstallSys.class:193
-msgid "Total progress"
-msgstr "Total progress"
+#: FrmUserAdd.class:116
+msgid "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
+msgstr "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
-#: FrmInstallSys.class:198
-msgid "Current Step "
-msgstr "Current Step "
+#: FrmZoneSet.class:120
+msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
+msgstr "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
-#: FrmLangSel.class:79
-msgid "Select your language"
-msgstr "Select your language"
+#: FrmZoneSet.class:108
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Choose the correct timezone for the area in which you live."
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "LICENSE AGREEMENT"
+#: FrmPkgSel.class:22
+msgid "Choose your installation mode"
+msgstr "Choose your installation mode"
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: FrmPkgSel.class:60
+msgid "Choose your optional components to install."
+msgstr ""
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "Yes, I Agree to the License Agreement"
+#: FrmSelISO.class:73
+msgid "Click"
+msgstr "Click"
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No, I Do Not Agree"
+#: FrmEmbUsrAdd.class:23
+msgid "Click the button below to create a new user account."
+msgstr "Click the button below to create a new user account."
-#: FrmLilo.class:34
-msgid ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
-msgstr ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
+#: FrmZoneSet.class:113
+msgid "ComboBox1"
+msgstr "-"
-#: FrmLilo.class:34
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
-msgstr ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
+#: FrmNetConf.class:123
+msgid "Computer Name"
+msgstr "Computer Name"
-#: FrmLilo.class:186
+#: FrmLilo.class:185
msgid "Configure and install lilo (Linux Boot Loader)"
msgstr "Configure and install lilo (Linux Boot Loader)"
-#: FrmLilo.class:191
-msgid "Don't Install Lilo"
-msgstr "Don't Install Lilo"
-
-#: FrmLilo.class:197 FrmNetConf.class:129
-msgid "Tab 0"
-msgstr "-"
+#: FrmUserAdd.class:153
+msgid "Create User"
+msgstr "Create User"
-#: FrmLilo.class:215
-msgid "Target"
-msgstr "Target"
+#: FrmEmbUsrAdd.class:23
+msgid "Create initial user accounts"
+msgstr "Create initial user accounts"
-#: FrmLilo.class:221
-msgid "Video Resolution"
-msgstr "Video Resolution"
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Current Status"
-#: FrmLilo.class:229
-msgid "Standard"
-msgstr "Standard"
+#: FrmInstallSys.class:70
+msgid "Current Step"
+msgstr "Current Step"
-#: FrmLilo.class:229
-msgid "Bootsplash Med"
-msgstr "Bootsplash Med"
+#: FrmInstallSys.class:220
+msgid "Current Step "
+msgstr "Current Step "
-#: FrmLilo.class:229
-msgid "Bootsplash High"
-msgstr "Bootsplash High"
+#: MdlSummarize.module:55
+msgid "Custom"
+msgstr "Custom"
-#: FrmLilo.class:229
-msgid "Bootsplash Extra high"
-msgstr "Bootsplash Extra High"
+#: FrmPkgSel.class:112
+msgid "Custom Install"
+msgstr "Custom Install"
-#: FrmLilo.class:234
-msgid "Prompt Timeout"
-msgstr "Prompt Timeout"
+#: FrmPartSel.class:184
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
-#: FrmLilo.class:245
-msgid "Seconds"
-msgstr "Seconds"
+#: MdlCore.module:502
+msgid "Disk Partitioning"
+msgstr "Disk Partitioning"
-#: FrmLilo.class:251
-msgid "Boot Default"
-msgstr "Boot Default"
+#: FrmPartScheme.class:110
+msgid "Disk Partitioning Options"
+msgstr "Disk Partitioning Options"
-#: FrmNetConf.class:113
-msgid "Computer Name"
-msgstr "Computer Name"
+#: FrmDiskPart.class:115
+msgid "Disk Partitioning:"
+msgstr "Disk Partitioning:"
-#: FrmNetConf.class:124
-msgid " Network Interfaces"
-msgstr "Network Interfaces"
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
+msgid "Do not format"
+msgstr "Do not format"
-#: FrmNetConf.class:136
-msgid "Manual DNS Server Specification"
-msgstr "Manual DNS Server Specification"
+#: MdlInstallSys.module:190 MdlWinDrives.module:119
+msgid "Do not mount"
+msgstr "Do not mount"
-#: FrmNetConf.class:141
-msgid "Primary DNS Server"
-msgstr "Primary DNS Server"
+#: FrmLilo.class:190
+msgid "Don't Install Lilo"
+msgstr "Don't Install Lilo"
-#: FrmNetConf.class:149
-msgid "192.168.1.254"
-msgstr "-"
+#: MdlNetConf.module:290
+msgid "Dynamic Host Control Protocol"
+msgstr "Dynamic Host Control Protocol"
-#: FrmNetConf.class:154
-msgid "Secondary DNS Server"
-msgstr "Secondary DNS Server"
+#: MdlNetConf.module:231
+msgid "Encryption key"
+msgstr "Encryption Key"
-#: FrmNetConf.class:167
-msgid "NETWORK CONFIGURATION"
-msgstr ""
+#: MdlNetConf.module:205
+msgid "Encryption type"
+msgstr "Encryption type"
-#: FrmPartScheme.class:59
-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 ""
-"Select this option if you already have a linux installation that you wish
to "
-"overwrite or if a linux parition scheme exists in your hard disk"
+#: FrmRootPass.class:129 FrmUserAdd.class:131
+msgid "Enter Password"
+msgstr "Enter Password"
-#: FrmPartScheme.class:59
-msgid "This option will overwrite any existing data in the selected
partitions"
-msgstr ""
-"This option will overwrite any existing data in the selected partitions"
+#: MdlInstallCustom.module:343
+msgid "Error while installing "
+msgstr "Error while installing "
-#: FrmPartScheme.class:59
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-msgstr ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
+#: MdlInstallCustom.module:65
+msgid "Error while installing required system software. "
+msgstr "Error while installing required system software. "
-#: FrmPartScheme.class:68
-msgid ""
-"Select this option is you wish to create, more or resize partitions in
order "
-"to make room for your new VectorLinux installation."
-msgstr ""
-"Select this option if you wish to create, move or resize partitions in
order "
-"to make room for your new VectorLinux installation."
+#: MdlInstallCustom.module:72
+msgid "Error while installing system configuration. "
+msgstr "Error while installing system configuration. "
-#: FrmPartScheme.class:68
-msgid ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
-msgstr ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
+#: FMain.class:437
+msgid "Exit Installation"
+msgstr "Exit Installation"
-#: FrmPartScheme.class:110
-msgid "Disk Partitioning Options"
-msgstr "Disk Partitioning Options"
+#: MdlPartSel.module:86
+msgid "FILESYSTEM"
+msgstr "FYLESYSTEM"
-#: FrmPartScheme.class:115
-msgid "Use existing disk partitions"
-msgstr "Use existing disk partitions"
+#: MdlCore.module:501
+msgid "Find installation media"
+msgstr "Find installation media"
-#: FrmPartScheme.class:120
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modify my disk partitions to make room for new installation"
+#: MdlInstallSys.module:597
+msgid "Finished intalling Bulks"
+msgstr "Finished intalling Bulks"
-#: FrmPartSel.class:149
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
+#: FrmRootPass.class:13
+msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess"
+msgstr "For added security, use a password that is easy for you to
remember, but hard for others to guess"
-#: FrmPartSel.class:149
-msgid ""
-"Linux is a modular operating system. This means that is has the ability
to "
-"store system and"
-msgstr ""
-"Linux is a modular operating system. This means that it has the ability
to "
-"store system and"
+#: MdlSummarize.module:67
+msgid "Full"
+msgstr "Full"
-#: FrmPartSel.class:149
-msgid ""
-"user data separately for added data security. You may install the system
to "
-"a single partition"
-msgstr ""
-"user data separately for added data security. You may install the system
to "
-"a single partition"
+#: FrmPkgSel.class:107
+msgid "Full Install"
+msgstr "Full Install"
-#: FrmPartSel.class:149
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
-msgstr ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "GUI installer for Vector linux"
-#: FrmPartSel.class:149
-msgid "suggested setup for a typical Linux installation"
-msgstr "suggested setup for a typical Linux installation"
+#: MdlNetConf.module:407
+msgid "Gateway Address"
+msgstr "Gateway Address"
-#: FrmPartSel.class:149
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
-msgstr ""
-"Used to store system data. This particular install requires a minimum of"
+#: MdlDiskPart.module:53
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr "Gparted was not found on this system. Please install gparted and
try again"
-#: FrmPartSel.class:149
-msgid "for this"
-msgstr "for this"
+#: MdlNetConf.module:126
+msgid "Hardware Address"
+msgstr "Hardware Address"
-#: FrmPartSel.class:149
-msgid ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
-msgstr ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
+#: MdlCore.module:515
+msgid "Hardware Configuration"
+msgstr "Hardware Configuration"
-#: FrmPartSel.class:149
-msgid "in case you wish to."
-msgstr "in case you wish to."
+#: FrmPartSel.class:189
+msgid "Help"
+msgstr "Help"
-#: FrmPartSel.class:149
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
-msgstr ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
+#: MdlSummarize.module:55
+msgid "INSTALL TYPE:"
+msgstr "INSTALL TYPE:"
-#: FrmPartSel.class:149
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Typically, you want to use the largest partition for this."
+#: MdlNetConf.module:362
+msgid "IP Address"
+msgstr "IP Address"
-#: FrmPartSel.class:149
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-msgstr ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
+#: MdlNetConf.module:290
+msgid "If in doubt, choose this option"
+msgstr "If in doubt, choose this option"
-#: FrmPartSel.class:149
-msgid "for this is"
-msgstr "for this is"
+#: MdlLiloOsList.module:94
+msgid "Include this Operating System in the boot menu"
+msgstr "Include this Operating System in the boot menu"
-#: FrmPartSel.class:149
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr "but can also be calculated as 2 times your ammount of RAM"
+#: MdlLiloOsList.module:143
+msgid "Include this installation in the boot menu"
+msgstr "Include this installation in the boot menu"
-#: FrmPartSel.class:174
-msgid "Please select the partitions you wish to use and how to use them"
-msgstr "Please select the partitions you wish to use and how to use them"
+#: MdlLiloOsList.module:282
+msgid "Include this operating system in the boot menu"
+msgstr "Include this operating system in the boot menu"
-#: FrmPartSel.class:183
-msgid ""
-"Check this box if you have a Windows installation on your system or any "
-"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
-"soon as your computer starts"
-msgstr ""
-"Check this box if you have a Windows installation on your system or any "
-"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
-"soon as your computer starts"
+#: MdlLiloOsList.module:314
+msgid "Initial Ram Disk"
+msgstr "Initial Ram Disk"
-#: FrmPartSel.class:184
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
+#: MdlCore.module:508
+msgid "Install Operating System"
+msgstr "Install Operating System"
-#: FrmPartSel.class:189
-msgid "Help"
-msgstr "Help"
+#: MdlCore.module:505
+msgid "Installation"
+msgstr "Installation"
-#: FrmPkgSel.class:22
-msgid "Choose your installation mode"
-msgstr "Choose your installation mode"
+#: MdlCore.module:506
+msgid "Installation Summary"
+msgstr "Installation Summary"
-#: FrmPkgSel.class:107
-msgid "Full Install"
-msgstr "Full Install"
+#: MdlInstallSys.module:700
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Installation phase complete. Ready for configuration"
-#: FrmPkgSel.class:112
-msgid "Custom Install"
-msgstr "Custom Install"
+#: MdlInstallSys.module:455
+msgid "Installing"
+msgstr "Installing"
-#: FrmPkgsel2.class:21
-msgid "Select your indivirual packages to install."
-msgstr "Select your individual packages to install"
+#: FrmInstallSys.class:201
+msgid "Installing ..."
+msgstr "Installing ..."
-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "To install them all, just click next"
+#: MdlInstallSys.module:786
+msgid "Installing Final configuration files..."
+msgstr "Installing final configuration files ..."
-#: FrmRootPass.class:6
-msgid "System Administrator Password"
-msgstr "System Administrator Password"
+#: MdlInstallSys.module:733
+msgid "Installing Required Packages ..."
+msgstr "Installing Required Packages ..."
-#: FrmRootPass.class:13
-msgid "Most other every-day taks do not require administrative
priviledges."
-msgstr "Most other every-day tasks do not require administrative
priviledges."
+#: MdlInstallSys.module:703
+msgid "Installing default system configuration and required software."
+msgstr "Installing default system configuration and required software."
-#: FrmRootPass.class:13
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
+#: FrmPkgSel.class:51
+msgid "Installs everything in your VectorLinux media to your system"
msgstr ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
-#: FrmRootPass.class:93
-msgid " About the root account "
-msgstr " About the root account"
-
-#: FrmRootPass.class:97
-msgid ""
-"The linux root account is pre-assigned to be used as the system "
-"administrator's account. This account is used to perform system-wide
changes "
-"such as software upgrades, managing user accounts etc. \n"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The root password must be entered twice for ensured accuracy. When
choosing "
-"a root password, think of something easy for you to remember, but hard
for "
-"others to guess."
-msgstr ""
-"The linux root account is pre-assigned to be used as the system "
-"administrator's account. This account is used to perform system-wide
changes "
-"such as software upgrades, managing user accounts etc. \n"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The root password must be entered twice for ensured accuracy. When
choosing "
-"a root password, think of something easy for you to remember, but hard
for "
-"others to guess."
+#: MdlNetConf.module:147
+msgid "Interface Type"
+msgstr "Interface Type"
-#: FrmRootPass.class:103 MdlCore.module:512
-msgid "System Administrator"
-msgstr "System Administrator"
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"
+msgstr "It is still possible to install VectorLinux on your system, but
you need to pre-partition your disk first"
-#: FrmRootPass.class:114
-msgid "Re-Enter Password"
-msgstr "Re-Enter Password"
+#: MdlLiloOsList.module:338
+msgid "Kernel boot options"
+msgstr "Kernel boot options"
-#: FrmRootPass.class:125 FrmUserAdd.class:131
-msgid "Enter Password"
-msgstr "Enter Password"
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "LICENSE AGREEMENT"
-#: FrmRootPass.class:130
-msgid "Set Password"
-msgstr "Set Password"
+#: MdlLiloOsList.module:152
+msgid "Label"
+msgstr "Label"
-#: FrmSelISO.class:29 MdlCore.module:250
-msgid "No Installable Media Found"
-msgstr "No Installable Media Found"
+#: MdlCore.module:500
+msgid "Language Selection"
+msgstr "Language Selection"
-#: FrmSelISO.class:73
-msgid "Click"
-msgstr "Click"
+#: MdlConfLilo.module:95
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo returned an error. Please see below"
-#: FrmSelISO.class:73
-msgid "to begin installating"
-msgstr "to begin installating"
+#: FrmPartSel.class:149
+msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
+msgstr "Linux is a modular operating system. This means that it has the
ability to store system and"
-#: FrmSelISO.class:98
-msgid "Unable to identify distro."
-msgstr "Unable to identify distro."
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Loagind gparted ... Please wait"
+
+#: FrmZoneSet.class:115
+msgid "LocalTime"
+msgstr "LocalTime"
+
+#: MdlCore.module:413
+msgid "MINIMUM REQUIREMENTS"
+msgstr "MINIMUM REQUIREMENTS"
+
+#: MdlPartSel.module:77
+msgid "MOUNT POINT"
+msgstr "MOUNT POINT"
+
+#: MdlWinDrives.module:81
+msgid "MOUNT TO"
+msgstr "MOUNT TO"
+
+#: FrmNetConf.class:146
+msgid "Manual DNS Server Specification"
+msgstr "Manual DNS Server Specification"
#: FrmSelISO.class:133
msgid "Minimum Disk Space Requirements"
msgstr "Minimum Disk Space Requirements"
-#: FrmSelISO.class:232
-msgid "No installable images found."
-msgstr "No installable images found."
+#: FrmPartScheme.class:120
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Modify my disk partitions to make room for new installation"
-#: FrmSelISO.class:238
-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"
+#: FrmRootPass.class:13
+msgid "Most other every-day taks do not require administrative
priviledges."
+msgstr "Most other every-day tasks do not require administrative
priviledges."
-#: FrmSelISO.class:248
-msgid "Search Again"
-msgstr "Search Again"
+#: MdlLiloOsList.module:293
+msgid "Name"
+msgstr "Name"
-#: FrmUserAdd.class:112
-msgid "Add Users"
-msgstr "Add Users"
+#: MdlLiloOsList.module:75
+msgid "Name "
+msgstr "Name "
-#: FrmUserAdd.class:116
-msgid ""
-"Choose a unique name for each user. Enter the password for twice for "
-"accuracy. You can make as many users as you want, and when you are
finished "
-"click next to continue."
+#: FrmNetConf.class:177 MdlCore.module:514
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: FrmNetConf.class:56
+msgid "Network Interfaces"
msgstr ""
-"Choose a unique name for each user. Enter the password for twice for "
-"accuracy. You can make as many users as you want, and when you are
finished "
-"click next to continue."
-#: FrmUserAdd.class:121
-msgid "Username"
-msgstr "Username"
+#: FrmEmbUsrAdd.class:128
+msgid "New User Account"
+msgstr "New User Account"
-#: FrmUserAdd.class:142
-msgid "ReEnter Password"
-msgstr "ReEnter Password"
+#: FrmEmbUsrAdd.class:23
+msgid "New user accounts can also be created after the install process is
completed."
+msgstr "New user accounts can also be created after the install process is
completed."
-#: FrmUserAdd.class:153
-msgid "Create User"
-msgstr "Create User"
+#: FMain.class:425
+msgid "Next"
+msgstr "Next"
-#: FrmWinDrives.class:72
-msgid "Select the windows partitions you would like to mount during boot"
-msgstr "Select the windows partitions you would like to mount during boot"
+#: FrmSelISO.class:29 MdlCore.module:250
+msgid "No Installable Media Found"
+msgstr "No Installable Media Found"
-#: FrmZoneSet.class:97
-msgid ""
-"Choose how\n"
-"your hardware clock is set up.\n"
-"Choose UTC if you know that the clock is set up to\n"
-"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
-"Choose localtime since most PCs are setup this way."
-msgstr ""
-"Choose how\n"
-"your hardware clock is set up.\n"
-"Choose UTC if you know that the clock is set up to\n"
-"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
-"Choose localtime since most PCs are setup this way."
+#: MdlWinDrives.module:181
+msgid "No Windows partitions detected"
+msgstr "No Windows partitions detected"
-#: FrmZoneSet.class:102
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Choose the correct timezone for the area in which you live."
+#: FrmSelISO.class:232
+msgid "No installable images found."
+msgstr "No installable images found."
-#: FrmZoneSet.class:111
-msgid "ComboBox1"
-msgstr "-"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "No, I Do Not Agree"
-#: FrmZoneSet.class:113
-msgid "LocalTime"
-msgstr "LocalTime"
+#: MdlNetConf.module:218
+msgid "None"
+msgstr "None"
-#: FrmZoneSet.class:113
-msgid "UTC"
-msgstr "UTC"
+#: MdlInstallSys.module:142 MdlPartSel.module:148
+msgid "Not Used"
+msgstr "Not Used"
+
+#: MdlSummarize.module:61
+msgid "OPTIONAL PACKAGES:"
+msgstr "OPTIONAL PACKAGES:"
+
+#: MdlSummarize.module:49
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+msgstr "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
-#: FrmZoneSet.class:119
-msgid "Set TimeZone"
-msgstr "Set TimeZone"
+#: MdlLiloOsList.module:270
+msgid "Operating system installed in "
+msgstr "Operating system installed in"
-#: MdlConfLilo.module:95
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo returned an error. Please see below"
+#: MdlPartSel.module:67 MdlWinDrives.module:71
+msgid "PARTITION"
+msgstr "PARTITION"
-#: MdlConfLilo.module:97
-msgid "Boot loader has been setup successfully"
-msgstr "Boot loader has been setup successfully"
+#: MdlSummarize.module:28
+msgid "PARTITIONING LAYOUT"
+msgstr "PARTITION LAYOUT"
-#: MdlCore.module:234
-msgid "Scanning system for installable media. Please wait ..."
-msgstr "Scanning system for installable media. Please wait ..."
+#: MdlInstallSys.module:359
+msgid "Packages have been installed in your system. Please click"
+msgstr "Packages have been installed to your system. Please click"
-#: MdlCore.module:252
-msgid ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
+#: FrmRootPass.class:43
+msgid "Passwords do not match. Please enter the same password twice for
accuracy."
msgstr ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
-
-#: MdlCore.module:252
-msgid "installation CD and click "
-msgstr "installation CD and click "
-#: MdlCore.module:252
-msgid "to try again"
-msgstr "to try again"
+#: MdlPartSel.module:293
+msgid "Please select only one "
+msgstr "Please select only one "
-#: MdlCore.module:413
-msgid "Build Date: "
-msgstr "Build Date: "
+#: FrmPartSel.class:174
+msgid "Please select the partitions you wish to use and how to use them"
+msgstr "Please select the partitions you wish to use and how to use them"
-#: MdlCore.module:413
-msgid "MINIMUM REQUIREMENTS"
-msgstr "MINIMUM REQUIREMENTS"
+#: FMain.class:231
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Please wait while setup analyses your current partition setup."
-#: MdlCore.module:418
-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 ""
-"Setup is unable to find SETUP.CONF in your install media. This could be "
-"symptoms of a bad burn or a bad ISO"
+#: FMain.class:229
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "Please wait while setup attempts to run the partitioning utility"
-#: MdlCore.module:491
-msgid "Cannot find SETUP.CONF"
-msgstr "Cannot find SETUP.CONF"
+#: MdlNetConf.module:105
+msgid "Plugged-in"
+msgstr "Plugged-in"
#: MdlCore.module:499
msgid "Preparation"
msgstr "Preparation"
-#: MdlCore.module:500
-msgid "Language Selection"
-msgstr "Language Selection"
-
-#: MdlCore.module:501
-msgid "Find installation media"
-msgstr "Find installation media"
-
-#: MdlCore.module:502
-msgid "Disk Partitioning"
-msgstr "Disk Partitioning"
-
-#: MdlCore.module:503
-msgid "Software Selection"
-msgstr "Software Selection"
-
-#: MdlCore.module:505
-msgid "Installation"
-msgstr "Installation"
+#: FrmNetConf.class:151
+msgid "Primary DNS Server"
+msgstr "Primary DNS Server"
-#: MdlCore.module:506
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#: FMain.class:405
+msgid "Process Overview"
+msgstr "Process Overview"
-#: MdlCore.module:508
-msgid "Install Operating System"
-msgstr "Install Operating System"
+#: FrmLilo.class:233
+msgid "Prompt Timeout"
+msgstr "Prompt Timeout"
-#: MdlCore.module:509
-msgid "System Configuration"
-msgstr "System Configuration"
+#: FrmRootPass.class:118
+msgid "Re-Enter Password"
+msgstr "Re-Enter Password"
-#: MdlCore.module:510
-msgid "Boot Menu Options"
-msgstr "Boot Menu Options"
+#: FrmUserAdd.class:142
+msgid "ReEnter Password"
+msgstr "ReEnter Password"
#: MdlCore.module:511
msgid "Regional Settings"
msgstr "Regional Settings"
-#: MdlCore.module:513
-msgid "User Accounts"
-msgstr "User Accounts"
+#: MdlNetConf.module:274
+msgid "STATUS:"
+msgstr "STATUS:"
-#: MdlCore.module:514
-msgid "Network Configuration"
-msgstr "Network Configuration"
+#: MdlCore.module:234
+msgid "Scanning system for installable media. Please wait ..."
+msgstr "Scanning system for installable media. Please wait ..."
-#: MdlCore.module:515
-msgid "Hardware Configuration"
-msgstr "Hardware Configuration"
+#: FrmSelISO.class:248
+msgid "Search Again"
+msgstr "Search Again"
-#: MdlDiskPart.module:46
-msgid ""
-"VectorLinux is unable to determine the type of hard disks on your system."
-msgstr ""
-"VectorLinux is unable to determine the type of hard disks on your system."
+#: FrmNetConf.class:164
+msgid "Secondary DNS Server"
+msgstr "Secondary DNS Server"
-#: MdlDiskPart.module:46
-msgid ""
-"It is still possible to install VectorLinux on your system, but you need
to "
-"pre-partition your disks first"
-msgstr ""
-"It is still possible to install VectorLinux on your system, but you need
to "
-"pre-partition your disk first"
+#: FrmLilo.class:244
+msgid "Seconds"
+msgstr "Seconds"
-#: MdlDiskPart.module:53
-msgid ""
-"Gparted was not found on this system. Please install gparted and try
again"
-msgstr ""
-"Gparted was not found on this system. Please install gparted and try
again"
+#: FrmWinDrives.class:72
+msgid "Select the windows partitions you would like to mount during boot"
+msgstr "Select the windows partitions you would like to mount during boot"
-#: MdlDiskPart.module:57
-msgid "Loading gparted ... Please wait"
-msgstr "Loagind gparted ... Please wait"
+#: FrmPartScheme.class:59
+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 "Select this option if you already have a linux installation that
you wish to overwrite or if a linux parition scheme exists in your hard
disk"
-#: MdlDiskPart.module:90
-msgid ""
-"Setup is unable to successfully run gparted on this system. This may be
a "
-"sign of "
-msgstr ""
-"Setup is unable to successfully run gparted on this system. This may be
a "
-"sign of"
+#: FrmPartScheme.class:68
+msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
+msgstr "Select this option if you wish to create, move or resize
partitions in order to make room for your new VectorLinux installation."
-#: MdlDiskPart.module:90
-msgid "a bad install media. Setup cannot continue."
-msgstr "a bad install media. Setup cannot continue."
+#: FrmSelISO.class:238
+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"
-#: MdlDiskPart.module:95
-msgid "Several windows found. I will take the first one!"
-msgstr "Several windows found. I will take the first one!"
+#: FrmPkgsel2.class:21
+msgid "Select your indivirual packages to install."
+msgstr "Select your individual packages to install"
-#: MdlInstallCustom.module:40
-msgid " INSTALLING REQUIRED BULKS"
-msgstr " INSTALLING REQUIRED BULKS"
+#: FrmLangSel.class:81
+msgid "Select your language"
+msgstr "Select your language"
-#: MdlInstallCustom.module:43
-msgid "There as been an error while installing required system software. "
-msgstr "There as been an error while installing required system software. "
+#: FrmRootPass.class:134
+msgid "Set Password"
+msgstr "Set Password"
-#: MdlInstallCustom.module:48
-msgid "INSTALING USER-SELECTED BULK PACKAGES"
-msgstr "INSTALING USER-SELECTED BULK PACKAGES"
+#: FrmZoneSet.class:99
+msgid "Set TimeZone"
+msgstr "Set TimeZone"
-#: MdlInstallCustom.module:50
-msgid ""
-"There has been an error while installing optional software to your
system. "
-msgstr ""
-"There has been an error while installing optional software to your
system. "
+#: MdlNetConf.module:179
+msgid "Setup Mode"
+msgstr "Setup Mode"
-#: MdlInstallCustom.module:55
-msgid "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
-msgstr "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
-
-#: MdlInstallCustom.module:63
-msgid "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
-msgstr "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
+#: MdlCore.module:418
+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 "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
-#: MdlInstallCustom.module:65
-msgid "Error while installing required system software. "
-msgstr "Error while installing required system software. "
+#: MdlDiskPart.module:90
+msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
+msgstr "Setup is unable to successfully run gparted on this system. This
may be a sign of"
-#: MdlInstallCustom.module:70
-msgid "INSTALLING CONFIGURATION PACKAGES"
-msgstr "INSTALLING CONFIGURATION PACKAGES"
+#: MdlCore.module:252
+msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
+msgstr "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
-#: MdlInstallCustom.module:72
-msgid "Error while installing system configuration. "
-msgstr "Error while installing system configuration. "
+#: MdlDiskPart.module:95
+msgid "Several windows found. I will take the first one!"
+msgstr "Several windows found. I will take the first one!"
-#: MdlInstallCustom.module:77
-msgid "INSTALLING KERNELS"
-msgstr "INSTALLING KERNELS"
+#: FMain.class:301
+msgid "Skipping lilo setup"
+msgstr "Skipping lilo setup per user request"
-#: MdlInstallCustom.module:79
-msgid "Unable to install kernels. "
-msgstr "Unable to install kernels. "
+#: MdlCore.module:503
+msgid "Software Selection"
+msgstr "Software Selection"
-#: MdlInstallCustom.module:90
-msgid ""
-"Vectorlinux is now installed in your system. Please click next to
configure "
-"it."
-msgstr ""
-"Vectorlinux is now installed in your system. Please click next to
configure "
-"it."
+#: FrmLilo.class:121
+msgid "Standard"
+msgstr "Standard"
-#: MdlInstallCustom.module:91
-msgid ""
-"packages have been Installed. Please click next to move on to System "
-"Configuration."
+#: MdlNetConf.module:340
+msgid "Static IP Address Settings"
msgstr ""
-"packages have been Installed. Please click next to move on to System "
-"Configuration."
-
-#: MdlInstallCustom.module:176
-msgid " is installed"
-msgstr " is installed"
-
-#: MdlInstallCustom.module:263
-msgid "Calculating package count ... Please wait"
-msgstr "Calculating package count ... Please wait"
-
-#: MdlInstallCustom.module:311
-msgid "Total packages to be installed = "
-msgstr "Total packages to be installed = "
-#: MdlInstallCustom.module:343
-msgid "Error while installing "
-msgstr "Error while installing "
-
-#: MdlInstallSys.module:118
-msgid "Writing new /etc/fstab to system"
-msgstr "Writing new /etc/fstab to system"
-
-#: MdlInstallSys.module:142 MdlPartSel.module:148
-msgid "Not Used"
-msgstr "Not Used"
-
-#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:174
-msgid "Do not format"
-msgstr "Do not format"
-
-#: MdlInstallSys.module:190 MdlWinDrives.module:119
-msgid "Do not mount"
-msgstr "Do not mount"
-
-#: MdlInstallSys.module:358
-msgid "Vectorlinux is now installed in your system. Please click"
-msgstr "Vectorlinux is now installed in your system. Please click"
+#: MdlNetConf.module:385
+msgid "Subnet Mask"
+msgstr "Subnet Mask"
-#: MdlInstallSys.module:358
-msgid "to configure it."
-msgstr "to configure it."
+#: FrmRootPass.class:107 MdlCore.module:512
+msgid "System Administrator"
+msgstr "System Administrator"
-#: MdlInstallSys.module:359
-msgid "Packages have been installed in your system. Please click"
-msgstr "Packages have been installed to your system. Please click"
+#: FrmRootPass.class:6
+msgid "System Administrator Password"
+msgstr "System Administrator Password"
-#: MdlInstallSys.module:455
-msgid "Installing"
-msgstr "Installing"
+#: MdlCore.module:509
+msgid "System Configuration"
+msgstr "System Configuration"
-#: MdlInstallSys.module:542
-msgid "Vectorlinux is now being installed. Please wait..."
-msgstr "Vectorlinux is now being installed. Please wait..."
+#: FrmLilo.class:196 FrmNetConf.class:139
+msgid "Tab 0"
+msgstr "-"
-#: MdlInstallSys.module:585
-msgid "There has been an error extracting"
-msgstr "There has been an error extracting"
+#: FrmLilo.class:214
+msgid "Target"
+msgstr "Target"
-#: MdlInstallSys.module:597
-msgid "Finished intalling Bulks"
-msgstr "Finished intalling Bulks"
+#: FrmLicense.class:104
+msgid "TextArea1"
+msgstr "-"
-#: MdlInstallSys.module:700
-msgid "Installation phase complete. Ready for configuration"
-msgstr "Installation phase complete. Ready for configuration"
+#: FrmSummary.class:87
+msgid "TextLabel1"
+msgstr "-"
-#: MdlInstallSys.module:703
-msgid "Installing default system configuration and required software."
-msgstr "Installing default system configuration and required software."
+#: FrmLilo.class:35
+msgid "The following Operating Systems have been detected on this
computer. Choose your desired option"
+msgstr "The following Operating Systems have been detected on this
computer. Choose your desired option"
+
+#: FrmRootPass.class:101
+msgid "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
+msgstr "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
-#: MdlInstallSys.module:733
-msgid "Installing Required Packages ..."
-msgstr "Installing Required Packages ..."
+#: MdlInstallCustom.module:43
+msgid "There as been an error while installing required system software. "
+msgstr "There as been an error while installing required system software. "
-#: MdlInstallSys.module:786
-msgid "Installing Final configuration files..."
-msgstr "Installing final configuration files ..."
+#: MdlInstallSys.module:585
+msgid "There has been an error extracting"
+msgstr "There has been an error extracting"
-#: MdlLiloOsList.module:67
-msgid "Windows installation found in "
-msgstr "Windows installation found in "
+#: MdlInstallCustom.module:57
+msgid "There has been an error while installing optional software to your
system."
+msgstr ""
-#: MdlLiloOsList.module:75
-msgid "Name "
-msgstr "Name "
+#: MdlInstallCustom.module:50
+msgid "There has been an error while installing optional software to your
system. "
+msgstr "There has been an error while installing optional software to your
system. "
-#: MdlLiloOsList.module:94
-msgid "Include this Operating System in the boot menu"
-msgstr "Include this Operating System in the boot menu"
+#: MdlPartFrmt.module:121
+msgid "There has been an error while trying to format "
+msgstr ""
-#: MdlLiloOsList.module:143
-msgid "Include this installation in the boot menu"
-msgstr "Include this installation in the boot menu"
+#: FMain.class:231
+msgid "This may take a while ..."
+msgstr "This may take a while ..."
-#: MdlLiloOsList.module:152
-msgid "Label"
-msgstr "Label"
+#: FrmPartScheme.class:68
+msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
+msgstr "This option is the safest choice if you have other existing
installations that you wish to keep."
-#: MdlLiloOsList.module:270
-msgid "Operating system installed in "
-msgstr "Operating system installed in"
+#: FrmPartScheme.class:59
+msgid "This option will overwrite any existing data in the selected
partitions"
+msgstr "This option will overwrite any existing data in the selected
partitions"
-#: MdlLiloOsList.module:282
-msgid "Include this operating system in the boot menu"
-msgstr "Include this operating system in the boot menu"
+#: MdlNetConf.module:290
+msgid "This will work if you use a cable or DSL modem on a home network."
+msgstr "This will work if you use a cable or DSL modem on a home network."
-#: MdlLiloOsList.module:293
-msgid "Name"
-msgstr "Name"
+#: FrmZoneSet.class:21
+msgid "Timezone configuration"
+msgstr "Timezone configuration"
-#: MdlLiloOsList.module:314
-msgid "Initial Ram Disk"
-msgstr "Initial Ram Disk"
+#: FrmPkgsel2.class:21
+msgid "To install them all, just click next"
+msgstr "To install them all, just click next"
-#: MdlLiloOsList.module:338
-msgid "Kernel boot options"
-msgstr "Kernel boot options"
+#: MdlInstallCustom.module:311
+msgid "Total packages to be installed = "
+msgstr "Total packages to be installed = "
-#: MdlLiloOsList.module:366
-msgid "Add option to boot this Operating system into Text mode"
-msgstr "Add option to boot this Operating system into Text mode"
+#: FrmInstallSys.class:215
+msgid "Total progress"
+msgstr "Total progress"
-#: MdlNetConf.module:91
-msgid "Wired"
-msgstr "Wired"
+#: FrmPartSel.class:149
+msgid "Typically, you want to use the largest partition for this."
+msgstr "Typically, you want to use the largest partition for this."
-#: MdlNetConf.module:94
-msgid "Wireless"
-msgstr "Wireless"
+#: FrmZoneSet.class:115
+msgid "UTC"
+msgstr "UTC"
-#: MdlNetConf.module:103
-msgid "Plugged-in"
-msgstr "Plugged-in"
+#: FrmSelISO.class:98
+msgid "Unable to identify distro."
+msgstr "Unable to identify distro."
-#: MdlNetConf.module:105
+#: MdlInstallCustom.module:79
+msgid "Unable to install kernels. "
+msgstr "Unable to install kernels. "
+
+#: MdlNetConf.module:107
msgid "Unplugged"
msgstr "Unplugged"
-#: MdlNetConf.module:124
-msgid "Hardware Address"
-msgstr "Hardware Address"
-
-#: MdlNetConf.module:145
-msgid "Interface Type"
-msgstr "Interface Type"
+#: FrmPartScheme.class:115
+msgid "Use existing disk partitions"
+msgstr "Use existing disk partitions"
-#: MdlNetConf.module:164
-msgid "Automatically activate this interface at start-up"
-msgstr "Automatically activate this interface at start-up"
+#: FrmPartScheme.class:59
+msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
+msgstr "Use this option if you already prepared your partitions using the
VectorLinux installer"
-#: MdlNetConf.module:177
-msgid "Setup Mode"
-msgstr "Setup Mode"
+#: FrmPartSel.class:149
+msgid "Used to store system data. This particular install requires a
minimum of"
+msgstr "Used to store system data. This particular install requires a
minimum of"
-#: MdlNetConf.module:202
-msgid "Encryption type"
-msgstr "Encryption type"
+#: FrmPartSel.class:149
+msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
+msgstr "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
-#: MdlNetConf.module:215
-msgid "None"
-msgstr "None"
+#: FrmEmbUsrAdd.class:20 MdlCore.module:513
+msgid "User Accounts"
+msgstr "User Accounts"
-#: MdlNetConf.module:228
-msgid "Encryption key"
-msgstr "Encryption Key"
+#: FrmUserAdd.class:121
+msgid "Username"
+msgstr "Username"
-#: MdlNetConf.module:247
-msgid "Access Point"
-msgstr "ESSID"
+#: FrmPartSel.class:149
+msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
+msgstr "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
-#: MdlNetConf.module:271
-msgid "STATUS:"
-msgstr "STATUS:"
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "VectorLinux Installer"
-#: MdlNetConf.module:313
-msgid " Static IP Address Settings "
-msgstr " Static IP Address Settings "
+#: MdlDiskPart.module:46
+msgid "VectorLinux is unable to determine the type of hard disks on your
system."
+msgstr "VectorLinux is unable to determine the type of hard disks on your
system."
-#: MdlNetConf.module:323
-msgid "IP Address"
-msgstr "IP Address"
+#: FrmInstallSys.class:192
+msgid "Vectorlinux is currently being installed to your system... Please
wait"
+msgstr "Vectorlinux is currently being installed to your system... Please
wait"
-#: MdlNetConf.module:346
-msgid "Subnet Mask"
-msgstr "Subnet Mask"
+#: MdlInstallSys.module:542
+msgid "Vectorlinux is now being installed. Please wait..."
+msgstr "Vectorlinux is now being installed. Please wait..."
-#: MdlNetConf.module:368
-msgid "Gateway Address"
-msgstr "Gateway Address"
+#: MdlInstallSys.module:358
+msgid "Vectorlinux is now installed in your system. Please click"
+msgstr "Vectorlinux is now installed in your system. Please click"
-#: MdlNetConf.module:406
-msgid "Dynamic Host Control Protocol"
-msgstr "Dynamic Host Control Protocol"
+#: MdlInstallCustom.module:90
+msgid "Vectorlinux is now installed in your system. Please click next to
configure it."
+msgstr "Vectorlinux is now installed in your system. Please click next to
configure it."
-#: MdlNetConf.module:406
-msgid "Automatic settings via DHCP."
-msgstr "Automatic settings via DHCP."
+#: FrmHostPrep.class:130
+msgid "Vectorlinux is preparing your system for installation. Please wait."
+msgstr "Vectorlinux is preparing your system for installation. Please
wait."
-#: MdlNetConf.module:406
-msgid "This will work if you use a cable or DSL modem on a home network."
-msgstr "This will work if you use a cable or DSL modem on a home network."
+#: FrmLilo.class:220
+msgid "Video Resolution"
+msgstr "Video Resolution"
-#: MdlNetConf.module:406
-msgid "If in doubt, choose this option"
-msgstr "If in doubt, choose this option"
+#: MdlWinDrives.module:55
+msgid "Windows Partitions Detected"
+msgstr "Windows Partitions Detected"
-#: MdlPartFrmt.module:121
-msgid "There has been an error wile trying to format "
-msgstr "There has been an error wile trying to format "
+#: MdlLiloOsList.module:67
+msgid "Windows installation found in "
+msgstr "Windows installation found in "
-#: MdlPartSel.module:67 MdlWinDrives.module:71
-msgid "PARTITION"
-msgstr "PARTITION"
+#: MdlNetConf.module:93
+msgid "Wired"
+msgstr "Wired"
-#: MdlPartSel.module:77
-msgid "MOUNT POINT"
-msgstr "MOUNT POINT"
+#: MdlNetConf.module:96
+msgid "Wireless"
+msgstr "Wireless"
-#: MdlPartSel.module:86
-msgid "FILESYSTEM"
-msgstr "FYLESYSTEM"
+#: MdlInstallSys.module:118
+msgid "Writing new /etc/fstab to system"
+msgstr "Writing new /etc/fstab to system"
-#: MdlPartSel.module:293
-msgid "Please select only one "
-msgstr "Please select only one "
+#: FrmLicense.class:110
+msgid "Yes, I Agree to the License Agreement"
+msgstr "Yes, I Agree to the License Agreement"
-#: MdlPartSel.module:293
-msgid " partition"
-msgstr " partition"
+#: FMain.class:245
+msgid "You must select a \"/\" partition. This is the target where the
system will install to"
+msgstr "You must select a \"/\" partition. This is the target where the
system will install to"
-#: MdlSummarize.module:28
-msgid "PARTITIONING LAYOUT"
-msgstr "PARTITION LAYOUT"
+#: MdlDiskPart.module:90
+msgid "a bad install media. Setup cannot continue."
+msgstr "a bad install media. Setup cannot continue."
-#: MdlSummarize.module:49
-msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
-msgstr "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+#: FrmPartSel.class:149
+msgid "but can also be calculated as 2 times your ammount of RAM"
+msgstr "but can also be calculated as 2 times your ammount of RAM"
-#: MdlSummarize.module:55
-msgid "INSTALL TYPE:"
-msgstr "INSTALL TYPE:"
+#: FrmPartSel.class:149
+msgid "but you should considear a higher value to make sure you have room
to install additional software"
+msgstr "but you should considear a higher value to make sure you have room
to install additional software"
-#: MdlSummarize.module:55
-msgid "Custom"
-msgstr "Custom"
+#: FrmPartSel.class:149
+msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
+msgstr "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
-#: MdlSummarize.module:57
-msgid "BULK PACKAGES:"
-msgstr "BULK PACKAGES:"
+#: FrmLilo.class:35
+msgid "for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click"
+msgstr "for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click"
-#: MdlSummarize.module:61
-msgid "OPTIONAL PACKAGES:"
-msgstr "OPTIONAL PACKAGES:"
+#: FrmPartSel.class:149
+msgid "for this"
+msgstr "for this"
-#: MdlSummarize.module:67
-msgid "Full"
-msgstr "Full"
+#: FrmPartSel.class:149
+msgid "for this is"
+msgstr "for this is"
-#: MdlWinDrives.module:55
-msgid "Windows Partitions Detected"
-msgstr "Windows Partitions Detected"
+#: FrmPartSel.class:149
+msgid "in case you wish to."
+msgstr "in case you wish to."
-#: MdlWinDrives.module:81
-msgid "MOUNT TO"
-msgstr "MOUNT TO"
+#: MdlCore.module:252
+msgid "installation CD and click "
+msgstr "installation CD and click "
-#: MdlWinDrives.module:181
-msgid "No Windows partitions detected"
-msgstr "No Windows partitions detected"
+#: MdlZoneSet.module:28
+msgid "localtime"
+msgstr "localtime"
#: MdlZoneSet.module:27
msgid "localtime-copied-from"
msgstr "localtime-copied-from"
-#: MdlZoneSet.module:28
-msgid "localtime"
-msgstr "localtime"
+#: MdlInstallCustom.module:91
+msgid "packages have been Installed. Please click next to move on to
System Configuration."
+msgstr "packages have been Installed. Please click next to move on to
System Configuration."
+
+#: MdlPartSel.module:293
+msgid "partition"
+msgstr ""
+
+#: FrmPartSel.class:149
+msgid "suggested setup for a typical Linux installation"
+msgstr "suggested setup for a typical Linux installation"
+
+#: FrmSelISO.class:73
+msgid "to begin installating"
+msgstr "to begin installating"
-#~ msgid "Click the button below to create a new user account."
-#~ msgstr "Click the button below to create a new user account."
+#: MdlInstallSys.module:358
+msgid "to configure it."
+msgstr "to configure it."
-#~ msgid "Create initial user accounts"
-#~ msgstr "Create initial user accounts"
+#: MdlCore.module:252
+msgid "to try again"
+msgstr "to try again"
-#~ msgid ""
-#~ "New user accounts can also be created after the install process is "
-#~ "completed."
-#~ msgstr ""
-#~ "New user accounts can also be created after the install process is "
-#~ "completed."
+#: FrmPartSel.class:149
+msgid "user data separately for added data security. You may install the
system to a single partition"
+msgstr "user data separately for added data security. You may install the
system to a single partition"
-#~ msgid "Timezone configuration"
-#~ msgstr "Timezone configuration"
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Oct 1 14:09:57 2008
@@ -1,2 +1,3 @@
- Fixed problem with ucase(string) in partitioning scheme window
- Updated binary
+- Removed blank spaces off strings (to keep translations in consistency)
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Wed Oct 1 14:09:57 2008
@@ -53,6 +53,7 @@
FOR EACH cb IN MdlNetConf.objCombos
cb.Refresh
NEXT
+ ME.frmNetDevices.Text = gb.Space(1) & ("Network Interfaces") & Space(1)
END
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Wed Oct 1 14:09:57 2008
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,114.1429,74)
+ MoveScaled(0,0,114,74)
Text = ("")
{ tlHostNameLbl TextLabel
MoveScaled(1,8,16,3)
@@ -14,7 +14,7 @@
}
{ frmNetDevices Frame
MoveScaled(1,20,85,49)
- Text = (" Network Interfaces")
+ Text = ("")
{ TSNetDevices TabStrip
MoveScaled(2,4,81,43)
Index = 0
@@ -33,7 +33,7 @@
}
{ txtPrimaryDNS TextBox txtManDNSBoxes
Name = "txtPrimaryDNS"
- MoveScaled(24,16,18.4286,3)
+ MoveScaled(24,16,18.3333,3)
Enabled = False
Text = ("192.168.1.254")
}
@@ -44,7 +44,7 @@
}
{ txtSecDNS TextBox txtManDNSBoxes
Name = "txtSecDNS"
- MoveScaled(68,15,18.4286,3)
+ MoveScaled(68,15,18.3333,3)
Enabled = False
Text = ("")
}
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Wed Oct 1 14:09:57 2008
@@ -54,7 +54,7 @@
PUBLIC SUB rbUseExisting_Click()
ME.tlChoiceExp.Text = "<h3>" & rbUseExisting.Text & "</h3><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.")&
+ ("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.") & Space(1)&
"<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
@@ -64,7 +64,7 @@
PUBLIC SUB rbEditPartitions_Click()
ME.tlChoiceExp.Text = "<h3>" & rbEditPartitions.Text & "</h3><br>" &
- ("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux installation.")&
+ ("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux installation.") & Space(1)&
("This option is the safest choice if you have other existing
installations that you wish to keep.")
FMain.frmNext = FrmDiskPart
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Wed Oct 1 14:09:57 2008
@@ -48,7 +48,7 @@
PUBLIC SUB rbFull_Click()
- tlActionDesc.Text = "Installs everything in your VectorLinux media to
your system"
+ tlActionDesc.Text = ("Installs everything in your VectorLinux media to
your system")
tlActionDesc.Adjust
scrlInstallOpts.Visible = FALSE
ClsPkgSel.bCustom = FALSE
@@ -57,7 +57,7 @@
PUBLIC SUB rbCustom_Click()
- tlActionDesc.Text = "Choose your optional components to install."
+ tlActionDesc.Text = ("Choose your optional components to install.")
tlActionDesc.Adjust
scrlInstallOpts.Visible = TRUE
MdlPkgSel.LIST_BULK_SELECTION
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Wed Oct 1 14:09:57 2008
@@ -25,6 +25,7 @@
.tvPlan["Conf2"].picture = MdlCore.sNowPic
.tvPlan["Conf2"].Selected = TRUE
END WITH...
[truncated message content] |
|
From: <cod...@go...> - 2008-10-01 21:10:53
|
Author: m0e.lnx
Date: Wed Oct 1 14:10:23 2008
New Revision: 202
Modified:
branches/iVL/.project
branches/iVL/installer.gambas
Log:
Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Oct 1 14:10:23 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.98
+Version=0.0.99
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-01 20:48:48
|
Author: m0e.lnx
Date: Wed Oct 1 13:43:54 2008
New Revision: 200
Modified:
branches/iVL/.project
branches/iVL/installer.gambas
Log:
- Fixed problem with ucase(string) in partitioning scheme window
- Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Oct 1 13:43:54 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.97
+Version=0.0.98
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-10-01 20:44:38
|
Author: m0e.lnx
Date: Wed Oct 1 13:43:32 2008
New Revision: 199
Modified:
branches/iVL/DevLog
branches/iVL/FrmPartScheme.class
Log:
- Fixed problem with ucase(string) in partitioning scheme window
- Updated binary
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Oct 1 13:43:32 2008
@@ -1,6 +1,2 @@
-- Fixed combobox sizes in lilo setup form.
-- Moved binding mount of /proc and /dev to it's own sub in MdlConfLIlo
instead of the forms open() event
- This sub will get executed only if the user chooses to install/setup
lilo and right before setting it up.
-- FrmRootPass Eliminated message "Password is set". Will only display
error message if passwords do not match.
-- Fixed problem with tabstrip width in netconf window
-
+- Fixed problem with ucase(string) in partitioning scheme window
+- Updated binary
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Wed Oct 1 13:43:32 2008
@@ -53,7 +53,7 @@
PUBLIC SUB rbUseExisting_Click()
- ME.tlChoiceExp.Text = "<b>" & UCase(rbUseExisting.Text) & "</b><br><br>"
&
+ ME.tlChoiceExp.Text = "<h3>" & rbUseExisting.Text & "</h3><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 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> "
@@ -63,7 +63,7 @@
PUBLIC SUB rbEditPartitions_Click()
- ME.tlChoiceExp.Text = "<b>" & UCase(rbEditPartitions.Text)
& "</b><br><br>" &
+ ME.tlChoiceExp.Text = "<h3>" & rbEditPartitions.Text & "</h3><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.")
FMain.frmNext = FrmDiskPart
|
|
From: <cod...@go...> - 2008-10-01 20:15:06
|
Author: m0e.lnx
Date: Wed Oct 1 13:14:40 2008
New Revision: 198
Modified:
branches/iVL/.project
branches/iVL/installer.gambas
Log:
Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Oct 1 13:14:40 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.96
+Version=0.0.97
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
14 messages has been excluded from this view by a project administrator.
