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-12-03 15:36:31
|
Author: M0...@gm...
Date: Wed Dec 3 07:35:20 2008
New Revision: 347
Modified:
branches/iVL/FrmImportAccts.class
Log:
Debugging user import
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 07:35:20 2008
@@ -65,6 +65,7 @@
PUBLIC SUB btImportAccnt_Click()
+DIM SaCC AS String = Trim(ME.cbAccntList.Text)
IF Len(Trim(ME.cbAccntList.Text)) = 0 THEN
Message(("Please select an account name from the dropdown list."))
RETURN
@@ -81,10 +82,10 @@
'IF ME.pbLogin THEN ME.pbLogin.Delete
'pbLogin = NEW PictureBox(ME)
'me.pbLogin.Move(
- ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
+ ME.cbAccntList.Remove(ME.cbAccntList.Find(SaCC)))
ME.cbAccntList.Sorted = TRUE
'RETURN
- IF ME.CREATE_IMPORTED_ACCOUNT(Trim(ME.cbAccntList.Text)) > 0 THEN
+ IF ME.CREATE_IMPORTED_ACCOUNT(SaCC) > 0 THEN
Message.Error(("User Unable to restore user account."))
RETURN
ELSE
|
|
From: <cod...@go...> - 2008-12-03 14:43:25
|
Author: M0...@gm...
Date: Wed Dec 3 06:42:11 2008
New Revision: 346
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmImportAccts.class
branches/iVL/FrmUserAdd.class
branches/iVL/MdlUsrAdd.module
branches/iVL/installer.gambas
Log:
refined user account inmport
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Dec 3 06:42:11 2008
@@ -86,23 +86,27 @@
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:461
+#: FMain.class:439
+msgid "Skipping boot loader setup"
+msgstr ""
+
+#: FMain.class:465
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:799
+#: FMain.class:803
msgid "Back"
msgstr ""
-#: FMain.class:810
+#: FMain.class:814
msgid "Exit Installation"
msgstr ""
-#: FMain.class:821
+#: FMain.class:825
msgid "Next"
msgstr ""
-#: FMain.class:835
+#: FMain.class:839
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 3 06:42:11 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.21
+Version=0.1.23
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Dec 3 06:42:11 2008
@@ -423,6 +423,7 @@
frmNext = FrmLiloSetup
CASE "FrmLiloSetup"
+ MdlCore.WARN_STATUS("")
IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
IF FrmLiloSetup.cbBootDefault.Text = "" THEN
Message.Warning(("Please select a default operating system
to boot before proceeding"))
@@ -431,9 +432,12 @@
RETURN
END IF
'Run the setup
- MdlLilo.TRIGGER_LILO_SETUP()
+ IF MdlLilo.TRIGGER_LILO_SETUP() > 0 THEN
+ RETURN
+ END IF
ELSE
- FrmLiloSetup.tlBanner.Text = "<b>" & ("Skipping boot loaded setup")
& "</b>"
+ FrmLiloSetup.tlBanner.Text = "<b>" & ("Skipping boot loader setup")
& "</b>"
+ MdlCore.WARN_STATUS("Skipping LILO Setup")
END IF
'SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
frmNext = FrmZoneSet
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 06:42:11 2008
@@ -84,9 +84,14 @@
ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
ME.cbAccntList.Sorted = TRUE
'RETURN
- ME.CREATE_IMPORTED_ACCOUNT
- MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
- Message.Info(("User account for") & Space(1) &
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
+ IF ME.CREATE_IMPORTED_ACCOUNT(Trim(ME.cbAccntList.Text)) > 0 THEN
+ Message.Error(("User Unable to restore user account."))
+ RETURN
+ ELSE
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
+ MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
+ Message.Info(("User account for") & Space(1) &
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
+ END IF
'ME.Close
'ME.pbLogin.Picture.Image.Clear
@@ -95,7 +100,7 @@
END
-PUBLIC SUB CREATE_IMPORTED_ACCOUNT()
+PUBLIC FUNCTION CREATE_IMPORTED_ACCOUNT(sname AS String) AS Integer
DIM sGroups AS String
DIM cb AS CheckBox
DIM sSettings AS String[]
@@ -103,7 +108,9 @@
DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
DIM tl AS TextLabel
DIM iTlY AS Integer
+ DIM hproc AS Process
+
' Prepare group list
FOR EACH cb IN MdlUsrAdd.objGrps
IF cb.Value = TRUE THEN
@@ -119,29 +126,32 @@
IF Len(sSettingsList) > 0 THEN
sSettings = Split(sSettingsList, ",")
FOR i = 0 TO sSettings.Count - 1
- EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
- EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc" &/ "skel" &
Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
- EXEC ["chown", Trim(ME.cbAccntList.Text) & ":users",
ClsGlobal.sTargetMnt &/ "home" &/ Trim(ME.cbAccntList.Text) &/
Trim(sSettings[i])] WAIT
+ hproc = EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
sname &/ Trim(sSettings[i])] WAIT
+ hproc = EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc"
&/ "skel" &/ Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/ sname &/
Trim(sSettings[i])] WAIT
+ hproc = EXEC ["chown", Trim(ME.cbAccntList.Text) & ":users",
ClsGlobal.sTargetMnt &/ "home" &/ sname &/ Trim(sSettings[i])] WAIT
IF ERROR THEN Message(Error.Where & gb.NewLine & Error.Text)
NEXT
END IF
- SHELL "chroot /mnt/target /usr/sbin/groupdel " &
Trim(ME.cbAccntList.Text) WAIT
- SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1) &
FrmUserAdd.iUID & Space(1) & Trim(ME.cbAccntList.Text) WAIT
- SHELL "chroot /mnt/target /usr/sbin/useradd -g " &
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPass1.Text & " -u " &
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "
& 'ME.tbUsername.Text WAIT
- Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
- SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
+ hproc = SHELL "chroot /mnt/target /usr/sbin/groupdel " & sname WAIT
+ IF hproc.Value > 0 THEN RETURN hproc.Value
+ hproc = SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1)
& FrmUserAdd.iUID & Space(1) &/ sname WAIT
+ IF hproc.Value > 0 THEN RETURN hproc.Value
+ hproc = SHELL "chroot /mnt/target /usr/sbin/useradd -g " & sname & "
-p " & ME.tbPass1.Text & " -u " & FrmUserAdd.iUID & " -G " & "\'users," &
sGroups & "\' -s /bin/bash " & sname & " -d /home/" & sname WAIT
+ IF hproc.Value > 0 THEN RETURN hproc.Value
+ hproc = SHELL "chroot /mnt/target /sbin/passwdx " & sname & Space(1) &
ME.tbPass1.Text WAIT
+ IF hproc.Value > 0 THEN RETURN hproc.Value
IF ERROR THEN Message.Error(Error.Where & gb.NewLine & Error.Text)
' Add the face icon
IF Len(ME.tbPicPath.Text) > 0 THEN
- SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
Trim(ME.cbAccntList.Text) & ".face.icon" WAIT 'link for KDM
+ SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & sname
& ".face.icon" WAIT 'link for KDM
' Tweak for the GDM face icon to work
- TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ Trim(ME.cbAccntList.Text) &/ ".face"
- SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
Trim(ME.cbAccntList.Text) &/ ".face" WAIT
- SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home" &/ Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
- SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home/" & Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ sname &/ ".face"
+ SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname
&/ ".face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " & sname &
Space(1) &/ "home" &/ sname &/ ".face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " & sname &
Space(1) &/ "home/" & sname &/ ".face" WAIT
IF ERROR THEN Message.Error(Error.Where & gb.NewLine &
Error.Text)
END IF
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Dec 3 06:42:11 2008
@@ -28,7 +28,7 @@
DIM sDump AS String
'EXEC ["ls", clsglobal.sTargetMnt &/ "home", "|", "grep", "-v", "ftp"]
TO sDump
- SHELL "ls " & clsglobal.sTargetMnt &/ "home | grep -v ftp" TO sDump
+ SHELL "ls " & clsglobal.sTargetMnt &/ "home | grep -v ftp | grep -v
lost+found" TO sDump
sDump = Trim(sDump)
IF Len(sDump) > 0 THEN FrmUserAdd.btImportAcct.Enabled = TRUE
@@ -198,48 +198,48 @@
MdlCore.warn_status_off()
END
- PUBLIC SUB LIST_NEW_USER_ACCOUNT()
- 'needs to verify with /etc/passwd to check for user account
- DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt
&/ "etc" &/ "passwd")))
- DIM arrline AS String[]
- DIM i, ii, iUID AS Integer
- DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
- DIM vuid AS Variant
- DIM tl AS TextLabel
- DIM tly AS Integer
-
- FrmUserAdd.LstUsers.Clear
- tly = 4
- FOR i = 0 TO sFile.count - 1
- sLine = sFile[i]
- ' now split each line
- arrline = Split(sLine, ":")
- FOR ii = 0 TO arrline.count - 1
- sSec = Trim(arrline[ii])
- vuid = arrline[2]
- iUID = CInt(vuid)
- sUsrLogin = arrline[0]
- sUsrRlName = arrline[4]
- sUsrHome = arrline[5]
- NEXT
- IF iUID >= 500 THEN
- tl = NEW TextLabel(LstUsers) AS "UserList"
- WITH tl
- .Height = 21
- .Text = sUsrLogin
- .Width = MdlObjSizer.get_object_width(.Text)
- .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
- "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
- .Move(0, tly)
- END WITH
- tly = tly + tl.Height + 2
- END IF
- NEXT
-
-
-
-
-END
+' PUBLIC SUB LIST_NEW_USER_ACCOUNT()
+' 'needs to verify with /etc/passwd to check for user account
+' DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt
&/ "etc" &/ "passwd")))
+' DIM arrline AS String[]
+' DIM i, ii, iUID AS Integer
+' DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
+' DIM vuid AS Variant
+' DIM tl AS TextLabel
+' DIM tly AS Integer
+'
+' FrmUserAdd.LstUsers.Clear
+' tly = 4
+' FOR i = 0 TO sFile.count - 1
+' sLine = sFile[i]
+' ' now split each line
+' arrline = Split(sLine, ":")
+' FOR ii = 0 TO arrline.count - 1
+' sSec = Trim(arrline[ii])
+' vuid = arrline[2]
+' iUID = CInt(vuid)
+' sUsrLogin = arrline[0]
+' sUsrRlName = arrline[4]
+' sUsrHome = arrline[5]
+' NEXT
+' IF iUID >= 500 THEN
+' tl = NEW TextLabel(LstUsers) AS "UserList"
+' WITH tl
+' .Height = 21
+' .Text = sUsrLogin
+' .Width = MdlObjSizer.get_object_width(.Text)
+' .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
+' "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
+' .Move(0, tly)
+' END WITH
+' tly = tly + tl.Height + 2
+' END IF
+' NEXT
+'
+'
+'
+'
+' END
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Wed Dec 3 06:42:11 2008
@@ -19,6 +19,51 @@
PUBLIC objGrps AS Object[]
+
+PUBLIC SUB LIST_NEW_USER_ACCOUNT()
+ 'needs to verify with /etc/passwd to check for user account
+ DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt
&/ "etc" &/ "passwd")))
+ DIM arrline AS String[]
+ DIM i, ii, iUID AS Integer
+ DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
+ DIM vuid AS Variant
+ DIM tl AS TextLabel
+ DIM tly AS Integer
+
+ FrmUserAdd.LstUsers.Clear
+ tly = 4
+ FOR i = 0 TO sFile.count - 1
+ sLine = sFile[i]
+ ' now split each line
+ arrline = Split(sLine, ":")
+ FOR ii = 0 TO arrline.count - 1
+ sSec = Trim(arrline[ii])
+ vuid = arrline[2]
+ iUID = CInt(vuid)
+ sUsrLogin = arrline[0]
+ sUsrRlName = arrline[4]
+ sUsrHome = arrline[5]
+ NEXT
+ IF iUID >= 500 THEN
+ tl = NEW TextLabel(FrmUserAdd.LstUsers) AS "UserList"
+ WITH tl
+ .Height = 21
+ .Text = sUsrLogin
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
+ "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
+ .Move(0, tly)
+ END WITH
+ tly = tly + tl.Height + 2
+ END IF
+ NEXT
+
+END
+
+
+
+
+
PUBLIC FUNCTION DISPLAY_USER_GROUP_OPTIONS(frmParent AS Frame)
DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,games,adm,sys,wheel,plugdev,disk"
DIM sGrpArr AS String[]
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 22:29:19
|
Author: M0...@gm...
Date: Tue Dec 2 14:27:30 2008
New Revision: 345
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/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/FrmImportAccts.class
branches/iVL/FrmResetSettings.class
branches/iVL/FrmResetSettings.form
branches/iVL/MdlResetSettings.module
branches/iVL/installer.gambas
Log:
Added message to inform account has been imported... Fixed bug in account
imported where the copy command produced an error if the file already exists
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsGlobal.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsPartSel.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsWinDrives.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FMain.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartScheme.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartSel.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPkgSel.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSelISO.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -54,47 +54,47 @@
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:58
-msgid "Do not Format"
+#: FrmSummary.class:75
+msgid "Do not format"
msgstr ""
-#: FrmSummary.class:59
-msgid "Yes"
+#: FrmSummary.class:76
+msgid "No"
msgstr ""
-#: FrmSummary.class:61
-msgid "No"
+#: FrmSummary.class:78
+msgid "Yes"
msgstr ""
-#: FrmSummary.class:99
+#: FrmSummary.class:104
msgid "None"
msgstr ""
-#: FrmSummary.class:121
+#: FrmSummary.class:126
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:174
+#: FrmSummary.class:179
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:183
+#: FrmSummary.class:188
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:210
+#: FrmSummary.class:215
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:286
+#: FrmSummary.class:291
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:296
+#: FrmSummary.class:301
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:306
+#: FrmSummary.class:311
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmWinDrives.class
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlCore.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlDiskPart.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlObjSizer.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPartSel.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPkgSel.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSetup.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSummarize.module
+# /home/vluser/devel/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 14:27:30 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.19
+Version=0.1.21
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 14:27:30 2008
@@ -86,7 +86,8 @@
'RETURN
ME.CREATE_IMPORTED_ACCOUNT
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
-
+ Message.Info(("User account for") & Space(1) &
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
+
'ME.Close
'ME.pbLogin.Picture.Image.Clear
END IF
@@ -121,6 +122,7 @@
EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc" &/ "skel" &
Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
EXEC ["chown", Trim(ME.cbAccntList.Text) & ":users",
ClsGlobal.sTargetMnt &/ "home" &/ Trim(ME.cbAccntList.Text) &/
Trim(sSettings[i])] WAIT
+ IF ERROR THEN Message(Error.Where & gb.NewLine & Error.Text)
NEXT
@@ -131,15 +133,16 @@
SHELL "chroot /mnt/target /usr/sbin/useradd -g " &
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPass1.Text & " -u " &
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "
& 'ME.tbUsername.Text WAIT
Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
-
+ IF ERROR THEN Message.Error(Error.Where & gb.NewLine & Error.Text)
' Add the face icon
IF Len(ME.tbPicPath.Text) > 0 THEN
SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
Trim(ME.cbAccntList.Text) & ".face.icon" WAIT 'link for KDM
' Tweak for the GDM face icon to work
- COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ ".face"
+ TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ Trim(ME.cbAccntList.Text) &/ ".face"
SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
Trim(ME.cbAccntList.Text) &/ ".face" WAIT
SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home" &/ Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home/" & Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ IF ERROR THEN Message.Error(Error.Where & gb.NewLine &
Error.Text)
END IF
' Increase the value of the iUID
Modified: branches/iVL/FrmResetSettings.class
==============================================================================
--- branches/iVL/FrmResetSettings.class (original)
+++ branches/iVL/FrmResetSettings.class Tue Dec 2 14:27:30 2008
@@ -81,7 +81,7 @@
PUBLIC SUB Form_Resize()
WITH ME
- .tlBanner.Move(4, 4)
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2))
.gvSettings.Move(4, .tlBanner.top + .tlBanner.Height + 4, .ClientWidth
- (.gvSettings.Left * 2), .ClientH - (.gvSettings.Top * 2))
.btDone.Move(4, .gvSettings.Top + .gvSettings.Height + 8,
MdlObjSizer.get_object_width(.btDone.Text) + 36, 21)
'.gvSettings.Columns[1].Width = .gvSettings.Width -
(.gvSettings.Columns[0].Width * 1.25)
Modified: branches/iVL/FrmResetSettings.form
==============================================================================
--- branches/iVL/FrmResetSettings.form (original)
+++ branches/iVL/FrmResetSettings.form Tue Dec 2 14:27:30 2008
@@ -6,8 +6,9 @@
Icon = Picture["icon:/small/undo"]
SkipTaskbar = True
{ tlBanner TextLabel
- MoveScaled(1,1,40,3)
+ MoveScaled(1,1,40,4)
Text = ("Select which settings to reset")
+ Alignment = Align.Normal
}
{ gvSettings GridView
MoveScaled(1,6,63,21)
Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module (original)
+++ branches/iVL/MdlResetSettings.module Tue Dec 2 14:27:30 2008
@@ -32,29 +32,29 @@
SELECT CASE sFile
CASE ".kde"
- sDesc = "KDE Settings (Menu, Window decorations, etc)"
+ sDesc = ("KDE Settings (Menu, Window decorations, etc)")
CASE ".qt"
- sDesc = "QT Toolkit settings (KDE Visual Effects)"
+ sDesc = ("QT Toolkit settings (KDE Visual Effects)")
CASE ".gtkrc-*"
- sDesc = "GTK Tookit theme Settings"
+ sDesc = ("GTK Tookit theme Settings")
CASE ".Xdefaults"
- sDesc = "X-window basic settings (includes xterm settings)"
+ sDesc = ("X-window basic settings (includes xterm settings)")
CASE ".bashrc"
- sDesc = "Bash init script"
+ sDesc = ("Bash init script")
CASE ".asoundrc"
- sDesc = "Sound system preferences"
+ sDesc = ("Sound system preferences")
CASE ".xinitrc"
- sDesc = "Graphical inteface preferences"
+ sDesc = ("Graphical inteface preferences")
CASE "Desktop"
- sDesc = "Desktop icons, folders, launchers"
+ sDesc = ("Desktop icons, folders, launchers")
CASE ".IceWM"
- sDesc = "IceWM settings, preferences, menu"
+ sDesc = ("IceWM settings, preferences, menu")
CASE ".xmms"
- sDesc = "XMMS Audio player preferences"
+ sDesc = ("XMMS Audio player preferences")
CASE ".Choices", "Choices"
- sDesc = "ROX Filer Desktop settings"
+ sDesc = ("ROX Filer Desktop settings")
CASE ".mplayer"
- sDesc = "MPlayer Multimedia Player Settings"
+ sDesc = ("MPlayer Multimedia Player Settings")
CASE ELSE
sDesc = ""
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 22:09:04
|
Author: M0...@gm...
Date: Tue Dec 2 14:07:58 2008
New Revision: 344
Modified:
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/FrmSummary.class
branches/iVL/installer.gambas
Log:
Fixed Format=Yes/No indicator in install summary.. Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 14:07:58 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.18
+Version=0.1.19
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 14:07:58 2008
@@ -86,6 +86,7 @@
'RETURN
ME.CREATE_IMPORTED_ACCOUNT
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
+
'ME.Close
'ME.pbLogin.Picture.Image.Clear
END IF
@@ -158,7 +159,6 @@
DIM tl AS TextLabel
DIM tly AS Integer
- FrmUserAdd.LstUsers.Clear
tly = 4
FOR i = 0 TO sFile.count - 1
sLine = sFile[i]
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Tue Dec 2 14:07:58 2008
@@ -55,11 +55,11 @@
sMountPnt = cb.Text
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
- IF cb1.Text <> ("Do not Format") THEN
- bForm = ("Yes")
- ELSE
- bForm = ("No")
- END IF
+ ' IF cb1.Text = ("Do not format") THEN
+ ' bForm = ("No")
+ ' ELSE
+ ' bForm = ("Yes")
+ ' END IF
NEXT
FOR EACH tl IN MdlPartSel.oPartLbls
IF tl.tag = cb.tag THEN
@@ -72,6 +72,11 @@
.GridView1[irow, 0].text = sPart
.GridView1[irow, 1].text = sSize
.GridView1[irow, 2].text = sFsType
+ IF sFsType = ("Do not format") THEN
+ bForm = ("No")
+ ELSE
+ bForm = ("Yes")
+ END IF
.GridView1[irow, 3].Text = sMountPnt
.GridView1[irow, 4].Text = bForm
END WITH
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 22:05:03
|
Author: rbistolfi
Date: Tue Dec 2 14:02:30 2008
New Revision: 343
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/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_ES translation
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/rbistolfi/vinstall-ng/FrmDiskPart.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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:02:30 2008
@@ -18,80 +18,80 @@
msgid "GUI installer for Vector linux"
msgstr "GUI installer for Vector linux"
-#: FMain.class:196 FrmDone.class:28
+#: FMain.class:199 FrmDone.class:28
msgid "Restart"
msgstr ""
-#: FMain.class:223
+#: FMain.class:226
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:224
+#: FMain.class:227
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:231
+#: FMain.class:234
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:244
+#: FMain.class:247
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid ""
"You have not created any user accounts for this system yet. There is not "
"enough information"
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid ""
"to create an account here. It is recommended that you create at least
one."
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:259 FrmSummary.class:59
+#: FMain.class:262 FrmSummary.class:59
msgid "Yes"
msgstr ""
-#: FMain.class:259 FrmSummary.class:61
+#: FMain.class:262 FrmSummary.class:61
msgid "No"
msgstr ""
-#: FMain.class:277
+#: FMain.class:280
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:281
+#: FMain.class:284
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:296
+#: FMain.class:299
msgid ""
"VectorLinux will now try to detect and configure your graphics hardware."
msgstr ""
-#: FMain.class:296
+#: FMain.class:299
msgid ""
"Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr "Please wait while setup attempts to run the partitioning utility"
-#: FMain.class:350
+#: FMain.class:353
msgid "Please wait while setup analyses your current partition setup."
msgstr "Please wait while setup analyses your current partition setup."
-#: FMain.class:350
+#: FMain.class:353
msgid "This may take a while ..."
msgstr "This may take a while ..."
-#: FMain.class:364
+#: FMain.class:367
msgid ""
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
@@ -99,15 +99,15 @@
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
-#: FMain.class:458
+#: FMain.class:461
msgid "Skipping lilo setup"
msgstr "Skipping lilo setup per user request"
-#: FMain.class:797
+#: FMain.class:799
msgid "Back"
msgstr "Back"
-#: FMain.class:809
+#: FMain.class:810
msgid "Exit Installation"
msgstr "Exit Installation"
@@ -203,65 +203,68 @@
msgid "TextLabel1"
msgstr "-"
-#: FrmImportAccts.class:31 FrmUserAdd.class:344
+#: FrmImportAccts.class:33 FrmUserAdd.class:343
msgid "Select picture for user Login"
msgstr ""
-#: FrmImportAccts.class:50
+#: FrmImportAccts.class:52
msgid "Reset settings for"
msgstr ""
-#: FrmImportAccts.class:64
+#: FrmImportAccts.class:69
+msgid "Please select an account name from the dropdown list."
+msgstr ""
+
+#: FrmImportAccts.class:74
msgid "Password fields cannot be blank. Please enter a password for"
msgstr ""
-#: FrmImportAccts.class:68
+#: FrmImportAccts.class:78
msgid "Selected passwords dont match. Please enter the same password twice"
msgstr ""
-#: FrmImportAccts.class:132
+#: FrmImportAccts.class:259
#, fuzzy
msgid "Account"
msgstr "User Accounts"
-#: FrmImportAccts.class:144
+#: FrmImportAccts.class:271
#, fuzzy
msgid "New Password"
msgstr "Set Password"
-#: FrmImportAccts.class:161
+#: FrmImportAccts.class:288
#, fuzzy
msgid "Select login Image"
msgstr "Select your language"
-#: FrmImportAccts.class:171 FrmUserAdd.class:509
+#: FrmImportAccts.class:298 FrmUserAdd.class:515
msgid "Select"
msgstr ""
-#: FrmImportAccts.class:181
+#: FrmImportAccts.class:308
#, fuzzy
msgid "Verify Password"
msgstr "Enter Password"
-#: FrmImportAccts.class:191 FrmUserAdd.class:520
+#: FrmImportAccts.class:319 FrmUserAdd.class:526
msgid "User Rights Management"
msgstr ""
-#: FrmImportAccts.class:197
-#, fuzzy
-msgid "Reset settings"
-msgstr "Regional Settings"
+#: FrmImportAccts.class:325
+msgid "Select Settings to reset"
+msgstr ""
-#: FrmImportAccts.class:203
+#: FrmImportAccts.class:332
#, fuzzy
msgid "Import Account"
msgstr "User Accounts"
-#: FrmImportAccts.class:209
+#: FrmImportAccts.class:339
msgid "Cancel"
msgstr ""
-#: FrmImportAccts.class:216 FrmUserAdd.class:596
+#: FrmImportAccts.class:347 FrmUserAdd.class:602
#, fuzzy
msgid "Import Existing User Accounts"
msgstr "User Accounts"
@@ -286,7 +289,7 @@
msgid "Total progress"
msgstr "Total progress"
-#: FrmLangSel.class:123
+#: FrmLangSel.class:130
msgid "Select your language"
msgstr "Select your language"
@@ -545,7 +548,7 @@
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"
-#: FrmPartSel.class:186 FrmUserAdd.class:524
+#: FrmPartSel.class:186 FrmUserAdd.class:530
msgid "Help"
msgstr "Help"
@@ -604,11 +607,11 @@
msgid "To install them all, just click next"
msgstr "To install them all, just click next"
-#: FrmResetSettings.class:92
+#: FrmResetSettings.class:112
msgid "Select which settings to reset"
msgstr ""
-#: FrmResetSettings.class:101
+#: FrmResetSettings.class:121
#, fuzzy
msgid "Done"
msgstr "None"
@@ -666,7 +669,7 @@
"a root password, think of something easy for you to remember, but hard
for "
"others to guess."
-#: FrmRootPass.class:134 FrmUserAdd.class:557
+#: FrmRootPass.class:134 FrmUserAdd.class:563
msgid "Enter Password"
msgstr "Enter Password"
@@ -829,38 +832,38 @@
msgid "Enter a password for"
msgstr ""
-#: FrmUserAdd.class:186
+#: FrmUserAdd.class:185
msgid "Passwords do not match"
msgstr ""
-#: FrmUserAdd.class:187
+#: FrmUserAdd.class:186
msgid "Enter the same password twice"
msgstr ""
-#: FrmUserAdd.class:383
+#: FrmUserAdd.class:382
msgid ""
"Your password selections do not match. Please enter the same password
twice"
msgstr ""
-#: FrmUserAdd.class:408
+#: FrmUserAdd.class:407
msgid ""
"Groups are a way of administering permissions for your users. You grant
the "
"user"
msgstr ""
-#: FrmUserAdd.class:408
+#: FrmUserAdd.class:407
msgid "permission to do certain things by adding them to certain groups."
msgstr ""
-#: FrmUserAdd.class:408
+#: FrmUserAdd.class:407
msgid "Select which groups you want this user to be a part of here"
msgstr ""
-#: FrmUserAdd.class:409
+#: FrmUserAdd.class:408
msgid "OK"
msgstr ""
-#: FrmUserAdd.class:471
+#: FrmUserAdd.class:477
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 "
@@ -870,31 +873,31 @@
"accuracy. You can make as many users as you want, and when you are
finished "
"click next to continue."
-#: FrmUserAdd.class:515
+#: FrmUserAdd.class:521
msgid "Use Picture ID for Login greeting"
msgstr ""
-#: FrmUserAdd.class:537
+#: FrmUserAdd.class:543
msgid "Create User"
msgstr "Create User"
-#: FrmUserAdd.class:543
+#: FrmUserAdd.class:549
msgid "Clear Form"
msgstr ""
-#: FrmUserAdd.class:550
+#: FrmUserAdd.class:556
msgid "Login Name"
msgstr ""
-#: FrmUserAdd.class:564
+#: FrmUserAdd.class:570
msgid "ReEnter Password"
msgstr "ReEnter Password"
-#: FrmUserAdd.class:580
+#: FrmUserAdd.class:586
msgid "Real Name"
msgstr ""
-#: FrmUserAdd.class:586 MdlCore.module:500
+#: FrmUserAdd.class:592 MdlCore.module:500
msgid "User Accounts"
msgstr "User Accounts"
@@ -1005,23 +1008,23 @@
msgid "Timezone configuration"
msgstr "Timezone configuration"
-#: FrmZoneSet.class:170
+#: FrmZoneSet.class:171
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:175
+#: FrmZoneSet.class:176
msgid "ComboBox1"
msgstr "-"
-#: FrmZoneSet.class:177
+#: FrmZoneSet.class:178
msgid "LocalTime"
msgstr "LocalTime"
-#: FrmZoneSet.class:177
+#: FrmZoneSet.class:178
msgid "UTC"
msgstr "UTC"
-#: FrmZoneSet.class:182
+#: FrmZoneSet.class:183
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -1589,6 +1592,10 @@
#: MdlZoneSet.module:28
msgid "localtime"
msgstr "localtime"
+
+#, fuzzy
+#~ msgid "Reset settings"
+#~ msgstr "Regional Settings"
#~ 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 Tue Dec 2 14:02:30 2008
@@ -16,85 +16,88 @@
#: .project:2
msgid "GUI installer for Vector linux"
-msgstr "Instaladaor Gráfico de VectorLinux"
+msgstr "Instaladador Gráfico de VectorLinux"
-#: FMain.class:196 FrmDone.class:28
+#: FMain.class:199 FrmDone.class:28
msgid "Restart"
msgstr "Reiniciar"
-#: FMain.class:223
+#: FMain.class:226
msgid "Please select a default operating system to boot before proceeding"
msgstr "Por favor selectione el sistema operativo que se iniciara por
defecto"
-#: FMain.class:224
+#: FMain.class:227
msgid "Select an entry from this list"
msgstr "Seleccione una de esta opciones"
-#: FMain.class:231
-#, fuzzy
+#: FMain.class:234
msgid "Skipping boot loaded setup"
-msgstr "Salteando configuración de LILO"
+msgstr "Salteando configuración del Gestor de Arranque"
-#: FMain.class:244
+#: FMain.class:247
msgid "Passwords do not match. Please enter the same password twice"
msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña "
-#: FMain.class:259
+#: FMain.class:262
msgid ""
"You have not created any user accounts for this system yet. There is not "
"enough information"
msgstr ""
+"No haz creado cuentas de usuario para este sistema. No hay suficiente "
+"información "
-#: FMain.class:259
+#: FMain.class:262
msgid ""
"to create an account here. It is recommended that you create at least
one."
-msgstr ""
+msgstr "para crear una cuenta aquí. Recomendamos que cree al menos una. "
-#: FMain.class:259
+#: FMain.class:262
msgid "Would you like to continue anyway?"
-msgstr ""
+msgstr "Quieres continuar de todos modos? "
-#: FMain.class:259 FrmSummary.class:59
+#: FMain.class:262 FrmSummary.class:59
msgid "Yes"
msgstr "Sí"
-#: FMain.class:259 FrmSummary.class:61
+#: FMain.class:262 FrmSummary.class:61
msgid "No"
msgstr "No"
-#: FMain.class:277
+#: FMain.class:280
msgid "Please specify a hostname for this computer"
-msgstr ""
+msgstr "Ingresa un Nombre de Doinio (Hostname) para este ordenador. "
-#: FMain.class:281
+#: FMain.class:284
msgid "Please specify the domain this computer belongs to"
-msgstr ""
+msgstr "Por favor especifica el dominio al que pertenece esta computadora "
-#: FMain.class:296
+#: FMain.class:299
msgid ""
"VectorLinux will now try to detect and configure your graphics hardware."
-msgstr ""
+msgstr "VectorLinux intentará detectar y configurar tu hardware de video. "
-#: FMain.class:296
+#: FMain.class:299
msgid ""
"Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
+"Tu pantalla puede parpadear o apagarse por unos segundos durante este "
+"proceso. "
-#: FMain.class:348
+#: FMain.class:351
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
"Por favor espere, el instalador intentará ejecutar la herramienta de "
"particionado"
-#: FMain.class:350
+#: FMain.class:353
msgid "Please wait while setup analyses your current partition setup."
msgstr "Por favor espere mientras el instalador analiza su particonado
actual."
-#: FMain.class:350
+#: FMain.class:353
msgid "This may take a while ..."
msgstr "Esto puede tardar unos minutos ..."
-#: FMain.class:364
+#: FMain.class:367
msgid ""
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
@@ -102,17 +105,17 @@
"Debes seleccionar una partición para \"/\" (raíz). Allí sera instalado
el "
"sistema operativo"
-#: FMain.class:458
+#: FMain.class:461
msgid "Skipping lilo setup"
msgstr "Salteando configuración de LILO"
-#: FMain.class:797
+#: FMain.class:799
msgid "Back"
msgstr "Regresar"
-#: FMain.class:809
+#: FMain.class:810
msgid "Exit Installation"
-msgstr "Cancelar Instalación"
+msgstr "Salir del Instalador "
#: FMain.class:821
msgid "Next"
@@ -140,6 +143,8 @@
"When finished making changes, exit the partitioning application to "
"continue ..."
msgstr ""
+"Cuando finalices tus cambios, sal del particionador desde el menú o
presiona "
+"Control + Q para continuar ... "
#: FrmDiskPart.class:117
msgid "Disk Partitioning:"
@@ -154,6 +159,8 @@
"has been installed to your system. Your new system has been configured
with "
"the default factory settings."
msgstr ""
+"ha sido instalado en tu sistema. Tu ordenador ha sido configurado
utilizando "
+"las opciones por defecto. "
#: FrmDone.class:39
msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
@@ -166,20 +173,24 @@
"Your computer needs to be restarted so that you can use your new
operating "
"system. Click"
msgstr ""
+"Su ordenador necesita ser reiniciado así puedes comenzar a utilizar tu
nuevo "
+"sistema operativo. Haz click "
#: FrmDone.class:39
msgid "to restart your computer now or click"
-msgstr ""
+msgstr "para reiniciar su ordenador ahora o haga click. "
#: FrmDone.class:39
msgid "to restart your computer at a later time"
-msgstr ""
+msgstr "para reiniciar su ordenador luego. "
#: FrmDone.class:39
msgid ""
"If you installed from CD-ROM/R/RW media, please remove de disk before "
"restarting."
msgstr ""
+"Si haz instalado VectorLinux desde una unidad de CD / DVD, por favo
retira "
+"el disco antes de reiniciar. "
#: FrmDone.class:75
msgid "Installation is finished"
@@ -188,14 +199,15 @@
#: FrmHalSwitch.class:20
msgid "Would you like to use Vl-Hot or HAL to manage your removable
devices?"
msgstr ""
+"Deseas utilizar HAL o VL-Hot para controlar tus dispositivos extraibles?"
#: FrmHalSwitch.class:25
msgid "HAL"
-msgstr ""
+msgstr "-"
#: FrmHalSwitch.class:30
msgid "VL-Hot"
-msgstr ""
+msgstr "-"
#: FrmHostPrep.class:130
msgid "Vectorlinux is preparing your system for installation. Please wait."
@@ -212,70 +224,66 @@
msgid "TextLabel1"
msgstr "-"
-#: FrmImportAccts.class:31 FrmUserAdd.class:344
+#: FrmImportAccts.class:33 FrmUserAdd.class:343
msgid "Select picture for user Login"
-msgstr "Selecciona una imagen para el usuario"
+msgstr "Selecciona una imagen "
-#: FrmImportAccts.class:50
+#: FrmImportAccts.class:52
msgid "Reset settings for"
-msgstr ""
+msgstr "Eliminar configuraciones existentes para "
-#: FrmImportAccts.class:64
-#, fuzzy
+#: FrmImportAccts.class:69
+msgid "Please select an account name from the dropdown list."
+msgstr "Selecciona un nombre de cuenta de la lista. "
+
+#: FrmImportAccts.class:74
msgid "Password fields cannot be blank. Please enter a password for"
-msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña "
+msgstr ""
+"La contraseña no puede ser vacía, por favor ingresa una contraseña para "
-#: FrmImportAccts.class:68
-#, fuzzy
+#: FrmImportAccts.class:78
msgid "Selected passwords dont match. Please enter the same password twice"
-msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña "
+msgstr "Las contraseñas ingresadas no coinciden. "
-#: FrmImportAccts.class:132
-#, fuzzy
+#: FrmImportAccts.class:259
msgid "Account"
-msgstr "Usuarios"
+msgstr "Cuenta "
-#: FrmImportAccts.class:144
-#, fuzzy
+#: FrmImportAccts.class:271
msgid "New Password"
-msgstr "Define tu contraseña"
+msgstr "Nueva contraseña "
-#: FrmImportAccts.class:161
-#, fuzzy
+#: FrmImportAccts.class:288
msgid "Select login Image"
-msgstr "Selecciona tu idioma"
+msgstr "Selecciona una imagen para tu usuario "
-#: FrmImportAccts.class:171 FrmUserAdd.class:509
+#: FrmImportAccts.class:298 FrmUserAdd.class:515
msgid "Select"
msgstr "Seleciona"
-#: FrmImportAccts.class:181
-#, fuzzy
+#: FrmImportAccts.class:308
msgid "Verify Password"
-msgstr "Ingresa contraseña"
+msgstr "Verificar contraseña "
-#: FrmImportAccts.class:191 FrmUserAdd.class:520
+#: FrmImportAccts.class:319 FrmUserAdd.class:526
msgid "User Rights Management"
msgstr "Administración de los Permisos de Usuario"
-#: FrmImportAccts.class:197
-#, fuzzy
-msgid "Reset settings"
-msgstr "Opciones de regionalización"
+#: FrmImportAccts.class:325
+msgid "Select Settings to reset"
+msgstr "Selecciona las configuraciones a sobreescribir "
-#: FrmImportAccts.class:203
-#, fuzzy
+#: FrmImportAccts.class:332
msgid "Import Account"
-msgstr "Usuarios"
+msgstr "Importar cuenta de usuario "
-#: FrmImportAccts.class:209
+#: FrmImportAccts.class:339
msgid "Cancel"
-msgstr ""
+msgstr "Cancelar "
-#: FrmImportAccts.class:216 FrmUserAdd.class:596
-#, fuzzy
+#: FrmImportAccts.class:347 FrmUserAdd.class:602
msgid "Import Existing User Accounts"
-msgstr "Limiar cuentas de usuario"
+msgstr "Importar cuentas de usuario existentes "
#: FrmInstallSys.class:63
msgid "Current Step"
@@ -297,26 +305,25 @@
msgid "Total progress"
msgstr "Progreso Total"
-#: FrmLangSel.class:123
+#: FrmLangSel.class:130
msgid "Select your language"
msgstr "Selecciona tu idioma"
#: FrmLicense.class:99
msgid "LICENSE AGREEMENT"
-msgstr ""
+msgstr "Acuero de Licencia GPL "
#: FrmLicense.class:104
-#, fuzzy
msgid "TextArea1"
msgstr "-"
#: FrmLicense.class:110
msgid "Yes, I Agree to the License Agreement"
-msgstr ""
+msgstr "Si, estoy de acuerdo "
#: FrmLicense.class:115
msgid "No, I Do Not Agree"
-msgstr ""
+msgstr "No estoy de acuerdo "
#: FrmLilo.class:37
msgid ""
@@ -372,7 +379,7 @@
#: FrmLilo.class:267 FrmLiloSetup.class:263
msgid "Prompt Timeout"
-msgstr "Esperar"
+msgstr "Límite de espera "
#: FrmLilo.class:278 FrmLiloSetup.class:274
msgid "Seconds"
@@ -383,19 +390,16 @@
msgstr "Arranque por defecto"
#: FrmLiloSetup.class:66 MdlLilo.module:56
-#, fuzzy
msgid "Bootsplash Extra High"
msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
#: FrmLiloSetup.class:176
-#, fuzzy
msgid "Boot Manager Configuration"
-msgstr "Configurar el sistema"
+msgstr "Configuración del gestor de inicio (Boot Loader) "
#: FrmLiloSetup.class:192
-#, fuzzy
msgid "Do not install LILO"
-msgstr "No quiero instalar LILO"
+msgstr "No instalar LILO "
#: FrmNetConf.class:184 MdlCore.module:501
msgid "Network Configuration"
@@ -407,7 +411,7 @@
#: FrmNetConf.class:211
msgid "Domain"
-msgstr ""
+msgstr "Dominio "
#: FrmNetConf.class:227
msgid "Manual DNS Server Specification"
@@ -561,7 +565,7 @@
"For favor, seleccione las secciones del disco que desea usar, y también
como "
"usarlas"
-#: FrmPartSel.class:186 FrmUserAdd.class:524
+#: FrmPartSel.class:186 FrmUserAdd.class:530
msgid "Help"
msgstr "Ayuda"
@@ -585,11 +589,11 @@
#: FrmPkgSel.class:40
msgid "Package"
-msgstr ""
+msgstr "Paquete "
#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
msgid "Description"
-msgstr ""
+msgstr "Descripción "
#: FrmPkgSel.class:42 FrmSummary.class:41 FrmUsrPkgSel.class:19
msgid "Size"
@@ -598,7 +602,7 @@
#: FrmPkgSel.class:71
msgid ""
"Installs all optional components in your VectorLinux media to your system"
-msgstr ""
+msgstr "Instala todos los componentes disponibles en el CD de
instalación. "
#: FrmPkgSel.class:81
msgid "Choose your optional components to install."
@@ -620,14 +624,13 @@
msgid "To install them all, just click next"
msgstr "Para instalarlos todos, simplemente presiona Sigiente"
-#: FrmResetSettings.class:92
+#: FrmResetSettings.class:112
msgid "Select which settings to reset"
-msgstr ""
+msgstr "Selecciona las configuraciones para sobreescribir "
-#: FrmResetSettings.class:101
-#, fuzzy
+#: FrmResetSettings.class:121
msgid "Done"
-msgstr "Ninguno"
+msgstr "Hecho "
#: FrmRootPass.class:12
msgid "System Administrator Password"
@@ -687,7 +690,7 @@
"administrador, piensa en algo fácil de recordar, pero al mismo tiempo "
"difícil de adivinar para los otros. "
-#: FrmRootPass.class:134 FrmUserAdd.class:557
+#: FrmRootPass.class:134 FrmUserAdd.class:563
msgid "Enter Password"
msgstr "Ingresa contraseña"
@@ -717,7 +720,7 @@
#: FrmSelISO.class:87
msgid "Select installation media from the list below"
-msgstr ""
+msgstr "Selecciona el medio de instalación de la siguiente lista "
#: FrmSelISO.class:116
msgid "Unable to identify distro."
@@ -746,16 +749,15 @@
#: FrmSummary.class:17 MdlSummarize.module:56
msgid "Custom"
-msgstr "Personalisado"
+msgstr "Personalizado "
#: FrmSummary.class:21 MdlSummarize.module:69
msgid "Full"
msgstr "Completa"
#: FrmSummary.class:37
-#, fuzzy
msgid "Preparing Installation Summary ... Please wait"
-msgstr "Resumen del proceso"
+msgstr "Preparando el resumen de la instalación ... Por favor espera "
#: FrmSummary.class:39
msgid "Partition"
@@ -771,16 +773,15 @@
#: FrmSummary.class:46
msgid "Format ?"
-msgstr ""
+msgstr "Formatear? "
#: FrmSummary.class:52 MdlInstallSys.module:142 MdlPartSel.module:143
msgid "Not Used"
msgstr "Sin usar"
#: FrmSummary.class:58
-#, fuzzy
msgid "Do not Format"
-msgstr "No Formatear"
+msgstr "No Formatear "
#: FrmSummary.class:99 MdlNetConf.module:245
msgid "None"
@@ -819,9 +820,8 @@
msgstr "Limiar cuentas de usuario"
#: FrmUserAdd.class:92
-#, fuzzy
msgid "Creating user account ... Please wait"
-msgstr "Calculando el número de paquetes ... Por favor espere"
+msgstr "Creando la cuenta de usuario ... Por favor espera "
#: FrmUserAdd.class:100
msgid "Enter the login name that this user will user to login to this
system."
@@ -847,28 +847,28 @@
#: FrmUserAdd.class:125
msgid "already exists"
-msgstr ""
+msgstr "ya existe "
#: FrmUserAdd.class:129
msgid "Enter a password for"
msgstr "Ingresa una contraseña para "
-#: FrmUserAdd.class:186
+#: FrmUserAdd.class:185
msgid "Passwords do not match"
msgstr "Las contraseñas no coinciden "
-#: FrmUserAdd.class:187
+#: FrmUserAdd.class:186
msgid "Enter the same password twice"
-msgstr "Ingreasa la misma contraseña dos veces "
+msgstr "Ingresa la misma contraseña dos veces "
-#: FrmUserAdd.class:383
+#: FrmUserAdd.class:382
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."
-#: FrmUserAdd.class:408
+#: FrmUserAdd.class:407
msgid ""
"Groups are a way of administering permissions for your users. You grant
the "
"user"
@@ -876,21 +876,21 @@
"Los Grupos son un método para administrar los permisos de los usuarios.
Le "
"garantizas a cada usuario"
-#: FrmUserAdd.class:408
+#: FrmUserAdd.class:407
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."
-#: FrmUserAdd.class:408
+#: FrmUserAdd.class:407
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"
-#: FrmUserAdd.class:409
+#: FrmUserAdd.class:408
msgid "OK"
msgstr "OK"
-#: FrmUserAdd.class:471
+#: FrmUserAdd.class:477
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 "
@@ -899,43 +899,41 @@
"Elige un nombre único para cada usuario. Es necesario ingresar las "
"contraseñas dos veces. Puedes crear todas las cuentas de usuarios que
desees"
-#: FrmUserAdd.class:515
+#: FrmUserAdd.class:521
msgid "Use Picture ID for Login greeting"
msgstr "Utilizar una imágen para el usuario en el gestor de sesiones"
-#: FrmUserAdd.class:537
+#: FrmUserAdd.class:543
msgid "Create User"
msgstr "Agregar Usuario"
-#: FrmUserAdd.class:543
+#: FrmUserAdd.class:549
msgid "Clear Form"
msgstr "Limpiar Formulario"
-#: FrmUserAdd.class:550
+#: FrmUserAdd.class:556
msgid "Login Name"
msgstr "Nombre de usuario"
-#: FrmUserAdd.class:564
+#: FrmUserAdd.class:570
msgid "ReEnter Password"
msgstr "Vuelva a ingresar la contraseña"
-#: FrmUserAdd.class:580
+#: FrmUserAdd.class:586
msgid "Real Name"
msgstr "Nombre Real"
-#: FrmUserAdd.class:586 MdlCore.module:500
+#: FrmUserAdd.class:592 MdlCore.module:500
msgid "User Accounts"
msgstr "Usuarios"
#: FrmUsrPkgSel.class:11
-#, fuzzy
msgid "To install them all, just click"
-msgstr "Para instalarlos todos, simplemente presiona Sigiente"
+msgstr "Para instalarlos todos, simplemente clickea "
#: FrmUsrPkgSel.class:40
-#, fuzzy
msgid "Reading available software selection ... Please wait"
-msgstr "Cargando Gparted ... Por favor espere"
+msgstr "Leyendo selección de software ... Por favor espera "
#: FrmWinDrives.class:72
msgid "Select the windows partitions you would like to mount during boot"
@@ -943,7 +941,7 @@
#: FrmXconf.class:25
msgid "Uses the default (failsafe) configuration."
-msgstr ""
+msgstr "Usar la configuración por defecto (modo seguro). "
#: FrmXconf.class:27
msgid ""
@@ -963,7 +961,7 @@
#: FrmXconf.class:311
msgid "Video Driver"
-msgstr ""
+msgstr "Driver de video "
#: FrmXconf.class:322
msgid "Color Depth"
@@ -975,19 +973,19 @@
#: FrmXconf.class:335
msgid "24 bit True Color"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:335
msgid "16 bit Pseudo Color"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:335
msgid "8 bit 256 Color"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:335
msgid "4 bit 16 Color"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:335
msgid "1 bit Mono B/W"
@@ -995,65 +993,65 @@
#: FrmXconf.class:340
msgid "Vesa"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:342
msgid "Fbdev"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "1920x1280"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "1600x1200"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "1440x900"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "1280x1024"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "1280x800"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "1024x768"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "800x600"
-msgstr ""
+msgstr "-"
#: FrmXconf.class:348
msgid "640x480"
-msgstr ""
+msgstr "-"
#: FrmZoneSet.class:21
msgid "Timezone configuration"
msgstr "Configuración de la Zona Horaria"
-#: FrmZoneSet.class:170
+#: FrmZoneSet.class:171
msgid "Choose the correct timezone for the area in which you live."
msgstr "Selecciona la zona horaria del área donde vives"
-#: FrmZoneSet.class:175
+#: FrmZoneSet.class:176
msgid "ComboBox1"
msgstr "-"
-#: FrmZoneSet.class:177
+#: FrmZoneSet.class:178
msgid "LocalTime"
msgstr "Hora Local"
-#: FrmZoneSet.class:177
+#: FrmZoneSet.class:178
msgid "UTC"
msgstr "UTC"
-#: FrmZoneSet.class:182
+#: FrmZoneSet.class:183
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -1073,20 +1071,19 @@
#: MdlConfLilo.module:124
msgid "MBR of "
-msgstr ""
+msgstr "MBR de "
#: MdlConfLilo.module:131 MdlLilo.module:98
msgid "Bootsector of "
-msgstr ""
+msgstr "Sector de arranque de "
#: MdlConfLilo.module:136 MdlLilo.module:100
msgid "Floppy"
-msgstr ""
+msgstr "Disco Flexible "
#: MdlCore.module:28
-#, fuzzy
msgid "Working ... Please Wait"
-msgstr "Cargando Gparted ... Por favor espere"
+msgstr "Trabajando ... Por favor espera "
#: MdlCore.module:221
msgid "Scanning system for installable media. Please wait ..."
@@ -1101,9 +1098,8 @@
"Por favor inserta Vectorlinux"
#: MdlCore.module:239
-#, fuzzy
msgid "installation CD and click"
-msgstr "CD de instalación y haz click en"
+msgstr "CD de instalación y haz click. "
#: MdlCore.module:239
msgid "to try again"
@@ -1135,7 +1131,7 @@
#: MdlCore.module:487
msgid "Language Selection"
-msgstr "Seleccion de idioma"
+msgstr "Selección de idioma"
#: MdlCore.module:488
msgid "Find installation media"
@@ -1167,7 +1163,7 @@
#: MdlCore.module:502
msgid "Final Hardware Configuration"
-msgstr "Configuración final"
+msgstr "Configuración final de Hardware "
#: MdlDiskPart.module:46
msgid ""
@@ -1260,7 +1256,7 @@
#: MdlInstallCustom.module:225
msgid "Failed to install. Installation will stop"
-msgstr ""
+msgstr "La instalación ha fallado. "
#: MdlInstallCustom.module:271
msgid "Installing user-selected package"
@@ -1272,7 +1268,7 @@
#: MdlInstallCustom.module:423
msgid "failed to install. Installation will stop now"
-msgstr ""
+msgstr "fallado la instalación. El instalador terminará ahora. "
#: MdlInstallSys.module:118
msgid "Writing new /etc/fstab to system"
@@ -1328,22 +1324,23 @@
#: MdlLilo.module:96
msgid "MBR of"
-msgstr ""
+msgstr "MBR de "
#: MdlLilo.module:183
msgid "Your option to boot"
-msgstr ""
+msgstr "Tu opción para iniciar "
#: MdlLilo.module:183
msgid ""
"is too long. it has been adjusted to \"Vector-cli\". You can run vasmCC "
"after the first boot to modify your boot options"
msgstr ""
+"es demasiado largo. Ha sido ajustado a \"Vector-cli\". Puedes ejecutar "
+"VasmCC luego del primer inicio para modificar tus opciones de arranque. "
#: MdlLilo.module:453
-#, fuzzy
msgid "installed on"
-msgstr "Instalación "
+msgstr "instalado en "
#: MdlLilo.module:471 MdlLiloOsList.module:149
msgid "Include this installation in the boot menu"
@@ -1354,40 +1351,36 @@
msgstr "Nombre"
#: MdlLilo.module:538
-#, fuzzy
msgid "installed in"
-msgstr "Instalando"
+msgstr "instalado en "
#: MdlLilo.module:559
-#, fuzzy
msgid "Include in boot menu"
-msgstr "Incluir esta instalación en el menú de arranque"
+msgstr "Incluir en el menú de arranque "
#: MdlLilo.module:595
msgid "Initrd"
-msgstr ""
+msgstr "-"
#: MdlLilo.module:625 MdlLiloOsList.module:359
msgid "Kernel boot options"
msgstr "Opciones de arranque de kernel"
#: MdlLilo.module:648
-#, fuzzy
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"
+msgstr "Agregar una opción para iniciar este sistema operativo en Modo
Texto. "
#: MdlLiloOsList.module:139
msgid "Windows installation found in"
-msgstr ""
+msgstr "Instalación de Windows detectada en "
#: MdlLiloOsList.module:158
msgid "Label"
msgstr "Etiqueta"
#: MdlLiloOsList.module:290
-#, fuzzy
msgid "Operating system installed in"
-msgstr "Sistema operativo montado en"
+msgstr "Sistema Operativo instalado en "
#: MdlLiloOsList.module:302
msgid "Include this operating system in the boot menu"
@@ -1398,18 +1391,16 @@
msgstr "Disco Ram inicial"
#: MdlLiloOsList.module:396
-#, fuzzy
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"
+msgstr "Agregar una opción para iniciar este sistema operativo en Modo
Texto. "
#: MdlNetConf.module:60
-#, fuzzy
msgid "Probing your networking hardware ... Please wait"
-msgstr "Cargando Gparted ... Por favor espere"
+msgstr "Detectando tu Hardware ... Por favor espera "
#: MdlNetConf.module:93
msgid "No ethernet neworking devices found"
-msgstr ""
+msgstr "No se han encontrado dispositivos de red Ethernet "
#: MdlNetConf.module:120
msgid "Wired"
@@ -1489,7 +1480,7 @@
#: MdlNetConf.module:429
msgid "Gateway Address"
-msgstr "Dirección de Puerta de Enlace"
+msgstr "Dirección de Puerta de Enlace (GW)"
#: MdlPartFrmt.module:103
msgid "There has been an error while trying to format "
@@ -1521,11 +1512,11 @@
#: MdlSetup.module:255
msgid "Total bulks to be installed = "
-msgstr ""
+msgstr "Total de suites de paquetes a instalar: "
#: MdlSetup.module:258
msgid "Total pkgs to be installed = "
-msgstr ""
+msgstr "Total de paquetes a instalar: "
#: MdlSetup.module:301
msgid "BROUGHT TO YOU BY"
@@ -1629,15 +1620,3 @@
#: MdlZoneSet.module:28
msgid "localtime"
msgstr "Hora local"
-
-#~ msgid "Installing Final configuration files..."
-#~ msgstr "Instalando los últimos ficheros de configuración ..."
-
-#~ msgid "Network Interfaces"
-#~ msgstr "Dispositivos de red"
-
-#~ msgid "Total Progress"
-#~ msgstr "Progreso Total"
-
-#~ msgid "Total packages to be installed = "
-#~ msgstr "Paquetes a instalar = "
|
|
From: <cod...@go...> - 2008-12-02 21:43:20
|
Author: M0E.lnx
Date: Tue Dec 2 13:40:49 2008
New Revision: 342
Modified:
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/installer.gambas
Log:
Fixed password imput issue with user account import
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 13:40:49 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.17
+Version=0.1.18
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 13:40:49 2008
@@ -127,7 +127,7 @@
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
Trim(ME.cbAccntList.Text) WAIT
SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1) &
FrmUserAdd.iUID & Space(1) & Trim(ME.cbAccntList.Text) WAIT
- SHELL "chroot /mnt/target /usr/sbin/useradd -g " &
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPasswd1.text & " -u " &
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "
& 'ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/useradd -g " &
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPass1.Text & " -u " &
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "
& 'ME.tbUsername.Text WAIT
Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 21:21:18
|
Author: M0E.lnx
Date: Tue Dec 2 13:19:41 2008
New Revision: 341
Modified:
branches/iVL/.project
branches/iVL/installer.gambas
Log:
updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 13:19:41 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.16
+Version=0.1.17
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 21:17:18
|
Author: M0E.lnx
Date: Tue Dec 2 13:16:31 2008
New Revision: 340
Modified:
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/FrmZoneSet.class
branches/iVL/MdlResetSettings.module
branches/iVL/installer.gambas
Log:
Fixed bad object reference in accounts importing
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 13:16:31 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.15
+Version=0.1.16
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 13:16:31 2008
@@ -127,7 +127,7 @@
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
Trim(ME.cbAccntList.Text) WAIT
SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1) &
FrmUserAdd.iUID & Space(1) & Trim(ME.cbAccntList.Text) WAIT
- SHELL "chroot /mnt/target /usr/sbin/useradd -g " & ME.tbUsername.text
& " -p " & ME.tbPasswd1.text & " -u " & FrmUserAdd.iUID & " -G "
& "\'users," & sGroups & "\' -s /bin/bash " & 'ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/useradd -g " &
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPasswd1.text & " -u " &
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "
& 'ME.tbUsername.Text WAIT
Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
@@ -206,7 +206,7 @@
.tbPass2.Move(.tlPasswd2.Left, .tbPass1.top, 175)
.tlPicPath.Move(4, .tbPass1.top + .tbPass1.Height + 8,
MdlObjSizer.get_object_width(.tlPicPath.Text))
.btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8, .tlPicPath.top
+ .tlPicPath.Height + 8, MdlObjSizer.get_object_width(.btBrowsePic.Text) +
36)
- .tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)
- (.tbPicPath.Left * 2) - 8)
+ .tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)
- (.tbPicPath.Left * 2) - 24)
.pbLogin.Move(.tbPass2.Left + .tbPass2.Width + 8, .tlPasswd2.top + 4,
48, 48)
.scrGrpHost.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientWidth
- (.scrGrpHost.Left * 2), .ClientHeight - (.scrGrpHost.Top +
(.btBrowsePic.Height * 4)))
.btResetSettings.Move(4, .scrGrpHost.top + .scrGrpHost.Height + 8,
MdlObjSizer.get_object_width(.btResetSettings.Text) + 36)
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Tue Dec 2 13:16:31 2008
@@ -29,6 +29,7 @@
MdlZoneSet.TIME_ZONES()
'ME.lbTmZone.Index = 9
FMain.btnext.Enabled = TRUE
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module (original)
+++ branches/iVL/MdlResetSettings.module Tue Dec 2 13:16:31 2008
@@ -64,7 +64,11 @@
'INC i
INC FrmResetSettings.gvSettings.Rows.Count
FrmResetSettings.gvSettings[i, 1].Text = sDesc
- FrmResetSettings.gvSettings[i, 2].Text = sFile
+ FrmResetSettings.gvSettings[i, 2].Text = sFile
+ IF InStr(FrmImportAccts.sSettingsList, sFile) THEN
+ FrmResetSettings.gvSettings[i, 0].Picture = FrmPkgSel.pYes
+ END IF
+
INC i
END IF
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 20:32:03
|
Author: M0E.lnx
Date: Tue Dec 2 12:31:38 2008
New Revision: 339
Modified:
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/installer.gambas
Log:
Fixed bug in string/string[] error... Accounts importer
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 12:31:38 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.14
+Version=0.1.15
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 12:31:38 2008
@@ -115,7 +115,7 @@
'RETURN
' Prepare home dir making the requested changes
IF Len(sSettingsList) > 0 THEN
- sSettings = Split(sSettings, ",")
+ sSettings = Split(sSettingsList, ",")
FOR i = 0 TO sSettings.Count - 1
EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc" &/ "skel" &
Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 20:16:39
|
Author: M0E.lnx
Date: Tue Dec 2 12:13:51 2008
New Revision: 338
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/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/MdlImportAccts.module
branches/iVL/installer.gambas
Log:
Fixed path for searching user accounts
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/.project
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/ClsGlobal.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/ClsPartSel.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/ClsWinDrives.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FMain.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmPartScheme.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmPartSel.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmPkgSel.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmSelISO.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmSummary.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmWinDrives.class
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlCore.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlDiskPart.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlObjSizer.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlPartSel.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlPkgSel.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlSetup.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlSummarize.module
+# /home/vluser/devel/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 Tue Dec 2 12:13:51 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 12:13:51 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.13
+Version=0.1.14
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlImportAccts.module
==============================================================================
--- branches/iVL/MdlImportAccts.module (original)
+++ branches/iVL/MdlImportAccts.module Tue Dec 2 12:13:51 2008
@@ -18,7 +18,7 @@
PUBLIC SUB LIST_EXISTING_ACCOUNTS()
DIM sDir AS String
- FOR EACH sdir IN Dir("/home", "*", gb.Directory)
+ FOR EACH sdir IN Dir(ClsGlobal.sTargetMnt &/ "home", "*", gb.Directory)
IF sdir <> "ftp" THEN
IF FrmImportAccts.cbAccntList.Find(sdir) = -1 THEN
FrmImportAccts.cbAccntList.Add(sdir)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 20:09:28
|
Author: M0...@gm...
Date: Tue Dec 2 12:07:10 2008
New Revision: 337
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/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/FMain.class
branches/iVL/installer.gambas
Log:
Fixed sizing problem for back button
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/moe/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:196
+#: FMain.class:199
msgid "Restart"
msgstr ""
-#: FMain.class:223
+#: FMain.class:226
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:224
+#: FMain.class:227
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:231
+#: FMain.class:234
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:244
+#: FMain.class:247
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid "Yes"
msgstr ""
-#: FMain.class:259
+#: FMain.class:262
msgid "No"
msgstr ""
-#: FMain.class:277
+#: FMain.class:280
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:281
+#: FMain.class:284
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:296
+#: FMain.class:299
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:296
+#: FMain.class:299
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:350
+#: FMain.class:353
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:350
+#: FMain.class:353
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:364
+#: FMain.class:367
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:458
+#: FMain.class:461
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:796
+#: FMain.class:799
msgid "Back"
msgstr ""
-#: FMain.class:807
+#: FMain.class:810
msgid "Exit Installation"
msgstr ""
-#: FMain.class:818
+#: FMain.class:821
msgid "Next"
msgstr ""
-#: FMain.class:832
+#: FMain.class:835
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/moe/devel/installer/FrmDiskPart.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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/moe/devel/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 Tue Dec 2 12:07:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/moe/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 12:07:10 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.12
+Version=0.1.13
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Dec 2 12:07:10 2008
@@ -152,7 +152,10 @@
'.pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
''' .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3)))
-''' .btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
+''' .btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
+ '.btback.moce(4,pnlwinhost.top + .pnlwinhost.Height +
+ .tlStatus.Move(.ClientWidth / 2 - (.tlStatus.Width /
2), .pnlwinhost.top + .pnlwinhost.Height + 8,
MdlObjSizer.get_object_width(.tlStatus.text))
+ .btback.Move(4, .tlStatus.top + .tlStatus.Height + 4,
MdlObjSizer.get_object_width(.btback.Text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width +
8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
' we want that one right in the middle
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 19:36:00
|
Author: M0E.lnx
Date: Tue Dec 2 11:32:28 2008
New Revision: 336
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/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/FMain.form
branches/iVL/FrmImportAccts.class
branches/iVL/FrmImportAccts.form
branches/iVL/FrmResetSettings.class
branches/iVL/FrmResetSettings.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlResetSettings.module
branches/iVL/installer.gambas
Log:
Begin testing accounts import module
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsGlobal.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsPartSel.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsWinDrives.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -90,19 +90,19 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:797
+#: FMain.class:796
msgid "Back"
msgstr ""
-#: FMain.class:809
+#: FMain.class:807
msgid "Exit Installation"
msgstr ""
-#: FMain.class:821
+#: FMain.class:818
msgid "Next"
msgstr ""
-#: FMain.class:835
+#: FMain.class:832
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartScheme.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartSel.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPkgSel.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSelISO.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSummary.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmWinDrives.class
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlCore.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlDiskPart.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlObjSizer.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPartSel.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPkgSel.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSetup.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSummarize.module
+# /home/vluser/devel/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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 11:32:28 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.11
+Version=0.1.12
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Tue Dec 2 11:32:28 2008
@@ -62,7 +62,6 @@
MoveScaled(3,41,53,3)
{ btback Button
MoveScaled(0,0,8,3)
- Expand = True
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
@@ -72,7 +71,6 @@
}
{ btQuit Button
MoveScaled(16,0,15,3)
- Expand = True
Text = ("Exit Installation")
Picture = Picture["icon:/16/cancel"]
}
@@ -82,7 +80,6 @@
}
{ btnext Button
MoveScaled(44,0,8,3)
- Expand = True
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 11:32:28 2008
@@ -15,6 +15,8 @@
' 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 sSettingsList AS String
+
PUBLIC SUB Form_Open()
WITH ME
@@ -54,12 +56,20 @@
PUBLIC SUB btcancel_Click()
- ME.Close()
+ FrmUserAdd.Reparent(FMain.pnlwinhost)
+ FrmUserAdd.Show()
+ ME.Hide()
+ 'ME.Close()
END
PUBLIC SUB btImportAccnt_Click()
+IF Len(Trim(ME.cbAccntList.Text)) = 0 THEN
+ Message(("Please select an account name from the dropdown list."))
+ RETURN
+END IF
+
IF ME.tbPass1.Text = "" OR ME.tbPass2.Text = "" THEN
Message.Error(("Password fields cannot be blank. Please enter a
password for") & Space(1) & ME.cbAccntList.Text)
RETURN
@@ -68,9 +78,13 @@
Message.Error(("Selected passwords dont match. Please enter the same
password twice"))
RETURN
ELSE
- ME.pbLogin.Delete
+ 'IF ME.pbLogin THEN ME.pbLogin.Delete
'pbLogin = NEW PictureBox(ME)
'me.pbLogin.Move(
+ ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
+ ME.cbAccntList.Sorted = TRUE
+ 'RETURN
+ ME.CREATE_IMPORTED_ACCOUNT
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
'ME.Close
'ME.pbLogin.Picture.Image.Clear
@@ -79,6 +93,106 @@
END
+PUBLIC SUB CREATE_IMPORTED_ACCOUNT()
+ DIM sGroups AS String
+ DIM cb AS CheckBox
+ DIM sSettings AS String[]
+ DIM i AS Integer
+ DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
+ DIM tl AS TextLabel
+ DIM iTlY AS Integer
+
+ ' Prepare group list
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ IF cb.Value = TRUE THEN
+ sGroups = sGroups & cb.Text & ","
+ END IF
+ NEXT
+ sGroups = Trim(sGroups)
+ sGroups = Left(sGroups, Len(sGroups) - 1)
+
+ 'Message(sGroups)
+ 'RETURN
+ ' Prepare home dir making the requested changes
+ IF Len(sSettingsList) > 0 THEN
+ sSettings = Split(sSettings, ",")
+ FOR i = 0 TO sSettings.Count - 1
+ EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
+ EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc" &/ "skel" &
Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
+ EXEC ["chown", Trim(ME.cbAccntList.Text) & ":users",
ClsGlobal.sTargetMnt &/ "home" &/ Trim(ME.cbAccntList.Text) &/
Trim(sSettings[i])] WAIT
+ NEXT
+
+
+ END IF
+
+ SHELL "chroot /mnt/target /usr/sbin/groupdel " &
Trim(ME.cbAccntList.Text) WAIT
+ SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1) &
FrmUserAdd.iUID & Space(1) & Trim(ME.cbAccntList.Text) WAIT
+ SHELL "chroot /mnt/target /usr/sbin/useradd -g " & ME.tbUsername.text
& " -p " & ME.tbPasswd1.text & " -u " & FrmUserAdd.iUID & " -G "
& "\'users," & sGroups & "\' -s /bin/bash " & 'ME.tbUsername.Text WAIT
+ Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
+ SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
+
+ ' Add the face icon
+ IF Len(ME.tbPicPath.Text) > 0 THEN
+ SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
Trim(ME.cbAccntList.Text) & ".face.icon" WAIT 'link for KDM
+ ' Tweak for the GDM face icon to work
+ COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ ".face"
+ SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
Trim(ME.cbAccntList.Text) &/ ".face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home" &/ Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home/" & Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ END IF
+
+ ' Increase the value of the iUID
+ INC FrmUserAdd.iUID
+ ME.LIST_IMPORTED_USER_ACCOUNT()
+
+
+END
+
+ PUBLIC SUB LIST_IMPORTED_USER_ACCOUNT()
+ 'needs to verify with /etc/passwd to check for user account
+ DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt
&/ "etc" &/ "passwd")))
+ DIM arrline AS String[]
+ DIM i, ii, iUID AS Integer
+ DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
+ DIM vuid AS Variant
+ DIM tl AS TextLabel
+ DIM tly AS Integer
+
+ FrmUserAdd.LstUsers.Clear
+ tly = 4
+ FOR i = 0 TO sFile.count - 1
+ sLine = sFile[i]
+ ' now split each line
+ arrline = Split(sLine, ":")
+ FOR ii = 0 TO arrline.count - 1
+ sSec = Trim(arrline[ii])
+ vuid = arrline[2]
+ iUID = CInt(vuid)
+ sUsrLogin = arrline[0]
+ sUsrRlName = arrline[4]
+ sUsrHome = arrline[5]
+ NEXT
+ IF iUID >= 500 THEN
+ tl = NEW TextLabel(FrmUserAdd.LstUsers) AS "UserList"
+ WITH tl
+ .Height = 21
+ .Text = sUsrLogin
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
+ "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
+ .Move(0, tly)
+ END WITH
+ tly = tly + tl.Height + 2
+ END IF
+ NEXT
+
+
+
+
+END
+
+
+
PUBLIC SUB Form_Resize()
WITH ME
@@ -94,7 +208,20 @@
.btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8, .tlPicPath.top
+ .tlPicPath.Height + 8, MdlObjSizer.get_object_width(.btBrowsePic.Text) +
36)
.tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)
- (.tbPicPath.Left * 2) - 8)
.pbLogin.Move(.tbPass2.Left + .tbPass2.Width + 8, .tlPasswd2.top + 4,
48, 48)
+ .scrGrpHost.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientWidth
- (.scrGrpHost.Left * 2), .ClientHeight - (.scrGrpHost.Top +
(.btBrowsePic.Height * 4)))
+ .btResetSettings.Move(4, .scrGrpHost.top + .scrGrpHost.Height + 8,
MdlObjSizer.get_object_width(.btResetSettings.Text) + 36)
+ .btImportAccnt.Move(4, .btResetSettings.top + .btResetSettings.Height +
4, MdlObjSizer.get_object_width(.btImportAccnt.Text) + 36)
+ .btcancel.Move(.btImportAccnt.Left + .btImportAccnt.Width +
4, .btImportAccnt.Top, MdlObjSizer.get_object_width(.btcancel.Text) + 36)
+
+ '.btResetSettings.Move(4,.scrGrpHost.top + .scrGrpHost.Height
+ '.frmUsrGrps.Move(4, .tbPicPath.top + .tbPicPath.Height +
4, .ClientWidth - (.frmUsrGrps.Left * 2))
'.btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8,.tbPass2.top
+ .tbPass1
END WITH
+
+END
+
+PUBLIC SUB cbAccntList_Click()
+
+' ME.pbLogin.Picture.Clear
END
Modified: branches/iVL/FrmImportAccts.form
==============================================================================
--- branches/iVL/FrmImportAccts.form (original)
+++ branches/iVL/FrmImportAccts.form Tue Dec 2 11:32:28 2008
@@ -47,29 +47,33 @@
MoveScaled(28,12,25,3)
Text = ("Verify Password")
}
- { ScrollView1 ScrollView
+ { scrGrpHost ScrollView
MoveScaled(1,26,66,18)
- Expand = True
+ Arrangement = Arrange.Horizontal
Border = False
{ frmUsrGrps Frame
MoveScaled(0,0,65,15)
+ Expand = True
Text = ("User Rights Management")
}
}
{ btResetSettings Button
MoveScaled(1,45,23,3)
- Text = ("Reset settings")
+ Text = ("Select Settings to reset")
Picture = Picture["icon:/small/undo"]
+ Border = False
}
{ btImportAccnt Button
MoveScaled(1,49,23,3)
Text = ("Import Account")
Picture = Picture["icon:/small/redo"]
+ Border = False
}
{ btcancel Button
MoveScaled(26,49,14,3)
Text = ("Cancel")
Picture = Picture["icon:/16/cancel"]
+ Border = False
}
{ tlBanner TextLabel
MoveScaled(0,0,43,3)
Modified: branches/iVL/FrmResetSettings.class
==============================================================================
--- branches/iVL/FrmResetSettings.class (original)
+++ branches/iVL/FrmResetSettings.class Tue Dec 2 11:32:28 2008
@@ -29,7 +29,7 @@
.Columns.count = 3
.Columns[0].Width = 32
.Columns[1].Width = 400
- .Columns[2].Width = 1
+ '.Columns[2].Width = 1
.Rows.Count = 1
END WITH
@@ -56,9 +56,27 @@
PUBLIC SUB btDone_Click()
+ME.GENERATE_LIST
ME.Close
END
+
+PUBLIC SUB GENERATE_LIST()
+
+ DIM I AS Integer
+ DIM sList AS String
+ FOR I = 0 TO ME.gvSettings.Rows.count - 1
+ IF gvSettings[i, 0].Picture = FrmPkgSel.pYes THEN sList = sList &
gvSettings[i, 2].Text & ","
+ NEXT
+' INC i
+sList = Left(Trim(sList), Len(Trim(sList)) - 1)
+'Message(sList)
+FrmImportAccts.sSettingsList = sList
+'Message(FrmImportAccts.sSettingsList)
+
+
+END
+
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmResetSettings.form
==============================================================================
--- branches/iVL/FrmResetSettings.form (original)
+++ branches/iVL/FrmResetSettings.form Tue Dec 2 11:32:28 2008
@@ -3,6 +3,8 @@
{ Form Form
MoveScaled(0,0,69,35)
Text = ("")
+ Icon = Picture["icon:/small/undo"]
+ SkipTaskbar = True
{ tlBanner TextLabel
MoveScaled(1,1,40,3)
Text = ("Select which settings to reset")
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Dec 2 11:32:28 2008
@@ -45,10 +45,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- ' .FrmCurr = ME
- ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
- ' .tvPlan["Conf3"].Selected = TRUE
+ .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>"
@@ -141,7 +141,6 @@
'Message(sGroups)
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
- 'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
PRINT "Creating new user group"
SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1)
& iUID & Space(1) & ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
@@ -162,7 +161,7 @@
'this next line is for kdm
SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
'the next lines are for gdm
- PRINT tbPicPath.Text
+ 'PRINT tbPicPath.Text
'SHELL "cp " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
tbUsername.text &/ ".face"
SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
@@ -430,5 +429,12 @@
' .tvPlan["Conf3"].picture = MdlCore.sNowPic
' .tvPlan["Conf3"].Selected = TRUE
' END WITH
+
+END
+
+PUBLIC SUB btImportAcct_Click()
+
+ FrmImportAccts.Reparent(FMain.pnlwinhost)
+ ME.Hide()
END
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Dec 2 11:32:28 2008
@@ -304,7 +304,7 @@
IF Exist("/lib" &/ "modules" &/ Trim(sarch)) = FALSE THEN
' running hosted install detected
TRY MKDIR "/lib" &/ "modules" &/ Trim(sarch)
- SHELL "mount -o bind /mnt/target/lib/modules" &/ Trim(sarch) & "
/lib/modules" &/ Trim(sarch)" && depmod -aq"
+ SHELL "mount -o bind /mnt/target/lib/modules" &/ Trim(sarch) & "
/lib/modules" &/ Trim(sarch) & " && depmod -aq"
END IF
Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module (original)
+++ branches/iVL/MdlResetSettings.module Tue Dec 2 11:32:28 2008
@@ -17,12 +17,18 @@
PUBLIC pYes AS Picture
PUBLIC SUB LIST_RESETABLE_SETTINGS()
- DIM sFile, sDesc AS String
+ DIM sFile, sDesc, sSkellPath, stargetPath AS String
DIM i AS Integer
+
+ 'ClsGlobal.sTargetMnt = "/"
+ 'sSkellPath = ClsGlobal.sTargetMnt &/ "etc" &/ "skel"
+ sSkellPath = "/etc/skel"
+ stargetPath = User.Home
+ 'stargetPath = ClsGlobal.sTargetMnt &/ "home" &/
Trim(FrmImportAccts.cbAccntList.Text)
i = 0
pYes = FrmPkgSel.pYes
- FOR EACH sfile IN Dir(User.home, "*")
+ FOR EACH sfile IN Dir(sSkellPath, "*")
SELECT CASE sFile
CASE ".kde"
@@ -54,11 +60,13 @@
END SELECT
IF sDesc THEN
+ IF Exist(stargetPath &/ sFile) THEN
'INC i
INC FrmResetSettings.gvSettings.Rows.Count
FrmResetSettings.gvSettings[i, 1].Text = sDesc
FrmResetSettings.gvSettings[i, 2].Text = sFile
INC i
+ END IF
END IF
NEXT
FrmResetSettings.gvSettings.Columns[1].Width =
FrmResetSettings.gvSettings.Width -
(FrmResetSettings.gvSettings.Columns[0].Width * 1.75)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-02 16:02:35
|
Author: M0E.lnx
Date: Tue Dec 2 08:01:34 2008
New Revision: 335
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/MdlConfLilo.module
Log:
Fixed binding options for lilo setup
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Dec 2 08:01:34 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Dec 2 08:01:34 2008
@@ -298,15 +298,22 @@
DIM sOut AS String
DIM cb AS CheckBox
DIM cbox AS ComboBox
-' SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
-SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart" WAIT
+ DIM sArch AS String
+
+EXEC ["uname", "-r"] TO sArch
+IF Exist("/lib" &/ "modules" &/ Trim(sarch)) = FALSE THEN
+' running hosted install detected
+ TRY MKDIR "/lib" &/ "modules" &/ Trim(sarch)
+ SHELL "mount -o bind /mnt/target/lib/modules" &/ Trim(sarch) & "
/lib/modules" &/ Trim(sarch)" && depmod -aq"
+END IF
+
+
+'SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart" WAIT
EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetMnt &/ "sys"] WAIT
-' SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
EXEC ["mount", "-o", "bind", "/proc", ClsGlobal.sTargetMnt &/ "proc"] WAIT
-' SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
EXEC ["mount", "-o", "bind", "/tmp", ClsGlobal.sTargetMnt &/ "tmp"] WAIT
-' SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetMnt &/ "dev"] WAIT
+
' Mount home directory for user accounts
|
|
From: <cod...@go...> - 2008-12-02 15:28:58
|
Author: rbistolfi
Date: Tue Dec 2 07:27:57 2008
New Revision: 334
Added:
branches/iVL/.lang/ru.mo (contents, props changed)
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ru.po
branches/iVL/.project
branches/iVL/FrmLangSel.class
branches/iVL/MdlLangSel.module
Log:
added russian translation selection.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Dec 2 07:27:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/rbistolfi/vinstall-ng/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Added: branches/iVL/.lang/ru.mo
==============================================================================
Binary file. No diff available.
Modified: branches/iVL/.lang/ru.po
==============================================================================
--- branches/iVL/.lang/ru.po (original)
+++ branches/iVL/.lang/ru.po Tue Dec 2 07:27:57 2008
@@ -10,1613 +10,1411 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Инсталлятор VectorLinux"
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
+msgstr "1-битный чёрно-белый"
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "Графический инсталлятор Vector Linux"
+#: FrmXconf.class:348
+msgid "1024x768"
+msgstr "1024x768"
-#: FMain.class:196 FrmDone.class:28
-msgid "Restart"
-msgstr "Перезагрузка"
+#: FrmXconf.class:348
+msgid "1280x1024"
+msgstr "1280x1024"
-#: FMain.class:223
-msgid "Please select a default operating system to boot before proceeding"
-msgstr ""
-"Выберите операционную систему для загрузки по умолчанию (что будет "
-"грузиться, если включить компьютер и отойти чай там заварить, или
спросонья)"
+#: FrmXconf.class:348
+msgid "1280x800"
+msgstr "1280x800"
-#: FMain.class:224
-msgid "Select an entry from this list"
-msgstr "Выберите из списка"
+#: FrmXconf.class:348
+msgid "1440x900"
+msgstr "1440x900"
-#: FMain.class:231
-msgid "Skipping boot loaded setup"
-msgstr "Пропускаем установку загрузчика"
+#: FrmXconf.class:335
+msgid "16 bit Pseudo Color"
+msgstr "16-битный режим"
-#: FMain.class:244
-msgid "Passwords do not match. Please enter the same password twice"
-msgstr "Пароли не совпадают. Введите ещё раз"
+#: FrmXconf.class:348
+msgid "1600x1200"
+msgstr "1600x1200"
-#: FMain.class:259
-msgid ""
-"You have not created any user accounts for this system yet. There is not "
-"enough information"
-msgstr "Вы ещё не создали ни одного пользователя. Недостаточно информации"
+#: FrmNetConf.class:238
+msgid "192.168.1.254"
+msgstr "192.168.1.254"
-#: FMain.class:259
-msgid ""
-"to create an account here. It is recommended that you create at least
one."
-msgstr ""
-"чтобы создать пользователя здесь. Мы усиленно рекомендуем создать хотя
бы "
-"одного."
+#: FrmXconf.class:348
+msgid "1920x1280"
+msgstr "1920x1280"
-#: FMain.class:259
-msgid "Would you like to continue anyway?"
-msgstr "Вот так. Продолжить хотите?"
+#: FrmXconf.class:335
+msgid "24 bit True Color"
+msgstr "24(32)-битный режим(лучший)"
-#: FMain.class:259 FrmSummary.class:59
-msgid "Yes"
-msgstr "Да"
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
+msgstr "16-тицветный режим"
-#: FMain.class:259 FrmSummary.class:61
-msgid "No"
-msgstr "Нет"
+#: FrmXconf.class:348
+msgid "640x480"
+msgstr "640x480"
-#: FMain.class:277
-msgid "Please specify a hostname for this computer"
-msgstr "А какое имя будет у компьютера"
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
+msgstr "256-тицветный режим"
-#: FMain.class:281
-msgid "Please specify the domain this computer belongs to"
-msgstr ""
-"Выберите домен, к которому принадлежит компьютер (здесь под доменом "
-"понимается то, что идёт после имени машины в её полном имени - в
vectorlinux."
-"some.net доменом будет именно some.net). Вводить без точки в начале."
+#: FrmXconf.class:348
+msgid "800x600"
+msgstr "800x600"
-#: FMain.class:296
-msgid ""
-"VectorLinux will now try to detect and configure your graphics hardware."
-msgstr "VectorLinux сейчас попытается настроить видеокарту."
+#: FrmPartSel.class:150
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "О работе с разделами в Linux"
-#: FMain.class:296
-msgid ""
-"Your screen may flicker or go blank for a few seconds during this
process."
-msgstr ""
-"Экран может моргать или потемнеть на несколько секунд в процессе. Это "
-"нормально."
+#: FrmRootPass.class:29
+msgid "About the root account"
+msgstr "О пользователе root (суперпользователь)"
-#: FMain.class:348
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr ""
-"А сейчас установщик запускает утилиту для разбиения разделов, подождите
чуть-"
-"чуть"
+#: MdlNetConf.module:277
+msgid "Access Point"
+msgstr "Точка доступа"
-#: FMain.class:350
-msgid "Please wait while setup analyses your current partition setup."
-msgstr ""
-"Пожалкйста, подождите капельку, пока инсталлятор смотрит на текущее "
-"разбиение разделов."
+#: FrmImportAccts.class:132
+msgid "Account"
+msgstr "Пользователь"
-#: FMain.class:350
-msgid "This may take a while ..."
-msgstr ""
-"Времени займёт порядком...\n"
-"Попробуйте пока отжаться раз 10-15.\n"
-"Без шуток, спину надо беречь, да и здоровье вообще."
+#: MdlSetup.module:317
+msgid "Activating swap space"
+msgstr "Включаем раздел подкачки"
-#: FMain.class:364
-msgid ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
-msgstr "Выберите \"/\" (рутовый, корневой, системный) раздел."
+#: MdlLiloOsList.module:396
+msgid "Add option to boot this Operating system into Text mode."
+msgstr "Добавить возможность загрузки в текстовом режиме"
-#: FMain.class:458
-msgid "Skipping lilo setup"
-msgstr "Пропускаем установку LILO"
+#: MdlLilo.module:648
+msgid "Add option to boot this operating system into text mode"
+msgstr "Добавить возможность загрузки в текстовом режиме"
-#: FMain.class:797
-msgid "Back"
-msgstr "Назад"
+#: FrmDone.class:39
+msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
+msgstr "После перезагрузки можно использовать vasm или vasmCC, чтобы до
конца настроить вашу систему."
-#: FMain.class:809
-msgid "Exit Installation"
-msgstr "Выйти из установки"
+#: MdlUsrAdd.module:74
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
+msgstr "Позволить пользователю подключать (и отключать) флэшки"
-#: FMain.class:821
-msgid "Next"
-msgstr "Далее"
+#: MdlUsrAdd.module:77
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
+msgstr "Позволить пользователю подключать (и отключать) сменные жёсткие
диски"
-#: FMain.class:835
-msgid "Button1"
-msgstr "Кнопка"
+#: MdlNetConf.module:321
+msgid "Automatic settings via DHCP."
+msgstr "Автоматическая настройка через DHCP."
-#: FrmAlsaConf.class:36
-msgid ""
-"This portion of the setup process allows you to sutup your soundcard for "
-"your new operating system."
-msgstr "На этом этапе можно настроить звуковую карту."
+#: MdlNetConf.module:193
+msgid "Automatically activate this interface at start-up"
+msgstr "Включать это соединение при загрузке"
-#: FrmAlsaConf.class:36
-msgid "Please use the setup program below to setup the sound system."
-msgstr "Пожалуйста, используйте программу внизу для настройки звука."
+#: MdlSetup.module:301
+msgid "BROUGHT TO YOU BY"
+msgstr "С наилучшими пожеланиями"
-#: FrmDiskPart.class:58
-msgid ""
-"When finished making changes, exit the partitioning application to "
-"continue ..."
-msgstr ""
-"Когда закончите с разделами, продолжить установку можно будет, выйдя из "
-"программы разбиения диска."
+#: FrmSummary.class:183
+msgid "BULK PACKAGES"
+msgstr "Оптовые пакеты"
-#: FrmDiskPart.class:117
-msgid "Disk Partitioning:"
-msgstr "Разбиение диска:"
+#: MdlSummarize.module:58
+msgid "BULK PACKAGES:"
+msgstr "Оптовые пакеты"
-#: FrmDone.class:32
-msgid "Exit"
-msgstr "Выйти"
+#: FMain.class:797
+msgid "Back"
+msgstr "Назад"
-#: FrmDone.class:39
-msgid ""
-"has been installed to your system. Your new system has been configured
with "
-"the default factory settings."
-msgstr ""
-"установлено на вашу систему. Ваш дистрибутив сконфигурирован с
настройками "
-"по умолчанию."
+#: FrmLilo.class:284 FrmLiloSetup.class:242
+msgid "Boot Default"
+msgstr "Загрузить по умолчанию"
-#: FrmDone.class:39
-msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
-msgstr ""
-"После перезагрузки можно использовать vasm или vasmCC, чтобы до конца "
-"настроить вашу систему."
+#: FrmLiloSetup.class:176
+msgid "Boot Manager Configuration"
+msgstr "Конфигурация загрузчика"
-#: FrmDone.class:39
-msgid ""
-"Your computer needs to be restarted so that you can use your new
operating "
-"system. Click"
-msgstr "Чтобы перегрузиться в ваш новый и блестящий VectorLinux, нажмите"
+#: MdlCore.module:497
+msgid "Boot Menu Options"
+msgstr "Опции загрузки"
-#: FrmDone.class:39
-msgid "to restart your computer now or click"
-msgstr "чтобы перезагрузить ваш компьютер сейчас, нажмите"
+#: MdlConfLilo.module:100
+msgid "Boot loader has been setup successfully"
+msgstr "Загрузчик прописан успешно"
-#: FrmDone.class:39
-msgid "to restart your computer at a later time"
-msgstr "чтобы перезагрузить ваш компьютер позже"
+#: MdlConfLilo.module:131 MdlLilo.module:98
+msgid "Bootsector of "
+msgstr "Загрузочный сектор "
-#: FrmDone.class:39
-msgid ""
-"If you installed from CD-ROM/R/RW media, please remove de disk before "
-"restarting."
-msgstr ""
-"Если вы устанавливали с диска - вытащите его из привода. Установка
окончена, "
-"сейчас мы будем перегружаться, и зачем нам второй раз грузиться с диска?"
+#: FrmLiloSetup.class:66 MdlLilo.module:56
+msgid "Bootsplash Extra High"
+msgstr "Очень высокого разрешения картинка при загрузке"
-#: FrmDone.class:75
-msgid "Installation is finished"
-msgstr "Установка, урррра!, окончена"
+#: FrmLilo.class:262
+msgid "Bootsplash Extra high"
+msgstr "Очень высокого разрешения картинка при загрузке"
-#: FrmHalSwitch.class:20
-msgid "Would you like to use Vl-Hot or HAL to manage your removable
devices?"
-msgstr "Что хотите использовать для съёмных устройств, VL-Hot или HAL?"
+#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:54
+msgid "Bootsplash High"
+msgstr "Просто высокого разрешения картинка при загрузке"
-#: FrmHalSwitch.class:25
-msgid "HAL"
-msgstr "HAL"
+#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:52
+msgid "Bootsplash Med"
+msgstr "Среднего разрешения картинка при загрузке"
-#: FrmHalSwitch.class:30
-msgid "VL-Hot"
-msgstr "VL-Hot"
+#: MdlCore.module:400
+msgid "Build Date: "
+msgstr "Дата сборки:"
-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr "VectorLinux подготавливается к установке..."
+#: FMain.class:835
+msgid "Button1"
+msgstr "Кнопка"
-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Состояние"
+#: MdlSetup.module:199
+msgid "Calculating package count ... Please wait"
+msgstr "Считаем пакеты... Подождите, пожалуйста"
-#: FrmHostPrep.class:139 FrmLilo.class:236 FrmPartScheme.class:128
-#: FrmPkgSel.class:196 FrmPkgsel2.class:86 FrmSelISO.class:265
-#: FrmSummaryOld.class:87
-msgid "TextLabel1"
-msgstr "TextLabel1"
+#: FrmImportAccts.class:209
+msgid "Cancel"
+msgstr "Отмена"
-#: FrmImportAccts.class:31 FrmUserAdd.class:344
-msgid "Select picture for user Login"
-msgstr "Выберите картинку для пользователя"
+#: MdlCore.module:478
+msgid "Cannot find SETUP.CONF"
+msgstr "Не могу найти SETUP.CONF"
-#: FrmImportAccts.class:50
-msgid "Reset settings for"
-msgstr "Сбросить настройки для"
+#: FrmPartSel.class:206
+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 "Нажмите здесь, если вы хотите, чтобы ваши Windows-разделы (если у
вас установлена Windows или просто есть разделы с FAT, FAT32 или NTFS) были
примонтированы при загрузке."
-#: FrmImportAccts.class:64
-msgid "Password fields cannot be blank. Please enter a password for"
-msgstr ""
-"Пароль пустым быть не может. Нет, после установки его вполне можно
поставить "
-"пустым, просто мы не даём. Если вам так уж этого хочется, поставьте пока "
-"единичку вместо пароля, но помните, мы против! Итак, пароль для"
+#: FrmUserAdd.class:471
+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 "Выберите уникальное имя каждому пользователю. Пользователей можно
делать сколько угодно. Для того, чтобы случайно не поставить неправильный
пароль, введите его дважды. Когда закончите, нажмите \"Далее\", чтобы
продолжить настройку."
-#: FrmImportAccts.class:68
-msgid "Selected passwords dont match. Please enter the same password twice"
-msgstr "Пароли не совпадают. Введите ещё раз, пожалуйста"
+#: FrmZoneSet.class:182
+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 "Выберите,\nкак настраивать ваши часы.\nЕсли часы на материнской
плате настроены\nна UTC(универсальное координированное время),\nто
выбирайте UTC. Если нет - то выбирайте местное время."
-#: FrmImportAccts.class:132
-msgid "Account"
-msgstr "Пользователь"
+#: FrmZoneSet.class:170
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Выберите нужный вам часовой пояс."
-#: FrmImportAccts.class:144
-msgid "New Password"
-msgstr "Новый пароль"
+#: FrmPkgSel.class:25
+msgid "Choose your installation mode"
+msgstr "Выберите способ инсталляции"
-#: FrmImportAccts.class:161
-msgid "Select login Image"
-msgstr "Выберите картинку для логина"
+#: FrmPkgSel.class:81
+msgid "Choose your optional components to install."
+msgstr "Эти пакеты необязательны для работы системы, но могут быть
обязательными для работы вас. Выбирайте."
-#: FrmImportAccts.class:171 FrmUserAdd.class:509
-msgid "Select"
-msgstr "Выбрать"
+#: FrmUserAdd.class:543
+msgid "Clear Form"
+msgstr "Очистить форму"
-#: FrmImportAccts.class:181
-msgid "Verify Password"
-msgstr "Подтвердите пароль"
+#: FrmSelISO.class:79
+msgid "Click"
+msgstr "Клик"
-#: FrmImportAccts.class:191 FrmUserAdd.class:520
-msgid "User Rights Management"
-msgstr "Управление правами пользователя"
+#: FrmXconf.class:322
+msgid "Color Depth"
+msgstr "Битность цвета"
-#: FrmImportAccts.class:197
-msgid "Reset settings"
-msgstr "Сбросить настройки"
+#: FrmZoneSet.class:175
+msgid "ComboBox1"
+msgstr "Комбобокс"
-#: FrmImportAccts.class:203
-msgid "Import Account"
-msgstr "Добавить существующую учётную запись"
+#: FrmNetConf.class:199
+msgid "Computer Name"
+msgstr "Имя компьютера"
-#: FrmImportAccts.class:209
-msgid "Cancel"
-msgstr "Отмена"
+#: FrmLilo.class:219
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Настроить и прописать lilo (Linux Loader, загрузчик линукса)"
-#: FrmImportAccts.class:216 FrmUserAdd.class:596
-msgid "Import Existing User Accounts"
-msgstr "Добавить существующую учётную запись"
+#: FrmUserAdd.class:537
+msgid "Create User"
+msgstr "Создать пользователя"
+
+#: FrmUserAdd.class:54
+msgid "Create User Accounts"
+msgstr "Создать учётную запись"
+
+#: FrmUserAdd.class:92
+msgid "Creating user account ... Please wait"
+msgstr "Создаём пользователя... Подождите чуть-чуть"
+
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Состояние"
#: FrmInstallSys.class:63
msgid "Current Step"
msgstr "Текущий шаг"
-#: FrmInstallSys.class:204
-msgid "Vectorlinux is currently being installed to your system... Please
wait"
-msgstr "VectorLinux устанавливается... Подождите чуточку"
-
-#: FrmInstallSys.class:219
-msgid "Installing ..."
-msgstr "Ставим..."
-
#: FrmInstallSys.class:230
msgid "Current Step "
msgstr "Текущий шаг"
-#: FrmInstallSys.class:252
-msgid "Total progress"
-msgstr "Степень завершения"
+#: FrmSummary.class:17 MdlSummarize.module:56
+msgid "Custom"
+msgstr "Особый"
-#: FrmLangSel.class:123
-msgid "Select your language"
-msgstr "Выберите язык"
+#: FrmPkgSel.class:211
+msgid "Custom Install"
+msgstr "Особая установка"
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "ЛИЦЕНЗИЯ"
+#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
+msgid "Description"
+msgstr "Описание"
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "TextArea1"
+#: FrmPartSel.class:207
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Обнаружить Windows-разделы и добавить их монтирование при загрузке"
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "Да, с лицензией я соглашаюсь"
+#: MdlCore.module:489
+msgid "Disk Partitioning"
+msgstr "Разбиение диска"
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "Нет, я не соглашаюсь"
+#: FrmPartScheme.class:113
+msgid "Disk Partitioning Options"
+msgstr "Параметры разбиения диска"
-#: FrmLilo.class:37
-msgid ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
-msgstr "Вот какие операционки мы нашли. Выбирайте"
+#: FrmDiskPart.class:117
+msgid "Disk Partitioning:"
+msgstr "Разбиение диска:"
-#: FrmLilo.class:37
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
-msgstr ""
-"каждую из них, кликая на отдельную ячейку. Чтобы продолжить с настройками
по "
-"умолчанию, просто нажмите"
+#: FrmSummary.class:58
+msgid "Do not Format"
+msgstr "Не форматировать"
-#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:50
-msgid "Standard"
-msgstr "Стандартный"
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:141
+msgid "Do not format"
+msgstr "Не форматировать"
-#: FrmLilo.class:219
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Настроить и прописать lilo (Linux Loader, загрузчик линукса)"
+#: FrmLiloSetup.class:192
+msgid "Do not install LILO"
+msgstr "Не ставить LILO"
+
+#: FrmSummary.class:121 MdlInstallSys.module:190 MdlWinDrives.module:124
+msgid "Do not mount"
+msgstr "Не монтировать"
+
+#: FrmNetConf.class:211
+msgid "Domain"
+msgstr "Домен"
#: FrmLilo.class:224
msgid "Don't Install Lilo"
msgstr "Не ставить LILO"
-#: FrmLilo.class:230 FrmLiloSetup.class:292 FrmNetConf.class:279
-msgid "Tab 0"
-msgstr "Tab 0"
+#: FrmResetSettings.class:101
+msgid "Done"
+msgstr "Сделано"
-#: FrmLilo.class:248 FrmLiloSetup.class:224
-msgid "Target"
-msgstr "Цель"
+#: MdlNetConf.module:321
+msgid "Dynamic Host Control Protocol"
+msgstr "DHCP"
-#: FrmLilo.class:254 FrmLiloSetup.class:203
-msgid "Video Resolution"
-msgstr "Разрешение"
+#: MdlUsrAdd.module:71
+msgid "Elite user"
+msgstr "Опытный пользователь"
-#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:52
-msgid "Bootsplash Med"
-msgstr "Среднего разрешения картинка при загрузке"
+#: MdlNetConf.module:258
+msgid "Encryption key"
+msgstr "Ключ шифрования"
-#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:54
-msgid "Bootsplash High"
-msgstr "Просто высокого разрешения картинка при загрузке"
+#: MdlNetConf.module:232
+msgid "Encryption type"
+msgstr "Тип шифрования"
-#: FrmLilo.class:262
-msgid "Bootsplash Extra high"
-msgstr "Очень высокого разрешения картинка при загрузке"
+#: FrmRootPass.class:134 FrmUserAdd.class:557
+msgid "Enter Password"
+msgstr "Ввести пароль"
-#: FrmLilo.class:267 FrmLiloSetup.class:263
-msgid "Prompt Timeout"
-msgstr "Время выбора"
+#: FrmRootPass.class:38
+msgid "Enter a Password for root."
+msgstr "Ввести пароль для root (суперпользователя):"
-#: FrmLilo.class:278 FrmLiloSetup.class:274
-msgid "Seconds"
-msgstr "Секунд"
+#: FrmUserAdd.class:129
+msgid "Enter a password for"
+msgstr "Ввести пароль для"
-#: FrmLilo.class:284 FrmLiloSetup.class:242
-msgid "Boot Default"
-msgstr "Загрузить по умолчанию"
+#: FrmUserAdd.class:100
+msgid "Enter the login name that this user will user to login to this
system."
+msgstr "Ввести логин пользователя (имя для входа в систему)."
-#: FrmLiloSetup.class:66 MdlLilo.module:56
-msgid "Bootsplash Extra High"
-msgstr "Очень высокого разрешения картинка при загрузке"
+#: FrmUserAdd.class:187
+msgid "Enter the same password twice"
+msgstr "Введите пароль ещё раз"
-#: FrmLiloSetup.class:176
-msgid "Boot Manager Configuration"
-msgstr "Конфигурация загрузчика"
+#: MdlInstallSys.module:518
+msgid "Error occurred while installing"
+msgstr "При установке произошла фигня. Разбираемся"
-#: FrmLiloSetup.class:192
-msgid "Do not install LILO"
-msgstr "Не ставить LILO"
+#: MdlInstallCustom.module:354
+msgid "Error while installing "
+msgstr "Ошибка при установке"
-#: FrmNetConf.class:184 MdlCore.module:501
-msgid "Network Configuration"
-msgstr "Конфигурация сети"
+#: MdlInstallCustom.module:76
+msgid "Error while installing required system software. "
+msgstr "Что-то случилось при установке системного софта."
-#: FrmNetConf.class:199
-msgid "Computer Name"
-msgstr "Имя компьютера"
+#: MdlInstallCustom.module:85
+msgid "Error while installing system configuration. "
+msgstr "Что-то стряслось при применении настроек."
-#: FrmNetConf.class:211
-msgid "Domain"
-msgstr "Домен"
+#: FrmDone.class:32
+msgid "Exit"
+msgstr "Выйти"
-#: FrmNetConf.class:227
-msgid "Manual DNS Server Specification"
-msgstr "Ручная настройка DNS"
+#: FMain.class:809
+msgid "Exit Installation"
+msgstr "Выйти из установки"
-#: FrmNetConf.class:238
-msgid "192.168.1.254"
-msgstr "192.168.1.254"
+#: MdlPartSel.module:92
+msgid "FILESYSTEM"
+msgstr "Файловая система"
-#: FrmNetConf.class:243
-msgid "Primary DNS Server"
-msgstr "Первичный DNS-сервер"
+#: MdlInstallSys.module:813
+msgid "Failed to install"
+msgstr "Не удалось установить"
-#: FrmNetConf.class:256
-msgid "Secondary DNS Server"
-msgstr "Вторичный DNS-сервер"
+#: MdlInstallCustom.module:225
+msgid "Failed to install. Installation will stop"
+msgstr "Установить почему-то не получилось. Придётся выйти"
-#: 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 ""
-"Выберите, если у вас уже есть Linux (который вы хотите перезаписать) или "
-"если вы уже разметили диск."
-
-#: FrmPartScheme.class:61
-msgid "This option will overwrite any existing data in the selected
partitions"
-msgstr ""
-"При выборе этого варианта все данные в выбранных разделах (если они там "
-"есть) будут УДАЛЕНЫ БЕЗВОЗВРАТНО (практически)."
-
-#: FrmPartScheme.class:61
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-msgstr "Если вы уже подготовили разделы - то вам сюда"
-
-#: FrmPartScheme.class:71
-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:71
-msgid ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
-msgstr ""
-"Если вы хотите сохранить другие установки, это самый безопасный вариант."
-
-#: FrmPartScheme.class:113
-msgid "Disk Partitioning Options"
-msgstr "Параметры разбиения диска"
-
-#: FrmPartScheme.class:118
-msgid "Use existing disk partitions"
-msgstr "Использовать существующие разделы"
+#: FrmXconf.class:342
+msgid "Fbdev"
+msgstr "Фреймбуфер"
-#: FrmPartScheme.class:123
-msgid "Modify my disk partitions to make room for new installation"
-msgstr ""
-"Изменить существующие разделы, чтобы освободить место для нашей
инсталляции. "
-"Внимание! Изменять разделы, везде и всегда, чревато потерей данных.
Помните!"
+#: FrmSummary.class:43
+msgid "Filesystem"
+msgstr "Файловая система"
-#: FrmPartSel.class:150
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "О работе с разделами в Linux"
+#: MdlCore.module:502
+msgid "Final Hardware Configuration"
+msgstr "Настройка железа (последняя)"
-#: FrmPartSel.class:150
-msgid ""
-"Linux is a modular operating system. This means that is has the ability
to "
-"store system and"
-msgstr ""
-"Linux - модульная система. Таким образом, в ней есть возможность
сохранять "
-"систему и"
+#: MdlCore.module:488
+msgid "Find installation media"
+msgstr "Найти, откуда будем ставить"
-#: FrmPartSel.class:150
-msgid ""
-"user data separately for added data security. You may install the system
to "
-"a single partition"
-msgstr ""
-"пользовательские данные отдельно для дополнительной безопасности данных.
И "
-"вообще, дистрибутивы (и Linux) преходящи, а фотографии любимой кошки -
нет. "
-"Можно поставить систему на один раздел (тогда отделить мух от котлет при "
-"необходимости будет сложнее)"
+#: MdlInstallSys.module:639
+msgid "Finished intalling Bulks"
+msgstr "Оптовые пакеты поставлены"
-#: FrmPartSel.class:150
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
-msgstr ""
-"просто выбрав \"/\" на этом экране. Всё остальное необязательно, но
удобно"
+#: MdlConfLilo.module:136 MdlLilo.module:100
+msgid "Floppy"
+msgstr "Дисковод"
-#: FrmPartSel.class:150
-msgid "suggested setup for a typical Linux installation"
-msgstr "предполагаемые нами параметры для обычной установки"
+#: FrmRootPass.class:19
+msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess"
+msgstr "Безопасность - всегда враг удобства. И всё же, придумывая лёгкий
для вас пароль, постарайтесь сделать его трудным для других. Пример одного
из методов - Ghbdtn,Rjvgm.nth! или ZK.,k.Cdj.:tyeYfnfie. А можно и строчку
из любимой песни - BeQuickOrBeDead. Меньше десяти, а, тем более, восьми
символов лучше не стоит - можно быстро подобрать."
-#: FrmPartSel.class:150
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
-msgstr ""
-"Используется для хранения системных данных. Этой установке, в частности, "
-"надо минимум"
+#: FrmSummary.class:46
+msgid "Format ?"
+msgstr "Форматировать?"
-#: FrmPartSel.class:150
-msgid "for this"
-msgstr "для этого"
+#: FrmSummary.class:21 MdlSummarize.module:69
+msgid "Full"
+msgstr "Полный"
-#: FrmPartSel.class:150
-msgid ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
-msgstr ""
-", а лучше поставить побольше, ведь добавочный софт будет тоже ставиться "
-"сюда. Но, с другой стороны, больше 7 гигабайт обычно не так уж надо."
+#: FrmPkgSel.class:206
+msgid "Full Install"
+msgstr "Полная установка"
-#: FrmPartSel.class:150
-msgid "in case you wish to."
-msgstr ", если вы хотите."
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "Графический инсталлятор Vector Linux"
-#: FrmPartSel.class:150
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
-msgstr ""
-"Используется вами для ваших музыки, видео, документов. Настройки тоже "
-"хранятся здесь, так что можно работать из разных дистрибутивов с одними
и "
-"теми же данными и не нужно каждый раз настраивать всё под себя."
+#: MdlNetConf.module:429
+msgid "Gateway Address"
+msgstr "IP-адрес шлюза"
-#: FrmPartSel.class:150
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Обычно, лучше всего использовать под это самый большой раздел."
+#: MdlDiskPart.module:53
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr "Gparted не найден. Установите его и попробуйте заново. Если вы не
разработчик - случилась какая-то мистическая хрень, вы этого никогда не
должны были увидеть. Может, что-то с диском/флэшкой?"
-#: FrmPartSel.class:150
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-msgstr ""
-"Раздел подкачки рекомендуется, если у вас мало оперативной памяти. Или
если "
-"вы хотите использовать гибернацию (тогда размер надо чуть больше вашей "
-"оперативной памяти). Мы предлагаем "
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
+msgstr "Настройки графики"
-#: FrmPartSel.class:150
-msgid "for this is"
-msgstr "для этого"
+#: FrmUserAdd.class:408
+msgid "Groups are a way of administering permissions for your users. You
grant the user"
+msgstr "Группы - способ управлять возможностями пользователей. Вы
наделяете пользователя"
-#: FrmPartSel.class:150
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr ""
-", также можно рассчитать как 2 объёма вашей оперативной памяти, но без "
-"фанатизма. Более одного гигабайта раздел подкачки обычно не нужен, кроме
как "
-"для гибернации."
+#: FrmHalSwitch.class:25
+msgid "HAL"
+msgstr "HAL"
-#: FrmPartSel.class:181
-msgid "Please select the partitions you wish to use and how to use them"
-msgstr "Какие разделы будем использовать и как"
+#: MdlNetConf.module:153
+msgid "Hardware Address"
+msgstr "MAC-адрес"
#: FrmPartSel.class:186 FrmUserAdd.class:524
msgid "Help"
msgstr "Помощь"
-#: FrmPartSel.class:206
-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 ""
-"Нажмите здесь, если вы хотите, чтобы ваши Windows-разделы (если у вас "
-"установлена Windows или просто есть разделы с FAT, FAT32 или NTFS) были "
-"примонтированы при загрузке."
+#: MdlSummarize.module:56
+msgid "INSTALL TYPE:"
+msgstr "Тип установки:"
-#: FrmPartSel.class:207
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Обнаружить Windows-разделы и добавить их монтирование при загрузке"
+#: MdlNetConf.module:384
+msgid "IP Address"
+msgstr "IP-адрес"
-#: FrmPkgSel.class:25
-msgid "Choose your installation mode"
-msgstr "Выберите способ инсталляции"
+#: MdlNetConf.module:321
+msgid "If in doubt, choose this option"
+msgstr "Вот, этот вариант самый лучший и безопасный, если вы не уверены,
что выбрать"
-#: FrmPkgSel.class:40
-msgid "Package"
-msgstr "Пакет"
+#: FrmDone.class:39
+msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
+msgstr "Если вы устанавливали с диска - вытащите его из привода. Установка
окончена, сейчас мы будем перегружаться, и зачем нам второй раз грузиться с
диска?"
-#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
-msgid "Description"
-msgstr "Описание"
+#: FrmImportAccts.class:203
+msgid "Import Account"
+msgstr "Добавить существующую учётную запись"
-#: FrmPkgSel.class:42 FrmSummary.class:41 FrmUsrPkgSel.class:19
-msgid "Size"
-msgstr "Размер"
+#: FrmImportAccts.class:216 FrmUserAdd.class:596
+msgid "Import Existing User Accounts"
+msgstr "Добавить существующую учётную запись"
-#: FrmPkgSel.class:71
-msgid ""
-"Installs all optional components in your VectorLinux media to your system"
-msgstr "Поставить всё, что есть"
+#: MdlLilo.module:559
+msgid "Include in boot menu"
+msgstr "Добавить в загрузочное меню"
-#: FrmPkgSel.class:81
-msgid "Choose your optional components to install."
-msgstr ""
-"Эти пакеты необязательны для работы системы, но могут быть обязательными
для "
-"работы вас. Выбирайте."
+#: MdlLilo.module:471 MdlLiloOsList.module:149
+msgid "Include this installation in the boot menu"
+msgstr "Добавить эту установку в загрузочное меню"
-#: FrmPkgSel.class:206
-msgid "Full Install"
-msgstr "Полная установка"
+#: MdlLiloOsList.module:302
+msgid "Include this operating system in the boot menu"
+msgstr "Добавить эту операционную систему в загрузочное меню"
-#: FrmPkgSel.class:211
-msgid "Custom Install"
-msgstr "Особая установка"
+#: MdlLiloOsList.module:334
+msgid "Initial Ram Disk"
+msgstr "Стартовый RAM-диск"
-#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
-msgid "Select your indivirual packages to install."
-msgstr "Выберите ваши пакеты для установки"
+#: MdlLilo.module:595
+msgid "Initrd"
+msgstr "Initrd"
-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "Чтобы поставить всё, просто кликните \"Далее\""
+#: MdlCore.module:495
+msgid "Install Operating System"
+msgstr "Установить операционную систему"
-#: FrmResetSettings.class:92
-msgid "Select which settings to reset"
-msgstr "Выберите настройки для сброса"
+#: MdlCore.module:492
+msgid "Installation"
+msgstr "Установка"
-#: FrmResetSettings.class:101
-msgid "Done"
-msgstr "Сделано"
+#: FrmSummary.class:14 MdlCore.module:493
+msgid "Installation Summary"
+msgstr "Итог установки"
-#: FrmRootPass.class:12
-msgid "System Administrator Password"
-msgstr "Пароль администратора"
+#: FrmSummary.class:286
+msgid "Installation Type"
+msgstr "Тип установки"
-#: FrmRootPass.class:19
-msgid "Most other every-day taks do not require administrative
priviledges."
-msgstr ""
-"Права рута нужны для настройки системы и установки/удаления софта. То
есть "
-"они не нужны (и даже могут быть вредны) для использования системы "
-"практически всё время."
+#: FrmDone.class:75
+msgid "Installation is finished"
+msgstr "Установка, урррра!, окончена"
-#: FrmRootPass.class:19
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
-msgstr ""
-"Безопасность - всегда враг удобства. И всё же, придумывая лёгкий для вас "
-"пароль, постарайтесь сделать его трудным для других. Пример одного из "
-"методов - Ghbdtn,Rjvgm.nth! или ZK.,k.Cdj.:tyeYfnfie. А можно и строчку
из "
-"любимой песни - BeQuickOrBeDead. Меньше десяти, а, тем более, восьми "
-"символов лучше не стоит - можно быстро подобрать."
+#: MdlInstallSys.module:754
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Теперь мы готовы к настройке"
-#: FrmRootPass.class:29
-msgid "About the root account"
-msgstr "О пользователе root (суперпользователь)"
+#: MdlInstallCustom.module:205 MdlInstallSys.module:480
+msgid "Installing"
+msgstr "Устанавливаем"
-#: FrmRootPass.class:38
-msgid "Enter a Password for root."
-msgstr "Ввести пароль для root (суперпользователя):"
+#: FrmInstallSys.class:219
+msgid "Installing ..."
+msgstr "Ставим..."
-#: FrmRootPass.class:47
-msgid ""
-"Passwords do not match. Please enter the same password twice for
accuracy."
-msgstr "Пароли не совпадают. Введите, пожалуйста, ещё раз"
+#: MdlInstallSys.module:799
+msgid "Installing Required Package ..."
+msgstr "Ставим необходимые пакеты..."
-#: FrmRootPass.class:115 MdlCore.module:499
-msgid "System Administrator"
-msgstr "Администратор системы"
+#: MdlInstallSys.module:757
+msgid "Installing default system configuration and required software."
+msgstr "Добавляем базовые настройки системы и требуемый софт."
-#: FrmRootPass.class:128
-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 ""
-"Итак, администратором linux-системы является root. Он может делать всё, "
-"поэтому использовать его для повседневной жизни крайне глупо. Кривой IRC
или "
-"ICQ клиент дадут взломщику (даже неквалифицированному, что особо обидно) "
-"абсолютно полный доступ к вашей машине. Даже опечатки в командах могут "
-"обойтись очень дорого.\n"
-"Так что используйте root только для конфигурирования системы и установки/"
-"удаления софта и пароль подберите посложнее."
+#: MdlInstallCustom.module:271
+msgid "Installing user-selected package"
+msgstr "Ставим выбранные вами дополнительные пакеты"
-#: FrmRootPass.class:134 FrmUserAdd.class:557
-msgid "Enter Password"
-msgstr "Ввести пароль"
+#: FrmPkgSel.class:71
+msgid "Installs all optional components in your VectorLinux media to your
system"
+msgstr "Поставить всё, что есть"
-#: FrmRootPass.class:139
-msgid "Re-Enter Password"
-msgstr "Введите пароль ещё раз"
+#: MdlNetConf.module:174
+msgid "Interface Type"
+msgstr "Тип интерфейса"
-#: FrmRootPass.class:156
-msgid "Set Password"
-msgstr "Ввести пароль"
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"
+msgstr "Поставить VectorLinux вполне возможно, но вам нужно сперва
подготовить разделы"
-#: FrmSelISO.class:30 MdlCore.module:237
-msgid "No Installable Media Found"
-msgstr "Не найдено откуда устанавливать"
+#: MdlLilo.module:625 MdlLiloOsList.module:359
+msgid "Kernel boot options"
+msgstr "Параметры ядра при загрузке"
-#: FrmSelISO.class:79
-msgid "Click"
-msgstr "Клик"
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "ЛИЦЕНЗИЯ"
-#: FrmSelISO.class:79
-msgid "to begin installating"
-msgstr "чтобы начать инсталлировать"
+#: MdlLiloOsList.module:158
+msgid "Label"
+msgstr "Метка"
-#: FrmSelISO.class:81
-msgid "Unable to locate any installable media."
-msgstr "Не могу найти, куда устанавливать."
+#: MdlCore.module:487
+msgid "Language Selection"
+msgstr "Выбор языка"
-#: FrmSelISO.class:87
-msgid "Select installation media from the list below"
-msgstr "Выберите установочный привод из списка"
+#: MdlConfLilo.module:97
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo отработало с ошибкой. Пожалуйста, посмотрите"
-#: FrmSelISO.class:116
-msgid "Unable to identify distro."
-msgstr "Непонятный какой-то дистрибутив."
+#: FrmPartSel.class:150
+msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
+msgstr "Linux - модульная система. Таким образом, в ней есть возможность
сохранять систему и"
-#: FrmSelISO.class:151
-msgid "Minimum Disk Space Requirements"
-msgstr "Минимальные требования к месту на дисках"
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Грузим gparted... Подождите чуточку"
-#: FrmSelISO.class:254
-msgid "No installable images found."
-msgstr "Не найдено откуда устанавливать"
+#: FrmZoneSet.class:177
+msgid "LocalTime"
+msgstr "Местное время"
-#: FrmSelISO.class:260
-msgid ""
-"Select which VectorLinux version you wish to install from the list below"
-msgstr "Выберите, какую версию VectorLinux вы хотите поставить"
+#: FrmUserAdd.class:550
+msgid "Login Name"
+msgstr "Логин"
-#: FrmSelISO.class:270
-msgid "Search Again"
-msgstr "Искать заново"
+#: FrmUserAdd.class:108
+msgid "Login name field contains illegal characters. Please use only
lowercase letters and numbers"
+msgstr "Логин может состоять только из английских строчных букв и цифр.
Начинаться с цифры логин не может."
-#: FrmSummary.class:14 MdlCore.module:493
-msgid "Installation Summary"
-msgstr "Итог установки"
+#: MdlLilo.module:96
+msgid "MBR of"
+msgstr "MBR"
-#: FrmSummary.class:17 MdlSummarize.module:56
-msgid "Custom"
-msgstr "Особый"
+#: MdlConfLilo.module:124
+msgid "MBR of "
+msgstr "MBR"
-#: FrmSummary.class:21 MdlSummarize.module:69
-msgid "Full"
-msgstr "Полный"
+#: MdlCore.module:400
+msgid "MINIMUM REQUIREMENTS"
+msgstr "Минимальные требования"
-#: FrmSummary.class:37
-msgid "Preparing Installation Summary ... Please wait"
-msgstr "Подводим итог установки..."
+#: MdlPartSel.module:82
+msgid "MOUNT POINT"
+msgstr "Точка монтирования"
-#: FrmSummary.class:39
-msgid "Partition"
-msgstr "Раздел"
+#: MdlWinDrives.module:85
+msgid "MOUNT TO"
+msgstr "Монтировать в"
-#: FrmSummary.class:43
-msgid "Filesystem"
-msgstr "Файловая система"
+#: FrmNetConf.class:227
+msgid "Manual DNS Server Specification"
+msgstr "Ручная настройка DNS"
+
+#: FrmSelISO.class:151
+msgid "Minimum Disk Space Requirements"
+msgstr "Минимальные требования к месту на дисках"
+
+#: FrmPartScheme.class:123
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Изменить существующие разделы, чтобы освободить место для нашей
инсталляции. Внимание! Изменять разделы, везде и всегда, чревато потерей
данных. Помните!"
+
+#: FrmRootPass.class:19
+msgid "Most other every-day taks do not require administrative
priviledges."
+msgstr "Права рута нужны для настройки системы и установки/удаления софта.
То есть они не нужны (и даже могут быть вредны) для использования системы
практически всё время."
#: FrmSummary.class:45
msgid "Mount Point"
msgstr "Точка монтирования"
-#: FrmSummary.class:46
-msgid "Format ?"
-msgstr "Форматировать?"
+#: MdlLilo.module:481 MdlLiloOsList.module:313
+msgid "Name"
+msgstr "Имя"
-#: FrmSummary.class:52 MdlInstallSys.module:142 MdlPartSel.module:143
-msgid "Not Used"
-msgstr "Не используется"
+#: FrmNetConf.class:184 MdlCore.module:501
+msgid "Network Configuration"
+msgstr "Конфигурация сети"
-#: FrmSummary.class:58
-msgid "Do not Format"
-msgstr "Не форматировать"
+#: FrmImportAccts.class:144
+msgid "New Password"
+msgstr "Новый пароль"
-#: FrmSummary.class:99 MdlNetConf.module:245
-msgid "None"
+#: FMain.class:821
+msgid "Next"
+msgstr "Далее"
+
+#: FMain.class:259 FrmSummary.class:61
+msgid "No"
msgstr "Нет"
-#: FrmSummary.class:121 MdlInstallSys.module:190 MdlWinDrives.module:124
-msgid "Do not mount"
-msgstr "Не монтировать"
+#: FrmSelISO.class:30 MdlCore.module:237
+msgid "No Installable Media Found"
+msgstr "Не найдено откуда устанавливать"
-#: FrmSummary.class:174 FrmUsrPkgSel.class:16
-msgid "Package Name"
-msgstr "Имя пакеты"
+#: MdlWinDrives.module:141
+msgid "No Windows partitions detected"
+msgstr "Windows-разделов не найдено"
-#: FrmSummary.class:183
-msgid "BULK PACKAGES"
-msgstr "Оптовые пакеты"
+#: MdlNetConf.module:93
+msgid "No ethernet neworking devices found"
+msgstr "Сетевых карт не найдено"
-#: FrmSummary.class:210
-msgid "USER-SELECTED PACKAGES"
-msgstr "Выбранные вами пакеты"
+#: FrmSelISO.class:254
+msgid "No installable images found."
+msgstr "Не найдено откуда устанавливать"
-#: FrmSummary.class:286
-msgid "Installation Type"
-msgstr "Тип установки"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "Нет, я не соглашаюсь"
-#: FrmSummary.class:296
-msgid "Partition Selection Scheme"
-msgstr "Схема выбора разделов"
+#: FrmSummary.class:99 MdlNetConf.module:245
+msgid "None"
+msgstr "Нет"
-#: FrmSummary.class:306 FrmUsrPkgSel.class:147 MdlCore.module:490
-msgid "Software Selection"
-msgstr "Выбор софта"
+#: FrmSummary.class:52 MdlInstallSys.module:142 MdlPartSel.module:143
+msgid "Not Used"
+msgstr "Не используется"
-#: FrmUserAdd.class:54
-msgid "Create User Accounts"
-msgstr "Создать учётную запись"
+#: FrmUserAdd.class:409
+msgid "OK"
+msgstr "Ок"
-#: FrmUserAdd.class:92
-msgid "Creating user account ... Please wait"
-msgstr "Создаём пользователя... Подождите чуть-чуть"
+#: MdlSummarize.module:62
+msgid "OPTIONAL PACKAGES:"
+msgstr "Необязательные пакеты:"
-#: FrmUserAdd.class:100
-msgid "Enter the login name that this user will user to login to this
system."
-msgstr "Ввести логин пользователя (имя для входа в систему)."
+#: MdlSummarize.module:49
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+msgstr "Выберите Windows-разделы, к которым вы хотите иметь доступ:"
-#: FrmUserAdd.class:108
-msgid ""
-"Login name field contains illegal characters. Please use only lowercase "
-"letters and numbers"
-msgstr ""
-"Логин может состоять только из английских строчных букв и цифр.
Начинаться с "
-"цифры логин не может."
+#: MdlLiloOsList.module:290
+msgid "Operating system installed in"
+msgstr "Операционная система поставлена на"
-#: FrmUserAdd.class:122
-msgid "Username contains illegal characters"
-msgstr "В логине замечены недопустимые символы"
+#: MdlPartSel.module:71 MdlWinDrives.module:75
+msgid "PARTITION"
+msgstr "Раздел"
-#: FrmUserAdd.class:125
-msgid "User account for"
-msgstr "Учётная запись"
+#: MdlSummarize.module:28
+msgid "PARTITIONING LAYOUT"
+msgstr "Карта разделов"
-#: FrmUserAdd.class:125
-msgid "already exists"
-msgstr "уже есть"
+#: FrmPkgSel.class:40
+msgid "Package"
+msgstr "Пакет"
-#: FrmUserAdd.class:129
-msgid "Enter a password for"
-msgstr "Ввести пароль для"
+#: FrmSummary.class:174 FrmUsrPkgSel.class:16
+msgid "Package Name"
+msgstr "Имя пакеты"
+
+#: MdlInstallSys.module:371
+msgid "Packages have been installed in your system. Please click"
+msgstr "Пакеты поставлены. Пожалуйста, кликните"
+
+#: FrmSummary.class:39
+msgid "Partition"
+msgstr "Раздел"
+
+#: FrmSummary.class:296
+msgid "Partition Selection Scheme"
+msgstr "Схема выбора разделов"
+
+#: FrmImportAccts.class:64
+msgid "Password fields cannot be blank. Please enter a password for"
+msgstr "Пароль пустым быть не может. Нет, после установки его вполне можно
поставить пустым, просто мы не даём. Если вам так уж этого хочется,
поставьте пока единичку вместо пароля, но помните, мы против! Итак, пароль
для"
#: FrmUserAdd.class:186
msgid "Passwords do not match"
msgstr "Пароли не совпадают"
-#: FrmUserAdd.class:187
-msgid "Enter the same password twice"
-msgstr "Введите пароль ещё раз"
+#: FMain.class:244
+msgid "Passwords do not match. Please enter the same password twice"
+msgstr "Пароли не совпадают. Введите ещё раз"
-#: FrmUserAdd.class:383
-msgid ""
-"Your password selections do not match. Please enter the same password
twice"
-msgstr "Пароли не совпадают. Введите, пожалуйста, их ещё раз"
+#: FrmRootPass.class:47
+msgid "Passwords do not match. Please enter the same password twice for
accuracy."
+msgstr "Пароли не совпадают. Введите, пожалуйста, ещё раз"
-#: FrmUserAdd.class:408
-msgid ""
-"Groups are a way of administering permissions for your users. You grant
the "
-"user"
-msgstr ""
-"Группы - способ управлять возможностями пользователей. Вы наделяете "
-"пользователя"
+#: FMain.class:223
+msgid "Please select a default operating system to boot before proceeding"
+msgstr "Выберите операционную систему для загрузки по умолчанию (что будет
грузиться, если включить компьютер и отойти чай там заварить, или
спросонья)"
-#: FrmUserAdd.class:408
-msgid "permission to do certain things by adding them to certain groups."
-msgstr ""
-"разрешение делать определённые вещи, добавляя их в определённые группы."
+#: MdlPartSel.module:289
+msgid "Please select only one "
+msgstr "Жаль, но выбрать можно только один вариант"
-#: FrmUserAdd.class:408
-msgid "Select which groups you want this user to be a part of here"
-msgstr "Выберите, в какие группы вы хотите ввести пользователя"
+#: FrmPartSel.class:181
+msgid "Please select the partitions you wish to use and how to use them"
+msgstr "Какие разделы будем использовать и как"
-#: FrmUserAdd.class:409
-msgid "OK"
-msgstr "Ок"
+#: FMain.class:277
+msgid "Please specify a hostname for this computer"
+msgstr "А какое имя будет у компьютера"
-#: FrmUserAdd.class:471
-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 ""
-"Выберите уникальное имя каждому пользователю. Пользователей можно делать "
-"сколько угодно. Для того, чтобы случайно не поставить неправильный
пароль, "
-"введите его дважды. Когда закончите, нажмите \"Далее\", чтобы продолжить "
-"настройку."
+#: FMain.class:281
+msgid "Please specify the domain this computer belongs to"
+msgstr "Выберите домен, к которому принадлежит компьютер (здесь под
доменом понимается то, что идёт после имени машины в её полном имени - в
vectorlinux.some.net доменом будет именно some.net). Вводить без точки в
начале."
-#: FrmUserAdd.class:515
-msgid "Use Picture ID for Login greeting"
-msgstr "Использовать картинку для приветствия пользователя"
+#: FrmAlsaConf.class:36
+msgid "Please use the setup program below to setup the sound system."
+msgstr "Пожалуйста, используйте программу внизу для настройки звука."
-#: FrmUserAdd.class:537
-msgid "Create User"
-msgstr "Создать пользователя"
+#: FMain.class:350
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Пожалкйста, подождите капельку, пока инсталлятор смотрит на
текущее разбиение разделов."
-#: FrmUserAdd.class:543
-msgid "Clear Form"
-msgstr "Очистить форму"
+#: FMain.class:348
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "А сейчас установщик запускает утилиту для разбиения разделов,
подождите чуть-чуть"
-#: FrmUserAdd.class:550
-msgid "Login Name"
-msgstr "Логин"
+#: MdlNetConf.module:132
+msgid "Plugged-in"
+msgstr "Подключенные"
-#: FrmUserAdd.class:564
-msgid "ReEnter Password"
-msgstr "Введите пароль ещё раз"
+#: MdlCore.module:486
+msgid "Preparation"
+msgstr "Подготовка"
-#: FrmUserAdd.class:580
-msgid "Real Name"
-msgstr ""
-"Ваше имя (ни для чего особо не надо, просто софт типа OpenOffice по "
-"умолчанию берёт ваше имя для авторства документов как раз вот отсюда)"
+#: FrmSummary.class:37
+msgid "Preparing Installation Summary ... Please wait"
+msgstr "Подводим итог установки..."
-#: FrmUserAdd.class:586 MdlCore.module:500
-msgid "User Accounts"
-msgstr "Учётные записи"
+#: MdlSetup.module:319
+msgid "Preparing filesystems"
+msgstr "Готовим файловые системы"
-#: FrmUsrPkgSel.class:11
-msgid "To install them all, just click"
-msgstr "Чтобы поставить всё, просто кликните"
+#: FrmNetConf.class:243
+msgid "Primary DNS Server"
+msgstr "Первичный DNS-сервер"
+
+#: FrmXconf.class:27
+msgid "Probe hardware to setup your Graphical Environment using your
preffered settings"
+msgstr "Потрогаем ваше железо, чтобы настроить графический режим"
+
+#: MdlNetConf.module:60
+msgid "Probing your networking hardware ... Please wait"
+msgstr "Смотрим, есть ли у вас сетевые карты..."
+
+#: FrmLilo.class:267 FrmLiloSetup.class:263
+msgid "Prompt Timeout"
+msgstr "Время выбора"
+
+#: FrmRootPass.class:139
+msgid "Re-Enter Password"
+msgstr "Введите пароль ещё раз"
+
+#: FrmUserAdd.class:564
+msgid "ReEnter Password"
+msgstr "Введите пароль ещё раз"
#: FrmUsrPkgSel.class:40
msgid "Reading available software selection ... Please wait"
msgstr "Смотрим, что доступно из софта..."
-#: FrmWinDrives.class:72
-msgid "Select the windows partitions you would like to mount during boot"
-msgstr "Выберите Windows-разделы для монтирования при запуске"
+#: FrmUserAdd.class:580
+msgid "Real Name"
+msgstr "Ваше имя (ни для чего особо не надо, просто софт типа OpenOffice
по умолчанию берёт ваше имя для авторства документов как раз вот отсюда)"
-#: FrmXconf.class:25
-msgid "Uses the default (failsafe) configuration."
-msgstr "Использовать конфигурацию по умолчанию (зато гарантированно
работает)"
+#: MdlCore.module:498
+msgid "Regional Settings"
+msgstr "Настройки местности"
-#: FrmXconf.class:27
-msgid ""
-"Probe hardware to setup your Graphical Environment using your preffered "
-"settings"
-msgstr "Потрогаем ваше железо, чтобы настроить графический режим"
+#: FrmImportAccts.class:197
+msgid "Reset settings"
+msgstr "Сбросить настройки"
-#: FrmXconf.class:29
-msgid "Use the console framebuffer driver"
-msgstr "Использовать фреймбуфер"
+#: FrmImportAccts.class:50
+msgid "Reset settings for"
+msgstr "Сбросить настройки для"
-#: FrmXconf.class:301
-msgid "Graphical Interface Settings"
-msgstr "Настройки графики"
+#: FMain.class:196 FrmDone.class:28
+msgid "Restart"
+msgstr "Перезагрузка"
-#: FrmXconf.class:311
-msgid "Video Driver"
-msgstr "Видеодрайвер"
+#: MdlUsrAdd.module:65
+msgid "Restricted administrator (backup)"
+msgstr "Администратор для бэкапа"
-#: FrmXconf.class:322
-msgid "Color Depth"
-msgstr "Битность цвета"
+#: MdlNetConf.module:305
+msgid "STATUS:"
+msgstr "Состояние:"
+
+#: MdlCore.module:221
+msgid "Scanning system for installable media. Please wait ..."
+msgstr "Сканируем машину, ищем, откуда ставить Vector..."
#: FrmXconf.class:328
msgid "Screen Resolution"
msgstr "Разрешение экрана"
-#: FrmXconf.class:335
-msgid "24 bit True Color"
-msgstr "24(32)-битный режим(лучший)"
+#: FrmSelISO.class:270
+msgid "Search Again"
+msgstr "Искать заново"
-#: FrmXconf.class:335
-msgid "16 bit Pseudo Color"
-msgstr "16-битный режим"
+#: FrmNetConf.class:256
+msgid "Secondary DNS Server"
+msgstr "Вторичный DNS-сервер"
-#: FrmXconf.class:335
-msgid "8 bit 256 Color"
-msgstr "256-тицветный режим"
+#: FrmLilo.class:278 FrmLiloSetup.class:274
+msgid "Seconds"
+msgstr "Секунд"
-#: FrmXconf.class:335
-msgid "4 bit 16 Color"
-msgstr "16-тицветный режим"
+#: FrmImportAccts.class:171 FrmUserAdd.class:509
+msgid "Select"
+msgstr "Выбрать"
-#: FrmXconf.class:335
-msgid "1 bit Mono B/W"
-msgstr "1-битный чёрно-белый"
+#: FMain.class:224
+msgid "Select an entry from this list"
+msgstr "Выберите из списка"
-#: FrmXconf.class:340
-msgid "Vesa"
-msgstr "VESA"
+#: FrmSelISO.class:87
+msgid "Select installation media from the list below"
+msgstr "Выберите установочный привод из списка"
-#: FrmXconf.class:342
-msgid "Fbdev"
-msgstr "Фреймбуфер"
+#: FrmImportAccts.class:161
+msgid "Select login Image"
+msgstr "Выберите картинку для логина"
-#: FrmXconf.class:348
-msgid "1920x1280"
-msgstr "1920x1280"
+#: FrmImportAccts.class:31 FrmUserAdd.class:344
+msgid "Select picture for user Login"
+msgstr "Выберите картинку для пользователя"
-#: FrmXconf.class:348
-msgid "1600x1200"
-msgstr "1600x1200"
+#: FrmWinDrives.class:72
+msgid "Select the windows partitions you would like to mount during boot"
+msgstr "Выберите Windows-разделы для монтирования при запуске"
-#: FrmXconf.class:348
-msgid "1440x900"
-msgstr "1440x900"
+#: 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 "Выберите, если у вас уже есть Linux (который вы хотите
перезаписать) или если вы уже разметили диск."
-#: FrmXconf.class:348
-msgid "1280x1024"
-msgstr "1280x1024"
+#: FrmPartScheme.class:71
+msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
+msgstr "Выберите, если хотите поработать с разделами."
-#: FrmXconf.class:348
-msgid "1280x800"
-msgstr "1280x800"
+#: FrmSelISO.class:260
+msgid "Select which VectorLinux version you wish to install from the list
below"
+msgstr "Выберите, какую версию VectorLinux вы хотите поставить"
-#: FrmXconf.class:348
-msgid "1024x768"
-msgstr "1024x768"
+#: FrmUserAdd.class:408
+msgid "Select which groups you want this user to be a part of here"
+msgstr "Выберите, в какие группы вы хотите ввести пользователя"
-#: FrmXconf.class:348
-msgid "800x600"
-msgstr "800x600"
+#: FrmResetSettings.class:92
+msgid "Select which settings to reset"
+msgstr "Выберите настройки для сброса"
-#: FrmXconf.class:348
-msgid "640x480"
-msgstr "640x480"
+#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
+msgid "Select your indivirual packages to install."
+msgstr "Выберите ваши пакеты для установки"
-#: FrmZoneSet.class:21
-msgid "Timezone configuration"
-msgstr "Настройка часового пояса"
+#: FrmLangSel.class:123
+msgid "Select your language"
+msgstr "Выберите язык"
-#: FrmZoneSet.class:170
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Выберите нужный вам часовой пояс."
+#: FrmImportAccts.class:68
+msgid "Selected passwords dont match. Please enter the same password twice"
+msgstr "Пароли не совпадают. Введите ещё раз, пожалуйста"
-#: FrmZoneSet.class:175
-msgid "ComboBox1"
-msgstr "Комбобокс"
+#: FrmRootPass.class:156
+msgid "Set Password"
+msgstr "Ввести пароль"
-#: FrmZoneSet.class:177
-msgid "LocalTime"
-msgstr "Местное время"
+#: MdlNetConf.module:206
+msgid "Setup Mode"
+msgstr "Режим настройки"
-#: FrmZoneSet.class:177
-msgid "UTC"
-msgstr "UTC"
+#: MdlCore.module:405
+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.CONF. Может, плохо записан диск
или установочный образ побился при скачивании... Проверьте, пожалуйста."
-#: FrmZoneSet.class:182
-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 ""
-"Выберите,\n"
-"как настраивать ваши часы.\n"
-"Если часы на материнской плате настроены\n"
-"на UTC(универсальное координированное время),\n"
-"то выбирайте UTC. Если нет - то выбирайте местное время."
+#: MdlDiskPart.module:90
+msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
+msgstr "Не получилось запустить gparted. Возможно, этому причиной"
-#: MdlConfLilo.module:97
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo отработало с ошибкой. Пожалуйста, посмотрите"
+#: MdlCore.module:239
+msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
+msgstr "Мы не смогли найти ни одного образа для установки. Может, диск
поцарапан или плохо записался?"
-#: MdlConfLilo.module:100
-msgid "Boot loader has been setup successfully"
-msgstr "Загрузчик прописан успешно"
+#: MdlDiskPart.module:95
+msgid "Several windows found. I will take the first one!"
+msgstr "Ух-ты, зачем вам столько Windows? Мы будем работать с первой
найденной, уж извините."
-#: MdlConfLilo.module:124
-msgid "MBR of "
-msgstr "MBR"
+#: FrmPkgSel.class:42 FrmSummary.class:41 FrmUsrPkgSel.class:19
+msgid "Size"
+msgstr "Размер"
-#: MdlConfLilo.module:131 MdlLilo.module:98
-msgid "Bootsector of "
-msgstr "Загрузочный сектор "
+#: FMain.class:231
+msgid "Skipping boot loaded setup"
+msgstr "Пропускаем установку загрузчика"
-#: MdlConfLilo.module:136 MdlLilo.module:100
-msgid "Floppy"
-msgstr "Дисковод"
+#: FMain.class:458
+msgid "Skipping lilo setup"
+msgstr "Пропускаем установку LILO"
-#: MdlCore.module:28
-msgid "Working ... Please Wait"
-msgstr "Работаем для вас... Немного терпения"
+#: FrmSummary.class:306 FrmUsrPkgSel.class:147 MdlCore.module:490
+msgid "Software Selection"
+msgstr "Выбор софта"
-#: MdlCore.module:221
-msgid "Scanning system for installable media. Please wait ..."
-msgstr "Сканируем машину, ищем, откуда ставить Vector..."
+#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:50
+msgid "Standard"
+msgstr "Стандартный"
-#: MdlCore.module:239
-msgid ""
-"Setup was unable to find any installable media on your system. Please
...
[truncated message content] |
|
From: <cod...@go...> - 2008-12-02 14:55:34
|
Author: rbistolfi
Date: Tue Dec 2 06:53:02 2008
New Revision: 333
Added:
branches/iVL/.lang/ru.po
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/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.po
Log:
Added ru.po by Vanger
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/ClsGlobal.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/ClsPartSel.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/ClsWinDrives.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FMain.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmDiskPart.class
+# /home/rbistolfi/vinstall-ng/FrmDiskPart.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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmPartScheme.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmPartSel.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmPkgSel.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmSelISO.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmSummary.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/FrmWinDrives.class
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlCore.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlDiskPart.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlObjSizer.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlPartSel.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlPkgSel.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlSetup.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlSummarize.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -1,4 +1,4 @@
-# /home/sohouser/devel/installer/MdlWinDrives.module
+# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 06:53:02 2008
@@ -10,1307 +10,1585 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmXconf.class:335
-msgid "1 bit Mono B/W"
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "VectorLinux Installer"
+
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "GUI installer for Vector linux"
+
+#: FMain.class:196 FrmDone.class:28
+msgid "Restart"
msgstr ""
-#: FrmXconf.class:348
-msgid "1024x768"
+#: FMain.class:223
+msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FrmXconf.class:348
-msgid "1280x1024"
+#: FMain.class:224
+msgid "Select an entry from this list"
msgstr ""
-#: FrmXconf.class:348
-msgid "1280x800"
+#: FMain.class:231
+msgid "Skipping boot loaded setup"
msgstr ""
-#: FrmXconf.class:348
-msgid "1440x900"
+#: FMain.class:244
+msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FrmXconf.class:335
-msgid "16 bit Pseudo Color"
+#: FMain.class:259
+msgid ""
+"You have not created any user accounts for this system yet. There is not "
+"enough information"
msgstr ""
-#: FrmXconf.class:348
-msgid "1600x1200"
+#: FMain.class:259
+msgid ""
+"to create an account here. It is recommended that you create at least
one."
msgstr ""
-#: FrmNetConf.class:238
-msgid "192.168.1.254"
-msgstr "-"
+#: FMain.class:259
+msgid "Would you like to continue anyway?"
+msgstr ""
-#: FrmXconf.class:348
-msgid "1920x1280"
+#: FMain.class:259 FrmSummary.class:59
+msgid "Yes"
msgstr ""
-#: FrmXconf.class:335
-msgid "24 bit True Color"
+#: FMain.class:259 FrmSummary.class:61
+msgid "No"
msgstr ""
-#: FrmXconf.class:335
-msgid "4 bit 16 Color"
+#: FMain.class:277
+msgid "Please specify a hostname for this computer"
msgstr ""
-#: FrmXconf.class:348
-msgid "640x480"
+#: FMain.class:281
+msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FrmXconf.class:335
-msgid "8 bit 256 Color"
+#: FMain.class:296
+msgid ""
+"VectorLinux will now try to detect and configure your graphics hardware."
msgstr ""
-#: FrmXconf.class:348
-msgid "800x600"
+#: FMain.class:296
+msgid ""
+"Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FrmPartSel.class:150
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
+#: FMain.class:348
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "Please wait while setup attempts to run the partitioning utility"
-#: FrmRootPass.class:29
-msgid "About the root account"
-msgstr ""
+#: FMain.class:350
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Please wait while setup analyses your current partition setup."
-#: MdlNetConf.module:276
-msgid "Access Point"
-msgstr "ESSID"
+#: FMain.class:350
+msgid "This may take a while ..."
+msgstr "This may take a while ..."
-#: MdlSetup.module:317
-msgid "Activating swap space"
+#: FMain.class:364
+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:395
-msgid "Add option to boot this Operating system into Text mode."
-msgstr ""
+#: FMain.class:458
+msgid "Skipping lilo setup"
+msgstr "Skipping lilo setup per user request"
-#: MdlLilo.module:627
-msgid "Add option to boot this operating system into text mode"
-msgstr ""
+#: FMain.class:797
+msgid "Back"
+msgstr "Back"
-#: FrmDone.class:39
-msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
-msgstr ""
+#: FMain.class:809
+msgid "Exit Installation"
+msgstr "Exit Installation"
-#: MdlUsrAdd.module:74
-msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
+#: FMain.class:821
+msgid "Next"
+msgstr "Next"
+
+#: FMain.class:835
+msgid "Button1"
+msgstr "-"
+
+#: FrmAlsaConf.class:36
+msgid ""
+"This portion of the setup process allows you to sutup your soundcard for "
+"your new operating system."
msgstr ""
-#: MdlUsrAdd.module:77
-msgid "Allow user to mount / un-mount Removable HD Storage Devices"
+#: FrmAlsaConf.class:36
+msgid "Please use the setup program below to setup the sound system."
msgstr ""
-#: MdlNetConf.module:316
-msgid "Automatic settings via DHCP."
-msgstr "Automatic settings via DHCP."
+#: FrmDiskPart.class:58
+msgid ""
+"When finished making changes, exit the partitioning application to "
+"continue ..."
+msgstr ""
-#: MdlNetConf.module:192
-msgid "Automatically activate this interface at start-up"
-msgstr "Automatically activate this interface at start-up"
+#: FrmDiskPart.class:117
+msgid "Disk Partitioning:"
+msgstr "Disk Partitioning:"
-#: MdlSetup.module:301
-msgid "BROUGHT TO YOU BY"
+#: FrmDone.class:32
+msgid "Exit"
msgstr ""
-#: FrmSummary.class:174
-msgid "BULK PACKAGES"
+#: FrmDone.class:39
+msgid ""
+"has been installed to your system. Your new system has been configured
with "
+"the default factory settings."
msgstr ""
-#: MdlSummarize.module:58
-msgid "BULK PACKAGES:"
-msgstr "BULK PACKAGES:"
+#: FrmDone.class:39
+msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
+msgstr ""
-#: FMain.class:784
-msgid "Back"
-msgstr "Back"
+#: FrmDone.class:39
+msgid ""
+"Your computer needs to be restarted so that you can use your new
operating "
+"system. Click"
+msgstr ""
-#: FrmLilo.class:284 FrmLiloSetup.class:242
-msgid "Boot Default"
-msgstr "Boot Default"
+#: FrmDone.class:39
+msgid "to restart your computer now or click"
+msgstr ""
-#: FrmLiloSetup.class:176
-msgid "Boot Manager Configuration"
+#: FrmDone.class:39
+msgid "to restart your computer at a later time"
msgstr ""
-#: MdlCore.module:480
-msgid "Boot Menu Options"
-msgstr "Boot Menu Options"
+#: FrmDone.class:39
+msgid ""
+"If you installed from CD-ROM/R/RW media, please remove de disk before "
+"restarting."
+msgstr ""
-#: MdlConfLilo.module:100
-msgid "Boot loader has been setup successfully"
-msgstr "Boot loader has been setup successfully"
+#: FrmDone.class:75
+msgid "Installation is finished"
+msgstr ""
-#: FrmLiloSetup.class:66 MdlLilo.module:55
-msgid "Bootsplash Extra High"
+#: FrmHalSwitch.class:20
+msgid "Would you like to use Vl-Hot or HAL to manage your removable
devices?"
msgstr ""
-#: FrmLilo.class:262
-msgid "Bootsplash Extra high"
-msgstr "Bootsplash Extra High"
+#: FrmHalSwitch.class:25
+msgid "HAL"
+msgstr ""
-#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:53
-msgid "Bootsplash High"
-msgstr "Bootsplash High"
+#: FrmHalSwitch.class:30
+msgid "VL-Hot"
+msgstr ""
-#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:51
-msgid "Bootsplash Med"
-msgstr "Bootsplash Med"
+#: FrmHostPrep.class:130
+msgid "Vectorlinux is preparing your system for installation. Please wait."
+msgstr "Vectorlinux is preparing your system for installation. Please
wait."
-#: MdlCore.module:383
-msgid "Build Date: "
-msgstr "Build Date: "
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Current Status"
-#: FMain.class:822
-msgid "Button1"
+#: FrmHostPrep.class:139 FrmLilo.class:236 FrmPartScheme.class:128
+#: FrmPkgSel.class:196 FrmPkgsel2.class:86 FrmSelISO.class:265
+#: FrmSummaryOld.class:87
+msgid "TextLabel1"
msgstr "-"
-#: MdlSetup.module:199
-msgid "Calculating package count ... Please wait"
-msgstr "Calculating package count ... Please wait"
-
-#: MdlCore.module:461
-msgid "Cannot find SETUP.CONF"
-msgstr "Cannot find SETUP.CONF"
+#: FrmImportAccts.class:31 FrmUserAdd.class:344
+msgid "Select picture for user Login"
+msgstr ""
-#: FrmPartSel.class:206
-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"
+#: FrmImportAccts.class:50
+msgid "Reset settings for"
+msgstr ""
-#: FrmUserAdd.class:504
-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."
+#: FrmImportAccts.class:64
+msgid "Password fields cannot be blank. Please enter a password for"
+msgstr ""
-#: FrmZoneSet.class:182
-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."
+#: FrmImportAccts.class:68
+msgid "Selected passwords dont match. Please enter the same password twice"
+msgstr ""
-#: FrmZoneSet.class:170
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Choose the correct timezone for the area in which you live."
+#: FrmImportAccts.class:132
+#, fuzzy
+msgid "Account"
+msgstr "User Accounts"
-#: FrmPkgSel.class:25
-msgid "Choose your installation mode"
-msgstr "Choose your installation mode"
+#: FrmImportAccts.class:144
+#, fuzzy
+msgid "New Password"
+msgstr "Set Password"
-#: FrmPkgSel.class:81
-msgid "Choose your optional components to install."
-msgstr ""
+#: FrmImportAccts.class:161
+#, fuzzy
+msgid "Select login Image"
+msgstr "Select your language"
-#: FrmUserAdd.class:576
-msgid "Clear Form"
+#: FrmImportAccts.class:171 FrmUserAdd.class:509
+msgid "Select"
msgstr ""
-#: FrmSelISO.class:79
-msgid "Click"
-msgstr "Click"
+#: FrmImportAccts.class:181
+#, fuzzy
+msgid "Verify Password"
+msgstr "Enter Password"
-#: FrmXconf.class:322
-msgid "Color Depth"
+#: FrmImportAccts.class:191 FrmUserAdd.class:520
+msgid "User Rights Management"
msgstr ""
-#: FrmZoneSet.class:175
-msgid "ComboBox1"
-msgstr "-"
-
-#: FrmNetConf.class:199
-msgid "Computer Name"
-msgstr "Computer Name"
-
-#: FrmLilo.class:219
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Configure and install lilo (Linux Boot Loader)"
+#: FrmImportAccts.class:197
+#, fuzzy
+msgid "Reset settings"
+msgstr "Regional Settings"
-#: FrmUserAdd.class:570
-msgid "Create User"
-msgstr "Create User"
+#: FrmImportAccts.class:203
+#, fuzzy
+msgid "Import Account"
+msgstr "User Accounts"
-#: FrmUserAdd.class:37
-msgid "Create User Accounts"
+#: FrmImportAccts.class:209
+msgid "Cancel"
msgstr ""
-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Current Status"
+#: FrmImportAccts.class:216 FrmUserAdd.class:596
+#, fuzzy
+msgid "Import Existing User Accounts"
+msgstr "User Accounts"
#: FrmInstallSys.class:63
msgid "Current Step"
msgstr "Current Step"
+#: FrmInstallSys.class:204
+msgid "Vectorlinux is currently being installed to your system... Please
wait"
+msgstr "Vectorlinux is currently being installed to your system... Please
wait"
+
+#: FrmInstallSys.class:219
+msgid "Installing ..."
+msgstr "Installing ..."
+
#: FrmInstallSys.class:230
msgid "Current Step "
msgstr "Current Step "
-#: FrmSummary.class:17 MdlSummarize.module:56
-msgid "Custom"
-msgstr "Custom"
-
-#: FrmPkgSel.class:211
-msgid "Custom Install"
-msgstr "Custom Install"
+#: FrmInstallSys.class:252
+msgid "Total progress"
+msgstr "Total progress"
-#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
-msgid "Description"
-msgstr ""
+#: FrmLangSel.class:123
+msgid "Select your language"
+msgstr "Select your language"
-#: FrmPartSel.class:207
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "LICENSE AGREEMENT"
-#: MdlCore.module:472
-msgid "Disk Partitioning"
-msgstr "Disk Partitioning"
+#: FrmLicense.class:104
+msgid "TextArea1"
+msgstr "-"
-#: FrmPartScheme.class:113
-msgid "Disk Partitioning Options"
-msgstr "Disk Partitioning Options"
+#: FrmLicense.class:110
+msgid "Yes, I Agree to the License Agreement"
+msgstr "Yes, I Agree to the License Agreement"
-#: FrmDiskPart.class:115
-msgid "Disk Partitioning:"
-msgstr "Disk Partitioning:"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "No, I Do Not Agree"
-#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:141
-msgid "Do not format"
-msgstr "Do not format"
+#: FrmLilo.class:37
+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"
-#: FrmLiloSetup.class:192
-msgid "Do not install LILO"
+#: FrmLilo.class:37
+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"
-#: FrmSummary.class:113 MdlInstallSys.module:190 MdlWinDrives.module:123
-msgid "Do not mount"
-msgstr "Do not mount"
+#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:50
+msgid "Standard"
+msgstr "Standard"
-#: FrmNetConf.class:211
-msgid "Domain"
-msgstr ""
+#: FrmLilo.class:219
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Configure and install lilo (Linux Boot Loader)"
#: FrmLilo.class:224
msgid "Don't Install Lilo"
msgstr "Don't Install Lilo"
-#: MdlNetConf.module:316
-msgid "Dynamic Host Control Protocol"
-msgstr "Dynamic Host Control Protocol"
+#: FrmLilo.class:230 FrmLiloSetup.class:292 FrmNetConf.class:279
+msgid "Tab 0"
+msgstr "-"
-#: MdlUsrAdd.module:71
-msgid "Elite user"
-msgstr ""
+#: FrmLilo.class:248 FrmLiloSetup.class:224
+msgid "Target"
+msgstr "Target"
-#: MdlNetConf.module:257
-msgid "Encryption key"
-msgstr "Encryption Key"
+#: FrmLilo.class:254 FrmLiloSetup.class:203
+msgid "Video Resolution"
+msgstr "Video Resolution"
-#: MdlNetConf.module:231
-msgid "Encryption type"
-msgstr "Encryption type"
+#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:52
+msgid "Bootsplash Med"
+msgstr "Bootsplash Med"
-#: FrmRootPass.class:139 FrmUserAdd.class:590
-msgid "Enter Password"
-msgstr "Enter Password"
+#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:54
+msgid "Bootsplash High"
+msgstr "Bootsplash High"
-#: FrmRootPass.class:36
-msgid "Enter a Password for root."
-msgstr ""
+#: FrmLilo.class:262
+msgid "Bootsplash Extra high"
+msgstr "Bootsplash Extra High"
-#: FrmUserAdd.class:111
-msgid "Enter a password for"
-msgstr ""
+#: FrmLilo.class:267 FrmLiloSetup.class:263
+msgid "Prompt Timeout"
+msgstr "Prompt Timeout"
-#: FrmUserAdd.class:82
-msgid "Enter the login name that this user will user to login to this
system."
-msgstr ""
+#: FrmLilo.class:278 FrmLiloSetup.class:274
+msgid "Seconds"
+msgstr "Seconds"
-#: FrmUserAdd.class:177
-msgid "Enter the same password twice"
+#: FrmLilo.class:284 FrmLiloSetup.class:242
+msgid "Boot Default"
+msgstr "Boot Default"
+
+#: FrmLiloSetup.class:66 MdlLilo.module:56
+msgid "Bootsplash Extra High"
msgstr ""
-#: MdlInstallSys.module:518
-msgid "Error occurred while installing"
+#: FrmLiloSetup.class:176
+msgid "Boot Manager Configuration"
msgstr ""
-#: MdlInstallCustom.module:354
-msgid "Error while installing "
-msgstr "Error while installing "
+#: FrmLiloSetup.class:192
+msgid "Do not install LILO"
+msgstr ""
-#: MdlInstallCustom.module:76
-msgid "Error while installing required system software. "
-msgstr "Error while installing required system software. "
+#: FrmNetConf.class:184 MdlCore.module:501
+msgid "Network Configuration"
+msgstr "Network Configuration"
-#: MdlInstallCustom.module:85
-msgid "Error while installing system configuration. "
-msgstr "Error while installing system configuration. "
+#: FrmNetConf.class:199
+msgid "Computer Name"
+msgstr "Computer Name"
-#: FrmDone.class:32
-msgid "Exit"
+#: FrmNetConf.class:211
+msgid "Domain"
msgstr ""
-#: FMain.class:796
-msgid "Exit Installation"
-msgstr "Exit Installation"
+#: FrmNetConf.class:227
+msgid "Manual DNS Server Specification"
+msgstr "Manual DNS Server Specification"
-#: MdlPartSel.module:92
-msgid "FILESYSTEM"
-msgstr "FYLESYSTEM"
+#: FrmNetConf.class:238
+msgid "192.168.1.254"
+msgstr "-"
-#: MdlInstallSys.module:813
-msgid "Failed to install"
+#: FrmNetConf.class:243
+msgid "Primary DNS Server"
+msgstr "Primary DNS Server"
+
+#: FrmNetConf.class:256
+msgid "Secondary DNS Server"
+msgstr "Secondary DNS Server"
+
+#: 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 ""
+"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"
-#: MdlInstallCustom.module:225
-msgid "Failed to install. Installation will stop"
+#: FrmPartScheme.class:61
+msgid "This option will overwrite any existing data in the selected
partitions"
msgstr ""
+"This option will overwrite any existing data in the selected partitions"
-#: FrmXconf.class:342
-msgid "Fbdev"
+#: FrmPartScheme.class:61
+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"
-#: FrmSummary.class:42
-msgid "Filesystem"
+#: FrmPartScheme.class:71
+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."
-#: MdlCore.module:485
-msgid "Final Hardware Configuration"
+#: FrmPartScheme.class:71
+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."
-#: MdlCore.module:471
-msgid "Find installation media"
-msgstr "Find installation media"
+#: FrmPartScheme.class:113
+msgid "Disk Partitioning Options"
+msgstr "Disk Partitioning Options"
-#: MdlInstallSys.module:639
-msgid "Finished intalling Bulks"
-msgstr "Finished intalling Bulks"
+#: FrmPartScheme.class:118
+msgid "Use existing disk partitions"
+msgstr "Use existing disk partitions"
-#: FrmRootPass.class:19
-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"
+#: FrmPartScheme.class:123
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Modify my disk partitions to make room for new installation"
-#: FrmSummary.class:21 MdlSummarize.module:69
-msgid "Full"
-msgstr "Full"
+#: FrmPartSel.class:150
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
-#: FrmPkgSel.class:206
-msgid "Full Install"
-msgstr "Full Install"
+#: FrmPartSel.class:150
+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"
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "GUI installer for Vector linux"
+#: FrmPartSel.class:150
+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"
-#: MdlNetConf.module:423
-msgid "Gateway Address"
-msgstr "Gateway Address"
+#: FrmPartSel.class:150
+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"
-#: 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:150
+msgid "suggested setup for a typical Linux installation"
+msgstr "suggested setup for a typical Linux installation"
-#: FrmXconf.class:301
-msgid "Graphical Interface Settings"
+#: FrmPartSel.class:150
+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"
+
+#: FrmPartSel.class:150
+msgid "for this"
+msgstr "for this"
-#: FrmUserAdd.class:442
-msgid "Groups are a way of administering permissions for your users. You
grant the user"
+#: FrmPartSel.class:150
+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"
-#: FrmHalSwitch.class:25
-msgid "HAL"
+#: FrmPartSel.class:150
+msgid "in case you wish to."
+msgstr "in case you wish to."
+
+#: FrmPartSel.class:150
+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:152
-msgid "Hardware Address"
-msgstr "Hardware Address"
+#: FrmPartSel.class:150
+msgid "Typically, you want to use the largest partition for this."
+msgstr "Typically, you want to use the largest partition for this."
+
+#: FrmPartSel.class:150
+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"
-#: FrmPartSel.class:186 FrmUserAdd.class:557
+#: FrmPartSel.class:150
+msgid "for this is"
+msgstr "for this is"
+
+#: FrmPartSel.class:150
+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"
+
+#: FrmPartSel.class:181
+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"
+
+#: FrmPartSel.class:186 FrmUserAdd.class:524
msgid "Help"
msgstr "Help"
-#: MdlSummarize.module:56
-msgid "INSTALL TYPE:"
-msgstr "INSTALL TYPE:"
+#: FrmPartSel.class:206
+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"
-#: MdlNetConf.module:378
-msgid "IP Address"
-msgstr "IP Address"
+#: FrmPartSel.class:207
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
-#: MdlNetConf.module:316
-msgid "If in doubt, choose this option"
-msgstr "If in doubt, choose this option"
+#: FrmPkgSel.class:25
+msgid "Choose your installation mode"
+msgstr "Choose your installation mode"
-#: FrmDone.class:39
-msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
+#: FrmPkgSel.class:40
+msgid "Package"
msgstr ""
-#: MdlLilo.module:538
-msgid "Include in boot menu"
+#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
+msgid "Description"
msgstr ""
-#: MdlLilo.module:450 MdlLiloOsList.module:148
-msgid "Include this installation in the boot menu"
-msgstr "Include this installation in the boot menu"
-
-#: MdlLiloOsList.module:301
-msgid "Include this operating system in the boot menu"
-msgstr "Include this operating system in the boot menu"
+#: FrmPkgSel.class:42 FrmSummary.class:41 FrmUsrPkgSel.class:19
+msgid "Size"
+msgstr ""
-#: MdlLiloOsList.module:333
-msgid "Initial Ram Disk"
-msgstr "Initial Ram Disk"
+#: FrmPkgSel.class:71
+msgid ""
+"Installs all optional components in your VectorLinux media to your system"
+msgstr ""
-#: MdlLilo.module:574
-msgid "Initrd"
+#: FrmPkgSel.class:81
+msgid "Choose your optional components to install."
msgstr ""
-#: MdlCore.module:478
-msgid "Install Operating System"
-msgstr "Install Operating System"
+#: FrmPkgSel.class:206
+msgid "Full Install"
+msgstr "Full Install"
-#: MdlCore.module:475
-msgid "Installation"
-msgstr "Installation"
+#: FrmPkgSel.class:211
+msgid "Custom Install"
+msgstr "Custom Install"
-#: FrmSummary.class:14 MdlCore.module:476
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
+msgid "Select your indivirual packages to install."
+msgstr "Select your individual packages to install"
-#: FrmSummary.class:277
-msgid "Installation Type"
-msgstr ""
+#: FrmPkgsel2.class:21
+msgid "To install them all, just click next"
+msgstr "To install them all, just click next"
-#: FrmDone.class:75
-msgid "Installation is finished"
+#: FrmResetSettings.class:92
+msgid "Select which settings to reset"
msgstr ""
-#: MdlInstallSys.module:754
-msgid "Installation phase complete. Ready for configuration"
-msgstr "Installation phase complete. Ready for configuration"
-
-#: MdlInstallCustom.module:205 MdlInstallSys.module:480
-msgid "Installing"
-msgstr "Installing"
+#: FrmResetSettings.class:101
+#, fuzzy
+msgid "Done"
+msgstr "None"
-#: FrmInstallSys.class:219
-msgid "Installing ..."
-msgstr "Installing ..."
+#: FrmRootPass.class:12
+msgid "System Administrator Password"
+msgstr "System Administrator Password"
-#: MdlInstallSys.module:853
-msgid "Installing Final configuration files..."
-msgstr "Installing final configuration files ..."
+#: FrmRootPass.class:19
+msgid "Most other every-day taks do not require administrative
priviledges."
+msgstr "Most other every-day tasks do not require administrative
priviledges."
-#: MdlInstallSys.module:799
-msgid "Installing Required Package ..."
+#: FrmRootPass.class:19
+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"
-#: MdlInstallSys.module:757
-msgid "Installing default system configuration and required software."
-msgstr "Installing default system configuration and required software."
-
-#: MdlInstallCustom.module:271
-msgid "Installing user-selected package"
+#: FrmRootPass.class:29
+msgid "About the root account"
msgstr ""
-#: FrmPkgSel.class:71
-msgid "Installs all optional components in your VectorLinux media to your
system"
+#: FrmRootPass.class:38
+msgid "Enter a Password for root."
msgstr ""
-#: MdlNetConf.module:173
-msgid "Interface Type"
-msgstr "Interface Type"
-
-#: 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:47
+msgid ""
+"Passwords do not match. Please enter the same password twice for
accuracy."
+msgstr ""
-#: MdlLilo.module:604 MdlLiloOsList.module:358
-msgid "Kernel boot options"
-msgstr "Kernel boot options"
+#: FrmRootPass.class:115 MdlCore.module:499
+msgid "System Administrator"
+msgstr "System Administrator"
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "LICENSE AGREEMENT"
+#: FrmRootPass.class:128
+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."
-#: MdlLiloOsList.module:157
-msgid "Label"
-msgstr "Label"
+#: FrmRootPass.class:134 FrmUserAdd.class:557
+msgid "Enter Password"
+msgstr "Enter Password"
-#: MdlCore.module:470
-msgid "Language Selection"
-msgstr "Language Selection"
+#: FrmRootPass.class:139
+msgid "Re-Enter Password"
+msgstr "Re-Enter Password"
-#: MdlConfLilo.module:97
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo returned an error. Please see below"
+#: FrmRootPass.class:156
+msgid "Set Password"
+msgstr "Set Password"
-#: FrmPartSel.class:150
-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:30 MdlCore.module:237
+msgid "No Installable Media Found"
+msgstr "No Installable Media Found"
-#: MdlDiskPart.module:57
-msgid "Loading gparted ... Please wait"
-msgstr "Loagind gparted ... Please wait"
+#: FrmSelISO.class:79
+msgid "Click"
+msgstr "Click"
-#: FrmZoneSet.class:177
-msgid "LocalTime"
-msgstr "LocalTime"
+#: FrmSelISO.class:79
+msgid "to begin installating"
+msgstr "to begin installating"
-#: FrmUserAdd.class:583
-msgid "Login Name"
+#: FrmSelISO.class:81
+msgid "Unable to locate any installable media."
msgstr ""
-#: FrmUserAdd.class:90
-msgid "Login name field contains illegal characters. Please use only
lowercase letters and numbers"
+#: FrmSelISO.class:87
+msgid "Select installation media from the list below"
msgstr ""
-#: MdlCore.module:383
-msgid "MINIMUM REQUIREMENTS"
-msgstr "MINIMUM REQUIREMENTS"
-
-#: MdlPartSel.module:82
-msgid "MOUNT POINT"
-msgstr "MOUNT POINT"
-
-#: MdlWinDrives.module:84
-msgid "MOUNT TO"
-msgstr "MOUNT TO"
-
-#: FrmNetConf.class:227
-msgid "Manual DNS Server Specification"
-msgstr "Manual DNS Server Specification"
+#: FrmSelISO.class:116
+msgid "Unable to identify distro."
+msgstr "Unable to identify distro."
#: FrmSelISO.class:151
msgid "Minimum Disk Space Requirements"
msgstr "Minimum Disk Space Requirements"
-#: FrmPartScheme.class:123
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modify my disk partitions to make room for new installation"
-
-#: FrmRootPass.class:19
-msgid "Most other every-day taks do not require administrative
priviledges."
-msgstr "Most other every-day tasks do not require administrative
priviledges."
+#: FrmSelISO.class:254
+msgid "No installable images found."
+msgstr "No installable images found."
-#: FrmSummary.class:44
-msgid "Mount Point"
+#: FrmSelISO.class:260
+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"
-#: MdlLilo.module:460 MdlLiloOsList.module:312
-msgid "Name"
-msgstr "Name"
+#: FrmSelISO.class:270
+msgid "Search Again"
+msgstr "Search Again"
-#: FrmNetConf.class:184 MdlCore.module:484
-msgid "Network Configuration"
-msgstr "Network Configuration"
+#: FrmSummary.class:14 MdlCore.module:493
+msgid "Installation Summary"
+msgstr "Installation Summary"
+
+#: FrmSummary.class:17 MdlSummarize.module:56
+msgid "Custom"
+msgstr "Custom"
+
+#: FrmSummary.class:21 MdlSummarize.module:69
+msgid "Full"
+msgstr "Full"
-#: FMain.class:808
-msgid "Next"
-msgstr "Next"
+#: FrmSummary.class:37
+#, fuzzy
+msgid "Preparing Installation Summary ... Please wait"
+msgstr "Installation Summary"
-#: FMain.class:258
-msgid "No"
+#: FrmSummary.class:39
+msgid "Partition"
msgstr ""
-#: FrmSelISO.class:30 MdlCore.module:220
-msgid "No Installable Media Found"
-msgstr "No Installable Media Found"
+#: FrmSummary.class:43
+msgid "Filesystem"
+msgstr ""
-#: MdlWinDrives.module:186
-msgid "No Windows partitions detected"
-msgstr "No Windows partitions detected"
+#: FrmSummary.class:45
+msgid "Mount Point"
+msgstr ""
-#: MdlNetConf.module:92
-msgid "No ethernet neworking devices found"
+#: FrmSummary.class:46
+msgid "Format ?"
msgstr ""
-#: FrmSelISO.class:254
-msgid "No installable images found."
-msgstr "No installable images found."
+#: FrmSummary.class:52 MdlInstallSys.module:142 MdlPartSel.module:143
+msgid "Not Used"
+msgstr "Not Used"
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No, I Do Not Agree"
+#: FrmSummary.class:58
+#, fuzzy
+msgid "Do not Format"
+msgstr "Do not format"
-#: FrmSummary.class:91 MdlNetConf.module:244
+#: FrmSummary.class:99 MdlNetConf.module:245
msgid "None"
msgstr "None"
-#: FrmSummary.class:50 MdlInstallSys.module:142 MdlPartSel.module:143
-msgid "Not Used"
-msgstr "Not Used"
+#: FrmSummary.class:121 MdlInstallSys.module:190 MdlWinDrives.module:124
+msgid "Do not mount"
+msgstr "Do not mount"
-#: FrmUserAdd.class:443
-msgid "OK"
+#: FrmSummary.class:174 FrmUsrPkgSel.class:16
+msgid "Package Name"
msgstr ""
-#: MdlSummarize.module:62
-msgid "OPTIONAL PACKAGES:"
-msgstr "OPTIONAL PACKAGES:"
+#: FrmSummary.class:183
+msgid "BULK PACKAGES"
+msgstr ""
-#: MdlSummarize.module:49
-msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
-msgstr "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+#: FrmSummary.class:210
+msgid "USER-SELECTED PACKAGES"
+msgstr ""
-#: MdlLiloOsList.module:289
-msgid "Operating system installed in"
+#: FrmSummary.class:286
+msgid "Installation Type"
msgstr ""
-#: MdlPartSel.module:71 MdlWinDrives.module:74
-msgid "PARTITION"
-msgstr "PARTITION"
+#: FrmSummary.class:296
+msgid "Partition Selection Scheme"
+msgstr ""
-#: MdlSummarize.module:28
-msgid "PARTITIONING LAYOUT"
-msgstr "PARTITION LAYOUT"
+#: FrmSummary.class:306 FrmUsrPkgSel.class:147 MdlCore.module:490
+msgid "Software Selection"
+msgstr "Software Selection"
-#: FrmPkgSel.class:40
-msgid "Package"
+#: FrmUserAdd.class:54
+msgid "Create User Accounts"
msgstr ""
-#: FrmSummary.class:165 FrmUsrPkgSel.class:16
-msgid "Package Name"
+#: FrmUserAdd.class:92
+#, fuzzy
+msgid "Creating user account ... Please wait"
+msgstr "Calculating package count ... Please wait"
+
+#: FrmUserAdd.class:100
+msgid "Enter the login name that this user will user to login to this
system."
msgstr ""
-#: MdlInstallSys.module:371
-msgid "Packages have been installed in your system. Please click"
-msgstr "Packages have been installed to your system. Please click"
+#: FrmUserAdd.class:108
+msgid ""
+"Login name field contains illegal characters. Please use only lowercase "
+"letters and numbers"
+msgstr ""
-#: FrmSummary.class:38
-msgid "Partition"
+#: FrmUserAdd.class:122
+msgid "Username contains illegal characters"
msgstr ""
-#: FrmSummary.class:287
-msgid "Partition Selection Scheme"
+#: FrmUserAdd.class:125
+msgid "User account for"
msgstr ""
-#: FrmUserAdd.class:176
-msgid "Passwords do not match"
+#: FrmUserAdd.class:125
+msgid "already exists"
msgstr ""
-#: FMain.class:243
-msgid "Passwords do not match. Please enter the same password twice"
+#: FrmUserAdd.class:129
+msgid "Enter a password for"
msgstr ""
-#: FrmRootPass.class:50
-msgid "Passwords do not match. Please enter the same password twice for
accuracy."
+#: FrmUserAdd.class:186
+msgid "Passwords do not match"
msgstr ""
-#: FMain.class:222
-msgid "Please select a default operating system to boot before proceeding"
+#: FrmUserAdd.class:187
+msgid "Enter the same password twice"
msgstr ""
-#: MdlPartSel.module:289
-msgid "Please select only one "
-msgstr "Please select only one "
+#: FrmUserAdd.class:383
+msgid ""
+"Your password selections do not match. Please enter the same password
twice"
+msgstr ""
-#: FrmPartSel.class:181
-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:408
+msgid ""
+"Groups are a way of administering permissions for your users. You grant
the "
+"user"
+msgstr ""
-#: FMain.class:276
-msgid "Please specify a hostname for this computer"
+#: FrmUserAdd.class:408
+msgid "permission to do certain things by adding them to certain groups."
msgstr ""
-#: FMain.class:280
-msgid "Please specify the domain this computer belongs to"
+#: FrmUserAdd.class:408
+msgid "Select which groups you want this user to be a part of here"
msgstr ""
-#: FrmAlsaConf.class:36
-msgid "Please use the setup program below to setup the sound system."
+#: FrmUserAdd.class:409
+msgid "OK"
msgstr ""
-#: FMain.class:356
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Please wait while setup analyses your current partition setup."
+#: FrmUserAdd.class:471
+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."
-#: FMain.class:354
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr "Please wait while setup attempts to run the partitioning utility"
+#: FrmUserAdd.class:515
+msgid "Use Picture ID for Login greeting"
+msgstr ""
-#: MdlNetConf.module:131
-msgid "Plugged-in"
-msgstr "Plugged-in"
+#: FrmUserAdd.class:537
+msgid "Create User"
+msgstr "Create User"
-#: MdlCore.module:469
-msgid "Preparation"
-msgstr "Preparation"
+#: FrmUserAdd.class:543
+msgid "Clear Form"
+msgstr ""
-#: MdlSetup.module:319
-msgid "Preparing filesystems"
+#: FrmUserAdd.class:550
+msgid "Login Name"
msgstr ""
-#: FrmNetConf.class:243
-msgid "Primary DNS Server"
-msgstr "Primary DNS Server"
+#: FrmUserAdd.class:564
+msgid "ReEnter Password"
+msgstr "ReEnter Password"
-#: FrmXconf.class:27
-msgid "Probe hardware to setup your Graphical Environment using your
preffered settings"
+#: FrmUserAdd.class:580
+msgid "Real Name"
msgstr ""
-#: FrmLilo.class:267 FrmLiloSetup.class:263
-msgid "Prompt Timeout"
-msgstr "Prompt Timeout"
+#: FrmUserAdd.class:586 MdlCore.module:500
+msgid "User Accounts"
+msgstr "User Accounts"
-#: FrmRootPass.class:144
-msgid "Re-Enter Password"
-msgstr "Re-Enter Password"
+#: FrmUsrPkgSel.class:11
+msgid "To install them all, just click"
+msgstr ""
-#: FrmUserAdd.class:597
-msgid "ReEnter Password"
-msgstr "ReEnter Password"
+#: FrmUsrPkgSel.class:40
+#, fuzzy
+msgid "Reading available software selection ... Please wait"
+msgstr "Loagind gparted ... Please wait"
-#: FrmUserAdd.class:613
-msgid "Real 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"
+
+#: FrmXconf.class:25
+msgid "Uses the default (failsafe) configuration."
msgstr ""
-#: MdlCore.module:481
-msgid "Regional Settings"
-msgstr "Regional Settings"
+#: FrmXconf.class:27
+msgid ""
+"Probe hardware to setup your Graphical Environment using your preffered "
+"settings"
+msgstr ""
-#: FMain.class:195 FrmDone.class:28
-msgid "Restart"
+#: FrmXconf.class:29
+msgid "Use the console framebuffer driver"
msgstr ""
-#: MdlUsrAdd.module:65
-msgid "Restricted administrator (backup)"
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
msgstr ""
-#: MdlNetConf.module:300
-msgid "STATUS:"
-msgstr "STATUS:"
+#: FrmXconf.class:311
+msgid "Video Driver"
+msgstr ""
-#: MdlCore.module:204
-msgid "Scanning system for installable media. Please wait ..."
-msgstr "Scanning system for installable media. Please wait ..."
+#: FrmXconf.class:322
+msgid "Color Depth"
+msgstr ""
#: FrmXconf.class:328
msgid "Screen Resolution"
msgstr ""
-#: FrmSelISO.class:270
-msgid "Search Again"
-msgstr "Search Again"
+#: FrmXconf.class:335
+msgid "24 bit True Color"
+msgstr ""
-#: FrmNetConf.class:256
-msgid "Secondary DNS Server"
-msgstr "Secondary DNS Server"
+#: FrmXconf.class:335
+msgid "16 bit Pseudo Color"
+msgstr ""
-#: FrmLilo.class:278 FrmLiloSetup.class:274
-msgid "Seconds"
-msgstr "Seconds"
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
+msgstr ""
-#: FrmUserAdd.class:542
-msgid "Select"
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
msgstr ""
-#: FMain.class:223
-msgid "Select an entry from this list"
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
msgstr ""
-#: FrmSelISO.class:87
-msgid "Select installation media from the list below"
+#: FrmXconf.class:340
+msgid "Vesa"
msgstr ""
-#: FrmUserAdd.class:378
-msgid "Select picture for user Login"
+#: FrmXconf.class:342
+msgid "Fbdev"
msgstr ""
-#: 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"
+#: FrmXconf.class:348
+msgid "1920x1280"
+msgstr ""
-#: 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 "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"
+#: FrmXconf.class:348
+msgid "1600x1200"
+msgstr ""
-#: FrmPartScheme.class:71
-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."
+#: FrmXconf.class:348
+msgid "1440x900"
+msgstr ""
-#: FrmSelISO.class:260
-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"
+#: FrmXconf.class:348
+msgid "1280x1024"
+msgstr ""
-#: FrmUserAdd.class:442
-msgid "Select which groups you want this user to be a part of here"
+#: FrmXconf.class:348
+msgid "1280x800"
msgstr ""
-#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
-msgid "Select your indivirual packages to install."
-msgstr "Select your individual packages to install"
+#: FrmXconf.class:348
+msgid "1024x768"
+msgstr ""
-#: FrmLangSel.class:123
-msgid "Select your language"
-msgstr "Select your language"
+#: FrmXconf.class:348
+msgid "800x600"
+msgstr ""
-#: FrmRootPass.class:161
-msgid "Set Password"
-msgstr "Set Password"
+#: FrmXconf.class:348
+msgid "640x480"
+msgstr ""
-#: MdlNetConf.module:205
-msgid "Setup Mode"
-msgstr "Setup Mode"
+#: FrmZoneSet.class:21
+msgid "Timezone configuration"
+msgstr "Timezone configuration"
+
+#: FrmZoneSet.class:170
+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:175
+msgid "ComboBox1"
+msgstr "-"
+
+#: FrmZoneSet.class:177
+msgid "LocalTime"
+msgstr "LocalTime"
+
+#: FrmZoneSet.class:177
+msgid "UTC"
+msgstr "UTC"
+
+#: FrmZoneSet.class:182
+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."
+
+#: MdlConfLilo.module:97
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo returned an error. Please see below"
+
+#: MdlConfLilo.module:100
+msgid "Boot loader has been setup successfully"
+msgstr "Boot loader has been setup successfully"
-#: MdlCore.module:388
-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"
+#: MdlConfLilo.module:124
+msgid "MBR of "
+msgstr ""
-#: 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"
+#: MdlConfLilo.module:131 MdlLilo.module:98
+msgid "Bootsector of "
+msgstr ""
-#: MdlCore.module:222
-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 "
+#: MdlConfLilo.module:136 MdlLilo.module:100
+msgid "Floppy"
+msgstr ""
-#: 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:28
+#, fuzzy
+msgid "Working ... Please Wait"
+msgstr "Loagind gparted ... Please wait"
-#: FrmPkgSel.class:42 FrmSummary.class:40 FrmUsrPkgSel.class:19
-msgid "Size"
+#: MdlCore.module:221
+msgid "Scanning system for installable media. Please wait ..."
+msgstr "Scanning system for installable media. Please wait ..."
+
+#: MdlCore.module:239
+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 "
-#: FMain.class:230
-msgid "Skipping boot loaded setup"
+#: MdlCore.module:239
+msgid "installation CD and click"
msgstr ""
-#: FMain.class:459
-msgid "Skipping lilo setup"
-msgstr "Skipping lilo setup per user request"
+#: MdlCore.module:239
+msgid "to try again"
+msgstr "to try again"
-#: FrmSummary.class:297 FrmUsrPkgSel.class:143 MdlCore.module:473
-msgid "Software Selection"
-msgstr "Software Selection"
+#: MdlCore.module:400
+msgid "Build Date: "
+msgstr "Build Date: "
-#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:49
-msgid "Standard"
-msgstr "Standard"
+#: MdlCore.module:400
+msgid "MINIMUM REQUIREMENTS"
+msgstr "MINIMUM REQUIREMENTS"
-#: MdlNetConf.module:356
-msgid "Static IP Address Settings"
+#: MdlCore.module:405
+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"
-#: MdlNetConf.module:401
-msgid "Subnet Mask"
-msgstr "Subnet Mask"
+#: MdlCore.module:478
+msgid "Cannot find SETUP.CONF"
+msgstr "Cannot find SETUP.CONF"
-#: FrmRootPass.class:120 MdlCore.module:482
-msgid "System Administrator"
-msgstr "System Administrator"
+#: MdlCore.module:486
+msgid "Preparation"
+msgstr "Preparation"
-#: FrmRootPass.class:12
-msgid "System Administrator Password"
-msgstr "System Administrator Password"
+#: MdlCore.module:487
+msgid "Language Selection"
+msgstr "Language Selection"
-#: MdlCore.module:479
-msgid "System Configuration"
-msgstr "System Configuration"
+#: MdlCore.module:488
+msgid "Find installation media"
+msgstr "Find installation media"
-#: FrmLilo.class:230 FrmLiloSetup.class:292 FrmNetConf.class:279
-msgid "Tab 0"
-msgstr "-"
+#: MdlCore.module:489
+msgid "Disk Partitioning"
+msgstr "Disk Partitioning"
-#: FrmLilo.class:248 FrmLiloSetup.class:224
-msgid "Target"
-msgstr "Target"
+#: MdlCore.module:492
+msgid "Installation"
+msgstr "Installation"
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: MdlCore.module:495
+msgid "Install Operating System"
+msgstr "Install Operating System"
-#: FrmSummaryOld.class:87
-msgid "TextLabel1"
-msgstr "-"
+#: MdlCore.module:496
+msgid "System Configuration"
+msgstr "System Configuration"
-#: FrmLilo.class:37
-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"
+#: MdlCore.module:497
+msgid "Boot Menu Options"
+msgstr "Boot Menu Options"
-#: FrmRootPass.class:133
-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 privile...
[truncated message content] |
|
From: <cod...@go...> - 2008-12-01 22:22:18
|
Author: M0...@gm...
Date: Mon Dec 1 14:20:28 2008
New Revision: 332
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/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/FrmImportAccts.class
Log:
Fixed bug in importing user accounts with existing picture
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/sohouser/devel/installer/FrmDiskPart.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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/sohouser/devel/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 Dec 1 14:20:28 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/sohouser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Mon Dec 1 14:20:28 2008
@@ -27,7 +27,7 @@
PUBLIC SUB btBrowsePic_Click()
-
+ IF ME.pbLogin THEN ME.pbLogin.Delete
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"]
|
|
From: <cod...@go...> - 2008-12-01 22:16:17
|
Author: M0E.lnx
Date: Mon Dec 1 14:14:54 2008
New Revision: 331
Added:
branches/iVL/FrmImportAccts.class
branches/iVL/FrmImportAccts.form
branches/iVL/FrmResetSettings.class
branches/iVL/FrmResetSettings.form
branches/iVL/MdlImportAccts.module
branches/iVL/MdlResetSettings.module
Modified:
branches/iVL/.project
branches/iVL/FrmUserAdd.class
branches/iVL/MdlUsrAdd.module
Log:
began working on importing user accounts into new installation
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Dec 1 14:14:54 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmImportAccts
Version=0.1.11
Library=gb.gtk
Library=gb.form
Added: branches/iVL/FrmImportAccts.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmImportAccts.class Mon Dec 1 14:14:54 2008
@@ -0,0 +1,100 @@
+' 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 Form_Open()
+
+ WITH ME
+ .tlBanner.Text = "<b>" & .tlBanner.Text & "</b>"
+ END WITH
+ MdlImportAccts.LIST_EXISTING_ACCOUNTS()
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
+END
+
+PUBLIC SUB btBrowsePic_Click()
+
+
+
+ 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.pbLogin = NEW PictureBox(ME)
+ ME.pbLogin.Move(ME.tbPass2.left + ME.tbPass2.Width + 4,
ME.tlPasswd2.top, 64, 64)
+ ME.pbLogin.Picture = Picture[dialog.path]
+ ME.pbLogin.Stretch = TRUE
+
+
+
+END
+
+
+
+PUBLIC SUB btResetSettings_Click()
+
+
+ FrmResetSettings.Title = ("Reset settings for") & Space(1) &
Trim(ME.cbAccntList.Text)
+ FrmResetSettings.ShowDialog()
+
+END
+
+PUBLIC SUB btcancel_Click()
+
+ ME.Close()
+
+END
+
+PUBLIC SUB btImportAccnt_Click()
+
+ IF ME.tbPass1.Text = "" OR ME.tbPass2.Text = "" THEN
+ Message.Error(("Password fields cannot be blank. Please enter a
password for") & Space(1) & ME.cbAccntList.Text)
+ RETURN
+ END IF
+ IF ME.tbPass1.Text <> ME.tbPass2.Text THEN
+ Message.Error(("Selected passwords dont match. Please enter the same
password twice"))
+ RETURN
+ ELSE
+ ME.pbLogin.Delete
+ 'pbLogin = NEW PictureBox(ME)
+ 'me.pbLogin.Move(
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
+ 'ME.Close
+ 'ME.pbLogin.Picture.Image.Clear
+END IF
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlBanner.Move(4, 4)
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height + 1, .ClientWidth -
(.hrsep.Left * 2))
+ .tlLogin.Move(4, .hrsep.top + 8,
MdlObjSizer.get_object_width(.tlLogin.Text))
+ .cbAccntList.Move(.tlLogin.Left + .tlLogin.Width +
8, .tlLogin.Top, .tlLogin.Width * 2.5)
+ .tlPasswd.Move(4, .tlLogin.top + .tlLogin.Height + 8,
MdlObjSizer.get_object_width(.tlPasswd.Text))
+ .tbPass1.Move(4, .tlPasswd.top + .tlPasswd.Height + 4, 175)
+ .tlPasswd2.Move(.tbPass1.Left + .tbPass1.Width + 8, .tlPasswd.Top,
MdlObjSizer.get_object_width(.tlPasswd2.Text))
+ .tbPass2.Move(.tlPasswd2.Left, .tbPass1.top, 175)
+ .tlPicPath.Move(4, .tbPass1.top + .tbPass1.Height + 8,
MdlObjSizer.get_object_width(.tlPicPath.Text))
+ .btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8, .tlPicPath.top
+ .tlPicPath.Height + 8, MdlObjSizer.get_object_width(.btBrowsePic.Text) +
36)
+ .tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)
- (.tbPicPath.Left * 2) - 8)
+ .pbLogin.Move(.tbPass2.Left + .tbPass2.Width + 8, .tlPasswd2.top + 4,
48, 48)
+ '.btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8,.tbPass2.top
+ .tbPass1
+ END WITH
+
+END
Added: branches/iVL/FrmImportAccts.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmImportAccts.form Mon Dec 1 14:14:54 2008
@@ -0,0 +1,84 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,70,59)
+ Text = ("")
+ { tlLogin TextLabel
+ MoveScaled(1,8,9,3)
+ Text = ("Account")
+ Alignment = Align.Normal
+ }
+ { cbAccntList ComboBox
+ MoveScaled(11,8,17,3)
+ Text = ("")
+ ReadOnly = True
+ }
+ { tlPasswd TextLabel
+ MoveScaled(1,12,25,3)
+ Text = ("New Password")
+ }
+ { tbPass1 TextBox
+ MoveScaled(1,15,25,3)
+ Text = ("")
+ Password = True
+ }
+ { tbPass2 TextBox
+ MoveScaled(28,15,25,3)
+ Text = ("")
+ Password = True
+ }
+ { tlPicPath TextLabel
+ MoveScaled(1,19,35,3)
+ Text = ("Select login Image")
+ }
+ { tbPicPath TextBox
+ MoveScaled(1,22,53,3)
+ Text = ("")
+ }
+ { btBrowsePic Button
+ MoveScaled(55,22,11,3)
+ Text = ("Select")
+ Picture = Picture["icon:/small/open"]
+ }
+ { pbLogin PictureBox
+ MoveScaled(54,12,6,6)
+ }
+ { tlPasswd2 TextLabel
+ MoveScaled(28,12,25,3)
+ Text = ("Verify Password")
+ }
+ { ScrollView1 ScrollView
+ MoveScaled(1,26,66,18)
+ Expand = True
+ Border = False
+ { frmUsrGrps Frame
+ MoveScaled(0,0,65,15)
+ Text = ("User Rights Management")
+ }
+ }
+ { btResetSettings Button
+ MoveScaled(1,45,23,3)
+ Text = ("Reset settings")
+ Picture = Picture["icon:/small/undo"]
+ }
+ { btImportAccnt Button
+ MoveScaled(1,49,23,3)
+ Text = ("Import Account")
+ Picture = Picture["icon:/small/redo"]
+ }
+ { btcancel Button
+ MoveScaled(26,49,14,3)
+ Text = ("Cancel")
+ Picture = Picture["icon:/16/cancel"]
+ }
+ { tlBanner TextLabel
+ MoveScaled(0,0,43,3)
+ Expand = True
+ Text = ("Import Existing User Accounts")
+ Alignment = Align.Normal
+ }
+ { hrsep Separator
+ MoveScaled(1,4,16,1)
+ Expand = True
+ }
+}
Added: branches/iVL/FrmResetSettings.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmResetSettings.class Mon Dec 1 14:14:54 2008
@@ -0,0 +1,74 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PRIVATE pYes AS Picture = FrmPkgSel.pyes
+
+PUBLIC SUB Form_Open()
+
+ 'pyes = FrmPkgSel.pYes
+ ME.tlBanner.Text = "<b>" & tlbanner.text & "</b>"
+ ME.size_grid()
+ MdlResetSettings.LIST_RESETABLE_SETTINGS()
+
+END
+PUBLIC SUB size_grid()
+
+ WITH ME.gvSettings
+ .Columns.count = 3
+ .Columns[0].Width = 32
+ .Columns[1].Width = 400
+ .Columns[2].Width = 1
+ .Rows.Count = 1
+
+ END WITH
+
+END
+
+PUBLIC SUB gvSettings_Click()
+
+ IF LAST.column > 0 THEN RETURN
+
+ IF gvSettings[LAST.row, 0].Picture = pyes THEN
+ 'gvSettings[LAST.row, 0].Picture = FrmPkgSel.pNo
+ 'gvSettings[LAST.row, 0].Picture = FrmPkgSel.pno
+ gvSettings[LAST.row, 0].Clear()
+
+ ELSE
+ gvSettings[LAST.ROW, 0].Picture = pYes
+ END IF
+ gvSettings.Refresh()
+
+
+
+END
+
+PUBLIC SUB btDone_Click()
+
+ ME.Close
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlBanner.Move(4, 4)
+ .gvSettings.Move(4, .tlBanner.top + .tlBanner.Height + 4, .ClientWidth
- (.gvSettings.Left * 2), .ClientH - (.gvSettings.Top * 2))
+ .btDone.Move(4, .gvSettings.Top + .gvSettings.Height + 8,
MdlObjSizer.get_object_width(.btDone.Text) + 36, 21)
+ '.gvSettings.Columns[1].Width = .gvSettings.Width -
(.gvSettings.Columns[0].Width * 1.25)
+ END WITH
+
+
+
+END
Added: branches/iVL/FrmResetSettings.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmResetSettings.form Mon Dec 1 14:14:54 2008
@@ -0,0 +1,18 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,69,35)
+ Text = ("")
+ { tlBanner TextLabel
+ MoveScaled(1,1,40,3)
+ Text = ("Select which settings to reset")
+ }
+ { gvSettings GridView
+ MoveScaled(1,6,63,21)
+ }
+ { btDone Button
+ MoveScaled(2,28,10,3)
+ Text = ("Done")
+ Picture = Picture["icon:/small/apply"]
+ }
+}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Mon Dec 1 14:14:54 2008
@@ -45,10 +45,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- .FrmCurr = ME
- .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- .tvPlan["Conf3"].picture = MdlCore.sNowPic
- .tvPlan["Conf3"].Selected = TRUE
+ ' .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>"
@@ -73,7 +73,7 @@
END WITH
- MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.fGroupSel)
FMain.btnext.Enabled = TRUE
ME.tbUsername.SetFocus
END
@@ -294,7 +294,7 @@
.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)
- .btImportAcct.Move(.btClrFrm.Left + .btClrFrm.W + 4, .btClrFrm.top,
MdlObjSizer.get_object_width(.btImportAcct) + 36)
+ .btImportAcct.Move(.btClrFrm.Left + .btClrFrm.W + 4, .btClrFrm.top,
MdlObjSizer.get_object_width(.btImportAcct.Text) + 38)
'.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)
Added: branches/iVL/MdlImportAccts.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlImportAccts.module Mon Dec 1 14:14:54 2008
@@ -0,0 +1,29 @@
+' 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 SUB LIST_EXISTING_ACCOUNTS()
+
+ DIM sDir AS String
+ FOR EACH sdir IN Dir("/home", "*", gb.Directory)
+ IF sdir <> "ftp" THEN
+ IF FrmImportAccts.cbAccntList.Find(sdir) = -1 THEN
+ FrmImportAccts.cbAccntList.Add(sdir)
+ END IF
+ END IF
+ NEXT
+
+END
Added: branches/iVL/MdlResetSettings.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlResetSettings.module Mon Dec 1 14:14:54 2008
@@ -0,0 +1,67 @@
+' 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 pYes AS Picture
+PUBLIC SUB LIST_RESETABLE_SETTINGS()
+ DIM sFile, sDesc AS String
+ DIM i AS Integer
+ i = 0
+ pYes = FrmPkgSel.pYes
+
+ FOR EACH sfile IN Dir(User.home, "*")
+ SELECT CASE sFile
+
+ CASE ".kde"
+ sDesc = "KDE Settings (Menu, Window decorations, etc)"
+ CASE ".qt"
+ sDesc = "QT Toolkit settings (KDE Visual Effects)"
+ CASE ".gtkrc-*"
+ sDesc = "GTK Tookit theme Settings"
+ CASE ".Xdefaults"
+ sDesc = "X-window basic settings (includes xterm settings)"
+ CASE ".bashrc"
+ sDesc = "Bash init script"
+ CASE ".asoundrc"
+ sDesc = "Sound system preferences"
+ CASE ".xinitrc"
+ sDesc = "Graphical inteface preferences"
+ CASE "Desktop"
+ sDesc = "Desktop icons, folders, launchers"
+ CASE ".IceWM"
+ sDesc = "IceWM settings, preferences, menu"
+ CASE ".xmms"
+ sDesc = "XMMS Audio player preferences"
+ CASE ".Choices", "Choices"
+ sDesc = "ROX Filer Desktop settings"
+ CASE ".mplayer"
+ sDesc = "MPlayer Multimedia Player Settings"
+ CASE ELSE
+ sDesc = ""
+
+ END SELECT
+ IF sDesc THEN
+ 'INC i
+ INC FrmResetSettings.gvSettings.Rows.Count
+ FrmResetSettings.gvSettings[i, 1].Text = sDesc
+ FrmResetSettings.gvSettings[i, 2].Text = sFile
+ INC i
+ END IF
+ NEXT
+ FrmResetSettings.gvSettings.Columns[1].Width =
FrmResetSettings.gvSettings.Width -
(FrmResetSettings.gvSettings.Columns[0].Width * 1.75)
+ FrmResetSettings.gvSettings.Columns[2].Width = 0
+ DEC FrmResetSettings.gvSettings.Rows.Count
+END
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Mon Dec 1 14:14:54 2008
@@ -19,7 +19,7 @@
PUBLIC objGrps AS Object[]
-PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
+PUBLIC FUNCTION DISPLAY_USER_GROUP_OPTIONS(frmParent AS Frame)
DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,games,adm,sys,wheel,plugdev,disk"
DIM sGrpArr AS String[]
DIM i AS Integer
@@ -84,7 +84,8 @@
' ' ' htotal = x
' ' ' END IF
'y = 12
-cb = NEW CheckBox(FrmUserAdd.fGroupSel)
+'cb = NEW CheckBox(FrmUserAdd.fGroupSel)
+cb = NEW CheckBox(frmParent)
WITH cb
.text = sLabel
.Value = bdefval
@@ -104,7 +105,7 @@
' now move the objects to their places
x = 4
htotal = 4
- y = 16
+ y = 24
FOR EACH cb IN objGrps
cb.Move(x, y)
x = x + 116
@@ -120,6 +121,109 @@
END
+
+
+' PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
+' 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
+' DIM cb AS CheckBox
+' 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 "games"
+' 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
+' 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.fGroupSel.Width * 0.75 THEN
+' ' ' ' x = 4
+' ' ' ' y = y + 25
+' ' ' ' htotal = x
+' ' ' ' END IF
+' 'y = 12
+' cb = NEW CheckBox(FrmUserAdd.fGroupSel)
+' WITH cb
+' .text = sLabel
+' .Value = bdefval
+' .Height = 21
+' .Width = MdlObjSizer.get_object_width(.text) + 24
+' '.Move(x, y)
+' .ToolTip = sComment
+' 'y = y + cb.Height
+' x = x + 128
+' htotal = htotal + x
+' END WITH
+' objGrps.Add(cb)
+' 'y = y + cb.Height + 4
+' NEXT
+'
+'
+' ' now move the objects to their places
+' x = 4
+' htotal = 4
+' y = 16
+' FOR EACH cb IN objGrps
+' cb.Move(x, y)
+' x = x + 116
+' htotal = x
+' IF htotal >= FrmUserAdd.fGroupSel.Width * 0.70 THEN
+' htotal = 4
+' x = 4
+' y = y + cb.Height + 4
+' END IF
+' NEXT
+'
+'
+'
+'
+' END
PUBLIC FUNCTION CREATE_USER_ON_A_SNAP() AS Boolean
DIM bcont AS Boolean
|
|
From: <cod...@go...> - 2008-11-26 22:00:45
|
Author: M0E.lnx
Date: Wed Nov 26 13:58:57 2008
New Revision: 330
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmDiskPart.class
branches/iVL/FrmNetConf.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmSummary.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUsrPkgSel.class
branches/iVL/MdlCore.module
branches/iVL/MdlLilo.module
branches/iVL/MdlNetConf.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlPkgSel.module
branches/iVL/MdlPkgSelNew.module
branches/iVL/MdlWinDrives.module
Log:
Added status indicator
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Nov 26 13:58:57 2008
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:195
+#: FMain.class:196
msgid "Restart"
msgstr ""
-#: FMain.class:222
+#: FMain.class:223
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:223
+#: FMain.class:224
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:230
+#: FMain.class:231
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:243
+#: FMain.class:244
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "Yes"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "No"
msgstr ""
-#: FMain.class:276
+#: FMain.class:277
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:280
+#: FMain.class:281
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:295
+#: FMain.class:296
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:295
+#: FMain.class:296
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:354
+#: FMain.class:348
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:356
+#: FMain.class:350
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:356
+#: FMain.class:350
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:370
+#: FMain.class:364
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:459
+#: FMain.class:458
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:784
+#: FMain.class:797
msgid "Back"
msgstr ""
-#: FMain.class:796
+#: FMain.class:809
msgid "Exit Installation"
msgstr ""
-#: FMain.class:808
+#: FMain.class:821
msgid "Next"
msgstr ""
-#: FMain.class:822
+#: FMain.class:835
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Nov 26 13:58:57 2008
@@ -14,7 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmDiskPart.class:115
+#: FrmDiskPart.class:58
+msgid "When finished making changes, exit the partitioning application to
continue ..."
+msgstr ""
+
+#: FrmDiskPart.class:117
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Nov 26 13:58:57 2008
@@ -26,6 +26,10 @@
msgid "Full"
msgstr ""
+#: FrmSummary.class:37
+msgid "Preparing Installation Summary ... Please wait"
+msgstr ""
+
#: FrmSummary.class:39
msgid "Partition"
msgstr ""
@@ -51,7 +55,7 @@
msgstr ""
#: FrmSummary.class:58
-msgid "Do Not Format"
+msgid "Do not Format"
msgstr ""
#: FrmSummary.class:59
@@ -70,27 +74,27 @@
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:175
+#: FrmSummary.class:174
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:184
+#: FrmSummary.class:183
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:211
+#: FrmSummary.class:210
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:287
+#: FrmSummary.class:286
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:297
+#: FrmSummary.class:296
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:307
+#: FrmSummary.class:306
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Nov 26 13:58:57 2008
@@ -14,99 +14,103 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlCore.module:204
+#: MdlCore.module:28
+msgid "Working ... Please Wait"
+msgstr ""
+
+#: MdlCore.module:221
msgid "Scanning system for installable media. Please wait ..."
msgstr ""
-#: MdlCore.module:220
+#: MdlCore.module:237
msgid "No Installable Media Found"
msgstr ""
-#: MdlCore.module:222
+#: MdlCore.module:239
msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
msgstr ""
-#: MdlCore.module:222
+#: MdlCore.module:239
msgid "installation CD and click"
msgstr ""
-#: MdlCore.module:222
+#: MdlCore.module:239
msgid "to try again"
msgstr ""
-#: MdlCore.module:383
+#: MdlCore.module:400
msgid "Build Date: "
msgstr ""
-#: MdlCore.module:383
+#: MdlCore.module:400
msgid "MINIMUM REQUIREMENTS"
msgstr ""
-#: MdlCore.module:388
+#: MdlCore.module:405
msgid "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
msgstr ""
-#: MdlCore.module:461
+#: MdlCore.module:478
msgid "Cannot find SETUP.CONF"
msgstr ""
-#: MdlCore.module:469
+#: MdlCore.module:486
msgid "Preparation"
msgstr ""
-#: MdlCore.module:470
+#: MdlCore.module:487
msgid "Language Selection"
msgstr ""
-#: MdlCore.module:471
+#: MdlCore.module:488
msgid "Find installation media"
msgstr ""
-#: MdlCore.module:472
+#: MdlCore.module:489
msgid "Disk Partitioning"
msgstr ""
-#: MdlCore.module:473
+#: MdlCore.module:490
msgid "Software Selection"
msgstr ""
-#: MdlCore.module:475
+#: MdlCore.module:492
msgid "Installation"
msgstr ""
-#: MdlCore.module:476
+#: MdlCore.module:493
msgid "Installation Summary"
msgstr ""
-#: MdlCore.module:478
+#: MdlCore.module:495
msgid "Install Operating System"
msgstr ""
-#: MdlCore.module:479
+#: MdlCore.module:496
msgid "System Configuration"
msgstr ""
-#: MdlCore.module:480
+#: MdlCore.module:497
msgid "Boot Menu Options"
msgstr ""
-#: MdlCore.module:481
+#: MdlCore.module:498
msgid "Regional Settings"
msgstr ""
-#: MdlCore.module:482
+#: MdlCore.module:499
msgid "System Administrator"
msgstr ""
-#: MdlCore.module:483
+#: MdlCore.module:500
msgid "User Accounts"
msgstr ""
-#: MdlCore.module:484
+#: MdlCore.module:501
msgid "Network Configuration"
msgstr ""
-#: MdlCore.module:485
+#: MdlCore.module:502
msgid "Final Hardware Configuration"
msgstr ""
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Nov 26 13:58:57 2008
@@ -30,7 +30,7 @@
msgid "Do not mount"
msgstr ""
-#: MdlWinDrives.module:193
+#: MdlWinDrives.module:141
msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Nov 26 13:58:57 2008
@@ -189,6 +189,7 @@
DIM sLang AS String
'tvPlan.Refresh()
+ 'FMain.tlStatus.Text = ("Working ... Please wait")
FMain.btnext.Enabled = FALSE
@@ -314,14 +315,7 @@
END SELECT
- ' ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
- ' .tvPlan["Conf4"].Selected = TRUE
- ' END WITH FrmCurr.Hide
- ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
- ' .tvPlan["Conf4"].Selected = TRUE
- ' END WITH
+
frmNext.Reparent(FrmCurr.Parent)
frmNext.Show
@@ -348,7 +342,7 @@
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
'FMain.MovieBox1.Refresh
-
+ MdlCore.WARN_STATUS("")
WITH FrmPartScheme
IF .rbEditPartitions.Value = TRUE THEN
.tlChoiceExp.text = .tlChoiceExp.text & gb.NewLine &
gb.NewLine & "<b><br><br>" & ("Please wait while setup attampts to run the
partitioning utility") & "</b>"
@@ -363,7 +357,7 @@
'FMain.MovieBox1.Playing = TRUE
WAIT
-
+ MdlCore.warn_status_off()
CASE "FrmPartSel"
IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
@@ -372,6 +366,7 @@
RETURN
ELSE
' set the partition types
+ MdlCore.WARN_STATUS("")
MdlPartSel.SET_LINUX_PARTITION_TYPES()
IF ClsPartSel.bDoWin = TRUE THEN
frmNext = FrmWinDrives
@@ -381,16 +376,19 @@
END IF
END IF
+ MdlCore.warn_status_off()
CASE "FrmPkgSel"
'here we check what kind of install it is, simple or custom
'IF FrmPkgSel.rbCustom.Value = TRUE THEN
-
+ ' MdlCore.WARN_STATUS(("Reading available software
selection ... Please wait"))
IF ClsPkgSel.bCustom = TRUE THEN
'get the list of selected bulks only
'MdlPkgSel.GET_USER_BULK_SELECTION()
'frmNext = FrmPkgsel2
+
frmNext = FrmUsrPkgSel
+
ELSE
' Going for simple install. Now we are ready to summarize
' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '
MdlSummarize.SUMMARIZE_INSTALL
@@ -400,6 +398,7 @@
CASE "FrmPkgsel2" ', "FrmUsrPkgSel"
' summarize the build
+ 'MdlCore.WARN_STATUS(("Reading available software selection ...
Please wait"))
' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
'frmNext = install
@@ -577,6 +576,7 @@
END IF
tvPlan.Refresh()
ClsGlobal.sBackNav.Add(FrmCurr)
+'FMain.tlStatus.Text = ""
END
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Wed Nov 26 13:58:57 2008
@@ -20,37 +20,46 @@
}
}
{ Panel2 Panel
- MoveScaled(3,9,94,60)
+ MoveScaled(1,9,94,62)
Expand = True
Arrangement = Arrange.Horizontal
{ SidePanel1 SidePanel
- MoveScaled(1,1,26,63)
+ MoveScaled(0,0,26,63)
Background = Color.Background
Arrangement = Arrange.Vertical
Orientation = Align.Left
{ tvPlan TreeView
- MoveScaled(1,0,23,56)
+ MoveScaled(1,0,23,47)
Expand = True
Mode = Select.None
}
+ { HPanel1 HPanel
+ MoveScaled(2,49,21,4)
+ }
{ HBox2 HBox
- MoveScaled(1,56,72,6.7143)
+ MoveScaled(0,54,72,6.7143)
}
}
{ PnlRight Panel
- MoveScaled(31,4,57,48)
+ MoveScaled(31,1,57,48)
Expand = True
Arrangement = Arrange.Vertical
Border = Border.Etched
{ pnlwinhost Workspace
- MoveScaled(5,2,30,26)
+ MoveScaled(6,4,30,26)
Expand = True
}
{ HBox4 HBox
- MoveScaled(2,41,28,2)
+ MoveScaled(3,39,28,2)
+ { tlStatus TextLabel
+ MoveScaled(0,0,21,3)
+ Expand = True
+ Text = ("")
+ Alignment = Align.Center
+ }
}
{ HBox1 HBox
- MoveScaled(2,43,53,3)
+ MoveScaled(3,41,53,3)
{ btback Button
MoveScaled(0,0,8,3)
Expand = True
@@ -79,7 +88,7 @@
}
}
{ HBox3 HBox
- MoveScaled(7,46,12,2)
+ MoveScaled(8,44,12,2)
}
}
}
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Wed Nov 26 13:58:57 2008
@@ -55,6 +55,7 @@
FMain.btback.ForeColor = Color.Gray
FMain.btQuit.Enabled = FALSE
FMain.btQuit.ForeColor = Color.Gray
+ MdlCore.WARN_STATUS(("When finished making changes, exit the
partitioning application to continue ..."))
END
@@ -67,6 +68,7 @@
FrmDiskPart.tlBanner.Refresh
FrmDiskPart.tlBanner.Adjust
'Message("Exiting GParted")
+ MdlCore.warn_status_off()
WAIT 1
bReboot = MdlSetup.CHECK_IF_REBOOT_NEEDED()
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Wed Nov 26 13:58:57 2008
@@ -69,7 +69,7 @@
NEXT
' ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
FMain.btnext.Enabled = TRUE
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Wed Nov 26 13:58:57 2008
@@ -35,7 +35,7 @@
END
PUBLIC SUB Form_Open()
-
+ MdlCore.WARN_STATUS("")
ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>"
FMain.FrmCurr = ME
FMain.tvPlan["Prep2"].Selected = TRUE
@@ -50,7 +50,7 @@
.rbUseExisting.Width =
MdlObjSizer.get_object_width(.rbUseExisting.Text) + 24
END WITH
ME.rbUseExisting_Click()
-
+MdlCore.warn_status_off()
END
PUBLIC SUB rbUseExisting_Click()
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Wed Nov 26 13:58:57 2008
@@ -44,10 +44,10 @@
.Columns[1].Width = 120
.Columns[2].Width = 350
END WITH
-
+MdlCore.WARN_STATUS("")
ME.FILL_IN_BULK_LIST()
FMain.btnext.Enabled = TRUE
-
+MdlCore.warn_status_off()
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Wed Nov 26 13:58:57 2008
@@ -32,16 +32,13 @@
PUBLIC SUB Button1_Click()
+
+ MdlCore.WARN_STATUS("")
IF ME.tbPasswd1.Text = "" THEN
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)
- ' 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
@@ -53,10 +50,8 @@
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
+
+ MdlCore.warn_status_off()
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Nov 26 13:58:57 2008
@@ -34,7 +34,7 @@
DIM tl AS TextLabel
DIM bForm AS String
DIM sPart, sMountPnt, sFsType, sSize AS String
-
+ MdlCore.WARN_STATUS(("Preparing Installation Summary ... Please wait"))
ME.GridView1.Columns.count = 5
ME.GridView1.Columns[0].text = ("Partition")
ME.GridView1.Columns[0].Width =
MdlObjSizer.get_object_width("/dev/hda1***")
@@ -55,7 +55,7 @@
sMountPnt = cb.Text
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
- IF cb1.Text <> ("Do Not Format") THEN
+ IF cb1.Text <> ("Do not Format") THEN
bForm = ("Yes")
ELSE
bForm = ("No")
@@ -158,8 +158,7 @@
' MAYBE CREATE A SEPARATED ROW BY SETTING IT'S BG
COLOR TO SOMETHING BRIGHT AND BOLD FORE FONTS
-
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Nov 26 13:58:57 2008
@@ -89,6 +89,7 @@
DIM tl AS TextLabel
'DIM tly AS Integer
+MdlCore.WARN_STATUS(("Creating user account ... Please wait"))
' increment the number of user accounts created
INC MdlUsrAdd.iUsrAccts
@@ -138,14 +139,7 @@
NEXT
sGroups = Right(sGroups, Len(sGroups) - 1)
'Message(sGroups)
- 'need to do some binding for this to work
- 'PRINT "Mounting system locations with bind options"
- 'SHELL "mount -o bind /sys /mnt/target/sys" WAIT
- 'SHELL "mount -o bind /tmp /mnt/target/tmp" WAIT
- 'SHELL "mount -o bind /proc /mnt/target/proc" WAIT
- 'SHELL "mount -o bind /dev /mnt/target/dev" WAIT
- 'PRINT "Deleting old user group"
-
+
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
PRINT "Creating new user group"
@@ -164,8 +158,7 @@
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
'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"
+
'this next line is for kdm
SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
'the next lines are for gdm
@@ -200,15 +193,10 @@
ENDIF
ENDIF
ENDIF
- 'SHELL "umount /mnt/target/dev" WAIT
- 'SHELL "umount /mnt/target/proc" WAIT
- 'SHELL "umount /mnt/target/tmp" WAIT
- 'SHELL "umount /mnt/target/sys" WAIT
-
-'ME.LIST_NEW_USER_ACCOUNT()
+
ME.LstUsers.Visible = TRUE
ME.pbUsrPic.Visible = TRUE
-
+ MdlCore.warn_status_off()
END
PUBLIC SUB LIST_NEW_USER_ACCOUNT()
Modified: branches/iVL/FrmUsrPkgSel.class
==============================================================================
--- branches/iVL/FrmUsrPkgSel.class (original)
+++ branches/iVL/FrmUsrPkgSel.class Wed Nov 26 13:58:57 2008
@@ -23,8 +23,10 @@
.Columns[5].Resizable = FALSE
END WITH
+ MdlCore.WARN_STATUS("")
ME.LIST_PACKAGES
FMain.btnext.Enabled = TRUE
+'MdlCore.warn_status_off()
END
PUBLIC SUB LIST_PACKAGES()
@@ -35,6 +37,8 @@
DIM i, ii AS Integer
DIM sLine, sPkg, sDesc, sSize, sLoc AS String
+ MdlCore.WARN_STATUS(("Reading available software selection ... Please
wait"))
+
sPACKAGES = Split(sFile, "\n")
FOR i = 0 TO sPACKAGES.count - 1
@@ -80,7 +84,7 @@
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Wed Nov 26 13:58:57 2008
@@ -24,12 +24,27 @@
PUBLIC iLeftWidth AS Integer
PUBLIC frmInit AS Form
+PUBLIC FUNCTION WARN_STATUS(sText AS String)
+ IF NOT sText OR IF sText = "" THEN sText = ("Working ... Please Wait")
+ fmain.tlStatus.Text = (sText)
+
+END
+PUBLIC SUB warn_status_off()
+
+ fmain.tlStatus.Text = ""
+
+END
+
+
PUBLIC SUB FIND_ISO_ON_DRIVE(sDrive AS String)
DIM sISOList AS String[]
DIM sResults, sISO AS String
DIM i AS Integer
+
+ ME.WARN_STATUS("")
+
'Message(ClsGlobal.sSourceMnt)
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
SHELL "mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
@@ -60,7 +75,7 @@
NEXT
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
-
+ ME.warn_status_off
END
@@ -73,6 +88,7 @@
DIM i AS Integer
DIM sPartition AS String
+ME.WARN_STATUS("")
SHELL "probepart | grep -v -i \'swap\' | grep -v -i \'ext\' |grep
\'/dev\'| grep -v \'Disk\'| cut -f 1 -d \' \'" TO sResults
'Message(sResults)
@@ -87,7 +103,7 @@
NEXT
-
+ ME.warn_status_off
END
@@ -102,7 +118,7 @@
DIM sDump AS String
DIM i AS Integer
-
+ ME.WARN_STATUS("")
'ClsGlobal.sSourceMnt = "/mnt/source"
sMountPoint = ClsGlobal.sSourceMnt
@@ -142,7 +158,7 @@
MdlCore.unlock_gui()
fmain.btback.Enabled = FALSE
fmain.btback.ForeColor = Color.Gray
-
+ ME.warn_status_off
END
@@ -201,6 +217,7 @@
'RETURN
+ME.WARN_STATUS("")
FrmSelISO.tlDistroDesc.Text = "<b>" & ("Scanning system for installable
media. Please wait ...") & "</b>"
IF Exist(ClsGlobal.sSourceMnt) = FALSE THEN TRY MKDIR ClsGlobal.sSourceMnt
@@ -227,7 +244,7 @@
FMain.btnext.ForeColor = Color.Black
END IF
-
+ME.warn_status_off
' FMain.tvPlan["Prep0"].Selected
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 26 13:58:57 2008
@@ -30,13 +30,14 @@
PUBLIC FUNCTION TRIGGER_LILO_SETUP() AS Integer
DIM IRET AS Integer
+ MdlCore.WARN_STATUS("")
ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
'Moved binding to FMain.class right after packages finish installing.
'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
RETURN IRET
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Wed Nov 26 13:58:57 2008
@@ -57,6 +57,7 @@
DIM sApDump AS String
'DIM iwifix, iwifiy, iwifiboxwidth AS Integer
+ MdlCore.WARN_STATUS(("Probing your networking hardware ... Please
wait"))
'initiate the arrays
objCombos = NEW Object[]
@@ -340,6 +341,7 @@
IF ERROR THEN Message(Error.text & gb.newline & Error.where)
KILL "/tmp/iwdump"
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Nov 26 13:58:57 2008
@@ -44,7 +44,7 @@
DIM ii AS Integer
DIM sDrive, sPartNo, sBlank AS String
-
+ MdlCore.WARN_STATUS("")
' fire up the arrays
oFsTypes = NEW Object[]
@@ -261,7 +261,7 @@
-
+MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Wed Nov 26 13:58:57 2008
@@ -32,7 +32,7 @@
'File.Save(Temp("SETUP.CONF"), DConv(File.Load(ClsGlobal.sSourceMnt
&/ "veclinux" &/ "SETUP.CONF")))
'Message(File.Load(Temp("SETUP.CONF")))
Bulks = NEW Object[]
-
+ MdlCore.WARN_STATUS("")
sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine)
FOR i = 0 TO sFIle.count - 1
sLine = Trim(sFIle[i])
@@ -62,7 +62,7 @@
END IF
END IF
NEXT
-
+ MdlCore.warn_status_off()
END
@@ -107,105 +107,6 @@
END IF
NEXT
-
-END
-
-
-' ' ' PUBLIC SUB Packages_click()
-' ' '
-' ' '
-' ' '
-' ' ' IF ClsPkgSel.arrPkgs THEN
-' ' ' ClsPkgSel.arrPkgs.Clear
-' ' ' END IF
-' ' ' ME.GET_USER_PKG_SELECTION()
-' ' '
-' ' ' ' Now display a description here
-' ' '
-' ' '
-' ' ' 'PRINT sDump
-' ' '
-' ' ' END
-
-PUBLIC SUB Packages_enter()
-
-DIM sSearch AS String
-DIM sDump AS String
-DIM sArr AS String[]
-DIM i AS Integer
-DIM sDesc AS String
-
-
- sSearch = Right(LAST.tag, Len(LAST.tag) - InStr(LAST.tag, "/"))
- 'Message(sSearch)
- SHELL "pkgname " & sSearch TO sSearch
- sSearch = Trim(sSearch)
-
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT |
grep -m 8 \'" & sSearch & ":\' | cut -f2- -d \':\'" TO sDump
- sArr = Split(sDump, "\n")
- FOR i = 0 TO sArr.count - 1
- IF InStr(sArr[i], ":") = FALSE THEN
- sDesc = sDesc & sArr[i]
- END IF
- NEXT
-
- sDesc = Trim(sDesc)
- WITH FrmPkgsel2.tlPkgDesc
- .Move(4, 4, .Parent.Width - (.left * 2), .Parent.Height - (.top * 2))
- .text = Trim(sDesc)
- .Alignment = Align.Normal
- 'FrmPkgsel2.tlPkgDesc.Text = sDesc
- END WITH
-
-
-END
-
-
-
-
-
-' PUBLIC SUB OptBulks_click()
-'
-' IF ClsPkgSel.arrBulks THEN
-' ClsPkgSel.arrBulks.Clear
-' END IF
-' ME.GET_USER_BULK_SELECTION
-'
-' PRINT LAST.tag
-'
-' END
-' '
-' '
-PUBLIC SUB GET_USER_BULK_SELECTION()
-
- DIM cb AS CheckBox
- DIM sList AS String
- DIM sItem AS String
- DIM i AS Integer
- ' start the list
- ClsPkgSel.arrBulks = NEW String[]
- FOR EACH cb IN ME.Bulks
- IF cb.Value = TRUE THEN
- ClsPkgSel.arrBulks.Add(cb.tag)
- END IF
- NEXT ' just store them to the array for now. We will read the array at
install time
-
-
-END
-
-PUBLIC SUB GET_USER_PKG_SELECTION()
-
- DIM cb AS CheckBox
- DIM sList, sItem AS String
- DIM i AS Integer
- ' simply get the list of packages into the array, and we will read the
array while installing packages.
- ClsPkgSel.arrPkgs = NEW String[]
- FOR EACH cb IN ME.Pkgs
- IF cb.value = TRUE THEN
- ClsPkgSel.arrPkgs.Add(cb.Tag)
- END IF
- NEXT
-
END
Modified: branches/iVL/MdlPkgSelNew.module
==============================================================================
--- branches/iVL/MdlPkgSelNew.module (original)
+++ branches/iVL/MdlPkgSelNew.module Wed Nov 26 13:58:57 2008
@@ -1,5 +1,21 @@
' 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 SUB GET_LIST_OF_SELECTED_PACKAGES()
DIM i AS Integer
DIM sList AS String
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Wed Nov 26 13:58:57 2008
@@ -39,7 +39,7 @@
x = 4
y = 8
-
+MdlCore.WARN_STATUS("")
ME.oWMntPoints = NEW Object[]
ME.tlWnParts = NEW Object[]
@@ -131,60 +131,8 @@
y = y + tl.Height + 4
NEXT
- ' ' ' now do ntfs partitions the same way
- ' ' sDump1 = ""
- ' ' 'sDisks.Clear
- ' ' 'SHELL "probepart | grep -i ntfs | cut -f 1 -d \' \'" TO
sDump1\
- ' ' SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT16|FAT32|HPFS|NTFS|
Win)\' | cut -f 1 -d \' \'" TO sDump1
- ' ' sDump1 = Trim(sDump1)
- ' ' wintfs = Split(sDump1, "\n")
- ' ' FOR i = 0 TO wintfs.Count - 1
- ' ' sPartNo = Right(wintfs[i], Len(wintfs[i]) -
Len("/dev/hda"))
- ' ' IF Len(sPartNo) > 1 THEN
- ' ' sBlank = ""
- ' ' ELSE
- ' ' sBlank = " "
- ' ' END IF
- ' ' 'we need to know if this fails. it fails on a test machine
here with "bad partition table"
- ' ' SHELL "export s=$(parted " & Left(wintfs[i],
Len("/dev/hda")) & " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s |
cut -f 4 -d \' \'" TO sPartsize
- ' ' 'IF sPartSize.len = 0 THEN
- ' ' IF Len(sPartsize) = 0 THEN
- ' ' sPartSize = "UNKNOWN"
- ' ' ENDIF
- ' ' tl = NEW TextLabel(FrmWinDrives.svWinDrives)
- ' ' WITH tl
- ' ' .y = y
- ' ' .x = x
- ' ' .text = wintfs[i] & " [ " & sPartsize & " ]"
- ' ' .Width = 200
- ' ' .Height = 21
- ' ' .tag = wintfs[i]
- ' ' .Alignment = Align.Normal
- ' ' END WITH
- ' ' ME.tlWnParts.Add(tl)
- ' ' cb = NEW ComboBox(FrmWinDrives.svWinDrives)
- ' ' WITH cb
- ' ' .x = cbx
- ' ' .y = tl.top
- ' ' .Width = tl.Width * 0.75
- ' ' .Height = 21
- ' ' .tag = wintfs[i]
- ' ' .Add("/mnt" &/ Right(.tag, Len(.tag) -
RInStr(.tag, "/")))
- ' ' .Add(("Do not mount"))
- ' '
- ' ' '.ReadOnly = TRUE
- ' ' END WITH
- ' ' ME.oWMntPoints.Add(cb)
- ' '
- ' '
- ' '
- ' ' y = y + tl.Height + 4
- ' ' NEXT
- ' '
- ' '
- ' '
- ' '
- ' ' 'END IF
+ MdlCore.warn_status_off()
+
ELSE
' no widnows partitions found
|
|
From: <cod...@go...> - 2008-11-26 19:49:46
|
Author: M0E.lnx
Date: Wed Nov 26 11:49:26 2008
New Revision: 329
Modified:
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.project
branches/iVL/FrmSummary.class
branches/iVL/installer.gambas
Log:
- Fixed problem with filesystem being reported wrong for ntfs partitions
- Added column to partition selection summary to include "Format Yes/No"
value
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Nov 26 11:49:26 2008
@@ -26,55 +26,71 @@
msgid "Full"
msgstr ""
-#: FrmSummary.class:38
+#: FrmSummary.class:39
msgid "Partition"
msgstr ""
-#: FrmSummary.class:40
+#: FrmSummary.class:41
msgid "Size"
msgstr ""
-#: FrmSummary.class:42
+#: FrmSummary.class:43
msgid "Filesystem"
msgstr ""
-#: FrmSummary.class:44
+#: FrmSummary.class:45
msgid "Mount Point"
msgstr ""
-#: FrmSummary.class:50
+#: FrmSummary.class:46
+msgid "Format ?"
+msgstr ""
+
+#: FrmSummary.class:52
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:91
+#: FrmSummary.class:58
+msgid "Do Not Format"
+msgstr ""
+
+#: FrmSummary.class:59
+msgid "Yes"
+msgstr ""
+
+#: FrmSummary.class:61
+msgid "No"
+msgstr ""
+
+#: FrmSummary.class:99
msgid "None"
msgstr ""
-#: FrmSummary.class:113
+#: FrmSummary.class:121
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:165
+#: FrmSummary.class:175
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:174
+#: FrmSummary.class:184
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:201
+#: FrmSummary.class:211
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:277
+#: FrmSummary.class:287
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:287
+#: FrmSummary.class:297
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:297
+#: FrmSummary.class:307
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 26 11:49:26 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.10
+Version=0.1.11
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Nov 26 11:49:26 2008
@@ -32,9 +32,10 @@
DIM cb AS ComboBox
DIM cb1 AS ComboBox
DIM tl AS TextLabel
+ DIM bForm AS String
DIM sPart, sMountPnt, sFsType, sSize AS String
- ME.GridView1.Columns.count = 4
+ ME.GridView1.Columns.count = 5
ME.GridView1.Columns[0].text = ("Partition")
ME.GridView1.Columns[0].Width =
MdlObjSizer.get_object_width("/dev/hda1***")
ME.GridView1.Columns[1].text = ("Size")
@@ -42,6 +43,7 @@
ME.GridView1.Columns[2].text = ("Filesystem")
ME.GridView1.Columns[2].Width =
MdlObjSizer.get_object_width(("Filesystem")) * 1.25
ME.GridView1.Columns[3].text = ("Mount Point")
+ ME.GridView1.Columns[4].Text = ("Format ?")
'ME.GridView1.Columns[3].Width =
MdlObjSizer.get_object_width(ME.GridView1.Columns[3].text)
' tricky part to list the partitions on the summary
@@ -53,6 +55,11 @@
sMountPnt = cb.Text
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
+ IF cb1.Text <> ("Do Not Format") THEN
+ bForm = ("Yes")
+ ELSE
+ bForm = ("No")
+ END IF
NEXT
FOR EACH tl IN MdlPartSel.oPartLbls
IF tl.tag = cb.tag THEN
@@ -66,6 +73,7 @@
.GridView1[irow, 1].text = sSize
.GridView1[irow, 2].text = sFsType
.GridView1[irow, 3].Text = sMountPnt
+ .GridView1[irow, 4].Text = bForm
END WITH
INC irow ' increase this value... this determines the row
to use.
END IF
@@ -124,7 +132,9 @@
NEXT
'sFsType = "Windows"
- SHELL "l=$(probepart | grep " & cb.tag & "); echo $l | cut
-f 6,7 -d \' \'" TO sFsType
+ 'SHELL "l=$(probepart | grep " & cb.tag & "); echo $l | cut
-f 6,7 -d \' \'" TO sFsType
+ SHELL "probepart | grep ^" & cb.Tag & " | tr -s \' \'\"\" |
cut -f 6 -d \' \'" TO sFsType
+ sFsType = Trim(sFsType)
WITH ME
.GridView1[irow, 0].text = sPart
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-26 19:35:41
|
Author: M0E.lnx
Date: Wed Nov 26 11:34:57 2008
New Revision: 328
Modified:
branches/iVL/.project
branches/iVL/FrmUserAdd.class
branches/iVL/installer.gambas
Log:
Fixed problem with status of root password being left behind as current
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 26 11:34:57 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.9
+Version=0.1.10
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Nov 26 11:34:57 2008
@@ -45,10 +45,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- ' .FrmCurr = ME
- ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
- ' .tvPlan["Conf3"].Selected = TRUE
+ .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>"
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-26 16:44:27
|
Author: M0E.lnx
Date: Wed Nov 26 08:43:39 2008
New Revision: 327
Modified:
branches/iVL/MdlNetConf.module
Log:
fixed problem with read-only textbox in wireless network setup
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Wed Nov 26 08:43:39 2008
@@ -267,7 +267,7 @@
.Height = 21
.Password = TRUE
.Move(iwifiboxleft, tl.Top)
- .Enabled = FALSE
+ .Enabled = TRUE
.tag = sDev
END WITH
objtxtWifiKey.Add(tb)
@@ -278,14 +278,18 @@
.Height = 21
.Alignment = Align.Normal
.Move(iWifix, tb.top + tb.Height + 4)
+ '.Enabled = TRUE
+ '.ReadOnly = FALSE
END WITH
tb = NEW TextBox(FrmNetConf.TSNetDevices)
WITH tb
.tag = sDev
- .ReadOnly = TRUE
+ '.ReadOnly = TRUE
.Width = iwifiboxwidth
.Height = 21
.Move(iwifiboxleft, tl.Top)
+ .ReadOnly = FALSE
+
' add the access points here
END WITH
objcbWifiessid.Add(tb)
|
|
From: <cod...@go...> - 2008-11-26 16:12:19
|
Author: M0E.lnx
Date: Wed Nov 26 08:10:32 2008
New Revision: 326
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/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/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
DevLog
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/.project
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlCore.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlDiskPart.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPartSel.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSetup.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 26 08:10:32 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.8
+Version=0.1.9
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Address=M0...@gm...
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Nov 26 08:10:32 2008
@@ -1,5 +1,5 @@
-- Fixed list of user accounts created
-- Fixed LILO errors
-- Added default append line values
-- Updated binary
-- Installer is ready for testing.
\ No newline at end of file
+- Fixed typo in gparted module
+- Fixed issue with user icon now showing up after first user account.
+- Added auto-modifying of -cli lilo entry if the chosen label is too long.
Added warning to user interface to warn accordingly
+- Relabeled "Sector" to "Bootsector of" in LIlo setup
+- Fine tuned lilo target options in the search for a floppy drive
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Nov 26 08:10:32 2008
@@ -23,6 +23,23 @@
PUBLIC otb AS Object[]
+PUBLIC SUB CHECK_FOR_EXISTING_USER_ACCOUNTS()
+
+ DIM sDump AS String
+
+ 'EXEC ["ls", clsglobal.sTargetMnt &/ "home", "|", "grep", "-v", "ftp"]
TO sDump
+ SHELL "ls " & clsglobal.sTargetMnt &/ "home | grep -v ftp" TO sDump
+ sDump = Trim(sDump)
+
+ IF Len(sDump) > 0 THEN FrmUserAdd.btImportAcct.Enabled = TRUE
+
+
+
+END
+
+
+
+
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
@@ -189,7 +206,8 @@
'SHELL "umount /mnt/target/sys" WAIT
'ME.LIST_NEW_USER_ACCOUNT()
- ME.LstUsers.Visible = TRUE
+ ME.LstUsers.Visible = TRUE
+ ME.pbUsrPic.Visible = TRUE
END
@@ -288,6 +306,7 @@
.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)
+ .btImportAcct.Move(.btClrFrm.Left + .btClrFrm.W + 4, .btClrFrm.top,
MdlObjSizer.get_object_width(.btImportAcct) + 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)
@@ -307,47 +326,6 @@
cb.Move(icbspace, icby)
icbspace = icbspace + 116
NEXT
- '
- ' ' FOR EACH cb IN MdlUsrAdd.objGrps
- ' ' 'icbspace = icbspace + cb.Height + 4
- ' ' IF icbspace >= .fGroupSel.Height * 0.60 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
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Wed Nov 26 08:10:32 2008
@@ -100,11 +100,16 @@
Alignment = Align.Normal
}
{ frmUserList Frame
- MoveScaled(35,16,18.8889,17)
+ MoveScaled(35,16,18.8571,17)
Text = ("User Accounts")
{ LstUsers ScrollView
MoveScaled(1,2,17,13)
Border = False
}
+ }
+ { btImportAcct Button
+ MoveScaled(30,63,24,1)
+ Text = ("Import Existing User Accounts")
+ Picture = Picture["icon:/small/redo"]
}
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Nov 26 08:10:32 2008
@@ -121,24 +121,20 @@
sList = Trim(sList)
sListarr = Split(sList, "\n").Sort(gb.Ascent)
FOR i = 0 TO sListarr.count - 1
- sTarget = "MBR of " & Trim(sListarr[i])
+ sTarget = (("MBR of ")) & Trim(sListarr[i])
'FrmLilo.LiloTarget.Add(sTarget)
FrmLiloSetup.cbLIloTarget.Add(sTarget)
NEXT
'WITH FrmLilo.LiloTarget
WITH FrmLiloSetup.cbLIloTarget
- IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
-
- .Add("Sector")
- END IF
-
+ IF LCase(ClsPartSel.fRoot) <> "xfs" THEN .Add(("Bootsector of ")
& ClsPartSel.sRoot)
+ '.Add(("Bootsector of ")) & ClsPartSel.sRoot
+ 'END IF
-
- SHELL "lsdev | grep floppy" TO sDump
- IF sDump <> "" THEN
- .Add("Floppy")
- END IF
+ SHELL "lsdev | grep -i floppy" TO sDump
+ IF sDump <> "" THEN .Add(("Floppy"))
+ 'END IF
END WITH
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Wed Nov 26 08:10:32 2008
@@ -77,7 +77,7 @@
REPEAT
aHandle = Desktop.Find(Trim(sTypes[i]) & " - GParted")
INC i
- UNTIL aHandle.coun > 0 OR i = sTypes.Count - 1
+ UNTIL aHandle.count > 0 OR i = sTypes.Count - 1
END IF
IF aHandle.count = 0 THEN
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 26 08:10:32 2008
@@ -92,11 +92,11 @@
DIM iTimeOut AS Integer
sTarget = Trim(FrmLiloSetup.cbLIloTarget.Text)
- IF InStr(sTarget, "MBR of") THEN
+ IF InStr(sTarget, ("MBR of")) THEN
sTarget = Right(sTarget, Len(sTarget) - InStr(sTarget, "/") + 1)
- ELSE IF sTarget = "Sector" THEN
+ ELSE IF sTarget = ("Bootsector of ") & ClsPartSel.sRoot THEN
sTarget = ClsPartSel.sRoot
- ELSE IF sTarget = "Floppy" THEN
+ ELSE IF sTarget = ("Floppy") THEN
sTarget = "/dev/df0"
END IF
@@ -177,6 +177,12 @@
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
+ ' validate length of -tui entry
+ IF Len(sLabel) + Len("-tui") > 15 THEN
+ Message.warning(("Your option to boot") &
Space(1) & sLabel & Space(1) & ("is too long. it has been adjusted to
\"Vector-cli\". You can run vasmCC after the first boot to modify your boot
options"))
+ sLabel = "Vector"
+
+ END IF
sClisection = "image = " & sBootPath &/ sKernel & "\n"
&
"root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
"label = " & sLabel & "-tui" & "\n" &
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-25 16:50:41
|
Author: uelsk8s
Date: Tue Nov 25 08:48:38 2008
New Revision: 325
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/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/FMain.class
branches/iVL/MdlConfLilo.module
branches/iVL/installer.gambas
Log:
added success dialog for user after reboot
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /root/gui-installer/FrmDiskPart.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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /root/gui-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 Tue Nov 25 08:48:38 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Nov 25 08:48:38 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.5
+Version=0.1.8
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,6 +17,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Address=M0...@gm...
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 25 08:48:38 2008
@@ -459,7 +459,7 @@
FrmLilo.tlBanner.Text = "<b>" & ("Skipping lilo setup") & "</b>"
END IF
END IF
- SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
+ 'SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
'frmNext = FrmLiloOsList
frmNext = FrmZoneSet
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Nov 25 08:48:38 2008
@@ -303,7 +303,7 @@
DIM cb AS CheckBox
DIM cbox AS ComboBox
' SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
-SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
+SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart" WAIT
EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetMnt &/ "sys"] WAIT
' SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
EXEC ["mount", "-o", "bind", "/proc", ClsGlobal.sTargetMnt &/ "proc"] WAIT
@@ -353,6 +353,14 @@
SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
SHELL "touch " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
sOut = "#!/bin/bash \n" &
+ ". /sbin/vasm-functions \n" &
+ "TEXT=\" \n" &
+ "Vector Linux Has been Installed. \n" &
+ " \n" &
+ "On the next screen you will have the option to configure the GUI. \n" &
+ "Enjoy AND happy Vectoring...\" \n" &
+ "$DCMD --backtitle \"$BACKTITLE\" --title \"CONGRATULATIONS\" " &
+ "--msgbox \"$TEXT\" 0 0 2>/dev/NULL \n" &
"/sbin/vxconf \n" &
"#/sbin/config-stage1 gui-installer" & gb.NewLine
File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",
sOut)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-24 20:30:49
|
Author: M0E.lnx
Date: Mon Nov 24 12:29:42 2008
New Revision: 324
Modified:
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/MdlConfLilo.module
branches/iVL/installer.gambas
Log:
Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 24 12:29:42 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FMain
-Version=0.1.4
+Startup=MdlCore
+Version=0.1.5
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 24 12:29:42 2008
@@ -229,7 +229,7 @@
ELSE
FrmLiloSetup.tlBanner.Text = "<b>" & ("Skipping boot loaded setup")
& "</b>"
END IF
- SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
+ 'SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
frmNext = FrmZoneSet
CASE "FrmZoneSet"
@@ -433,7 +433,7 @@
ELSE
FrmLiloSetup.tlBanner.Text = "<b>" & ("Skipping boot loaded setup")
& "</b>"
END IF
- SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
+ 'SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
frmNext = FrmZoneSet
CASE "FrmLilo"
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Mon Nov 24 12:29:42 2008
@@ -303,6 +303,7 @@
DIM cb AS CheckBox
DIM cbox AS ComboBox
' SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
+SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetMnt &/ "sys"] WAIT
' SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
EXEC ["mount", "-o", "bind", "/proc", ClsGlobal.sTargetMnt &/ "proc"] WAIT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-24 19:35:36
|
Author: M0E.lnx
Date: Mon Nov 24 11:34:42 2008
New Revision: 323
Modified:
branches/iVL/.project
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
More accurate windows install detection. Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 24 11:34:42 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=FMain
-Version=0.1.7
+Version=0.1.4
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Mon Nov 24 11:34:42 2008
@@ -404,6 +404,7 @@
'IF sLook LIKE "winnt" OR IF sLook
LIKE "windows" THEN
IF UCase(sLook) LIKE "WINNT" OR IF
UCase(sLook) LIKE "WINDOWS" THEN
'if Exist(sTmpMountPoint &/ sLook &/
+ IF Exist(sTmpMountPoint &/ sLook &/ "system32"
&/ "winver.exe") OR Exist(sTmpMountPoint &/ sLook &/ "System32"
&/ "winver.exe") OR Exist(sTmpMountPoint &/ sLook &/ "SYSTEM32"
&/ "winver.exe") THEN
' IF Exist(sTmpMountPoint &/ LIKE "winnt" &/
LIKE "system32" &/ LIKE "winver") THEN
@@ -418,7 +419,7 @@
END IF
-' END IF
+ END IF
' END IF
NEXT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
14 messages has been excluded from this view by a project administrator.
