[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-cvs
Subject: [IPCop-cvs] CVS: installer earlymethods.c,1.6,1.7 fsedit.c,1.5,1.6 hd.c,1.3,1.4 install.c,1.8,1.9 in
From: Mark Wormgoor <riddles () users ! sourceforge ! net>
Date: 2003-04-22 12:36:08
[Download RAW message or body]
Update of /cvsroot/ipcop/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv3738
Modified Files:
earlymethods.c fsedit.c hd.c install.c install2.c lilo.c
urlmethod.c
Log Message:
Textblock customization
Index: earlymethods.c
===================================================================
RCS file: /cvsroot/ipcop/installer/earlymethods.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** earlymethods.c 1 Apr 2003 13:53:22 -0000 1.6
--- earlymethods.c 22 Apr 2003 12:35:54 -0000 1.7
***************
*** 276,280 ****
rc = newtWinChoice(_("Note"), _("Ok"), ("Back"),
! _("Insert your Red Hat CD into your CD drive now"));
if (rc == 2) return INST_CANCEL;
--- 276,280 ----
rc = newtWinChoice(_("Note"), _("Ok"), ("Back"),
! _("Insert your IPCop CD into your CD drive now"));
if (rc == 2) return INST_CANCEL;
***************
*** 303,307 ****
newtWinMessage(_("Error"), _("Ok"),
_("That CDROM device does "
! "not seem to contain a Red Hat CDROM."));
return INST_CANCEL;
}
--- 303,307 ----
newtWinMessage(_("Error"), _("Ok"),
_("That CDROM device does "
! "not seem to contain a IPCop CDROM."));
return INST_CANCEL;
}
***************
*** 443,447 ****
rc = newtWinChoice(_("PCMCIA Disk"), _("Ok"), _("Cancel"),
_("I failed to mount the floppy. Please insert the "
! "Red Hat PCMCIA disk, or choose "
"Cancel to pick a different installation process."));
if (rc == 2) return INST_CANCEL;
--- 443,447 ----
rc = newtWinChoice(_("PCMCIA Disk"), _("Ok"), _("Cancel"),
_("I failed to mount the floppy. Please insert the "
! "IPCop PCMCIA disk, or choose "
"Cancel to pick a different installation process."));
if (rc == 2) return INST_CANCEL;
***************
*** 493,497 ****
rc = newtWinChoice(_("Supplemental Disk"), _("Ok"), _("Cancel"),
_("I failed to mount the floppy. Please insert the "
! "Red Hat Supplementary Install disk, or choose "
"Cancel to pick a different installation process."));
if (rc == 2) return INST_CANCEL;
--- 493,497 ----
rc = newtWinChoice(_("Supplemental Disk"), _("Ok"), _("Cancel"),
_("I failed to mount the floppy. Please insert the "
! "IPCop Supplementary Install disk, or choose "
"Cancel to pick a different installation process."));
if (rc == 2) return INST_CANCEL;
***************
*** 512,516 ****
_("This install method requires a driver disk. Please remove "
"the supplemental disk currently in your drive and replace it with "
! "the Red Hat Modules disk."));
if (rc == 2) return INST_CANCEL;
--- 512,516 ----
_("This install method requires a driver disk. Please remove "
"the supplemental disk currently in your drive and replace it with "
! "the IPCop Modules disk."));
if (rc == 2) return INST_CANCEL;
***************
*** 524,528 ****
rc = newtWinChoice(_("Driver Disk"), _("Ok"), _("Cancel"),
_("I failed to mount the floppy. Please insert the "
! "Red Hat Module disk, or choose "
"Cancel to pick a different installation process."));
if (rc == 2) return INST_CANCEL;
--- 524,528 ----
rc = newtWinChoice(_("Driver Disk"), _("Ok"), _("Cancel"),
_("I failed to mount the floppy. Please insert the "
! "IPCop Module disk, or choose "
"Cancel to pick a different installation process."));
if (rc == 2) return INST_CANCEL;
***************
*** 567,571 ****
_("This install method requires two additional disks. Please remove "
"the boot disk currently in your drive and replace it with "
! "the Red Hat Supplementary Install disk."));
if (rc == 2) return INST_CANCEL;
--- 567,571 ----
_("This install method requires two additional disks. Please remove "
"the boot disk currently in your drive and replace it with "
! "the IPCop Supplementary Install disk."));
if (rc == 2) return INST_CANCEL;
***************
*** 630,634 ****
}
! label = newtLabel(-1, -1, _("Directory holding Red Hat:"));
dirEntry = newtEntry(28, 11, defaultDir, 28, &dir, NEWT_ENTRY_SCROLL);
--- 630,634 ----
}
! label = newtLabel(-1, -1, _("Directory holding IPCop:"));
dirEntry = newtEntry(28, 11, defaultDir, 28, &dir, NEWT_ENTRY_SCROLL);
***************
*** 704,708 ****
newtWinMessage(_("Error"), _("Ok"),
_("Device %s does not appear to contain "
! "a Red Hat installation tree."), part->device);
umount("/tmp/hdimage");
continue;
--- 704,708 ----
newtWinMessage(_("Error"), _("Ok"),
_("Device %s does not appear to contain "
! "an IPCop installation tree."), part->device);
umount("/tmp/hdimage");
continue;
Index: fsedit.c
===================================================================
RCS file: /cvsroot/ipcop/installer/fsedit.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fsedit.c 1 Apr 2003 13:53:22 -0000 1.5
--- fsedit.c 22 Apr 2003 12:35:59 -0000 1.6
***************
*** 2230,2234 ****
_("You have more drives than this program supports. "
"Please use the standard fdisk program to setup your "
! "drives and please notify Red Hat Software that you "
"saw this message."));
return INST_ERROR;
--- 2230,2234 ----
_("You have more drives than this program supports. "
"Please use the standard fdisk program to setup your "
! "drives and please notify the IPCop Project that you "
"saw this message."));
return INST_ERROR;
***************
*** 2372,2376 ****
_("There are partitions that can be "
"resized nondestructively to make "
! "room for your Red Hat Linux "
"installation. Do you want to resize "
"these partitions now?"));
--- 2372,2376 ----
_("There are partitions that can be "
"resized nondestructively to make "
! "room for your IPCop Firewall "
"installation. Do you want to resize "
"these partitions now?"));
***************
*** 2451,2455 ****
_("You have more drives than this program supports. "
"Please use the standard fdisk program to setup your "
! "drives and please notify Red Hat Software that you "
"saw this message."));
return INST_ERROR;
--- 2451,2455 ----
_("You have more drives than this program supports. "
"Please use the standard fdisk program to setup your "
! "drives and please notify the IPCop Project that you "
"saw this message."));
return INST_ERROR;
Index: hd.c
===================================================================
RCS file: /cvsroot/ipcop/installer/hd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hd.c 28 Mar 2003 15:51:01 -0000 1.3
--- hd.c 22 Apr 2003 12:36:02 -0000 1.4
***************
*** 291,295 ****
}
! text = _("To install Red Hat Linux, you must have at least one partition "
"of 150 MB dedicated to Linux. We suggest placing that partition "
"on one of the first two hard drives in your system so you can "
--- 291,295 ----
}
! text = _("To install the IPCop Firewall, you must have at least one partition "
"of 150 MB dedicated to Linux. We suggest placing that partition "
"on one of the first two hard drives in your system so you can "
***************
*** 385,389 ****
"partitions. While this is not critical, you must "
"reboot your machine before proceeding. Insert the "
! "Red Hat boot disk now and press Return to reboot "
"your system.\n\n"
"If you have a ZIP or JAZ drive, make sure there is "
--- 385,389 ----
"partitions. While this is not critical, you must "
"reboot your machine before proceeding. Insert the "
! "IPCop boot disk now and press Return to reboot "
"your system.\n\n"
"If you have a ZIP or JAZ drive, make sure there is "
Index: install.c
===================================================================
RCS file: /cvsroot/ipcop/installer/install.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.c 22 Apr 2003 12:21:12 -0000 1.8
--- install.c 22 Apr 2003 12:36:02 -0000 1.9
***************
*** 61,73 ****
void welcome(void) {
if (!testing) {
! newtWinMessage("Red Hat Linux", _("Ok"),
! _("Welcome to Red Hat Linux!\n\n"
"This installation process is outlined in detail in the "
! "Official Red Hat Linux Installation Guide available from "
! "Red Hat Software. If you have access to this manual, you "
! "should read the installation section before continuing.\n\n"
! "If you have purchased Official Red Hat Linux, be sure to "
! "register your purchase through our web site, "
! "http://www.redhat.com."));
}
}
--- 61,70 ----
void welcome(void) {
if (!testing) {
! newtWinMessage("IPCop Firewall", _("Ok"),
! _("Welcome to the IPCop Firewall!\n\n"
"This installation process is outlined in detail in the "
! "Official IPCop Firewall Installation Guide available from "
! "IPCop Website. If you have access to this manual, you "
! "should read the installation section before continuing.\n\n"));
}
}
***************
*** 127,132 ****
"need PCMCIA support after the install. You do "
"not need install-time PCMCIA support if you "
! "are installing Red Hat Linux on a laptop with "
! "a built-in CDROM drive."));
if (rc == 2) return INST_OKAY;
--- 124,129 ----
"need PCMCIA support after the install. You do "
"not need install-time PCMCIA support if you "
! "are installing the IPCop Firewall on a laptop "
! "with a built-in CDROM drive."));
if (rc == 2) return INST_OKAY;
***************
*** 137,141 ****
_("PCMCIA support requires a PCMCIA support disk. "
"Please remove the boot disk currently in your "
! "drive and replace it with the Red Hat "
"PCMCIA support disk."));
if (rc == 2) return INST_CANCEL;
--- 134,138 ----
_("PCMCIA support requires a PCMCIA support disk. "
"Please remove the boot disk currently in your "
! "drive and replace it with the IPCop "
"PCMCIA support disk."));
if (rc == 2) return INST_CANCEL;
***************
*** 311,315 ****
(major(sb.st_rdev) == 5 && minor(sb.st_dev) >= 64);
! logMessage("welcome to the Red Hat install "
"(first stage, version " INSTALL_VERSION " built " __DATE__ " "
__TIME__")");
--- 308,312 ----
(major(sb.st_rdev) == 5 && minor(sb.st_dev) >= 64);
! logMessage("welcome to the IPCop Firewall install "
"(first stage, version " INSTALL_VERSION " built " __DATE__ " "
__TIME__")");
***************
*** 319,323 ****
newtSetSuspendCallback(NULL, doSuspend);
setDefaultLanguage(1);
! newtDrawRootText(0, 0, _("Welcome to Red Hat Linux"));
newtPushHelpLine(_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "));
--- 316,320 ----
newtSetSuspendCallback(NULL, doSuspend);
setDefaultLanguage(1);
! newtDrawRootText(0, 0, _("Welcome to the IPCop Firewall"));
newtPushHelpLine(_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "));
Index: install2.c
===================================================================
RCS file: /cvsroot/ipcop/installer/install2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** install2.c 1 Apr 2003 14:49:34 -0000 1.12
--- install2.c 22 Apr 2003 12:36:03 -0000 1.13
***************
*** 947,951 ****
"which will allow you to move around in the install "
"more freely. It is not recommended to use the menu "
! "unless you are already familiar with Red Hat Linux. "
"What would you like to do?"), name);
--- 947,951 ----
"which will allow you to move around in the install "
"more freely. It is not recommended to use the menu "
! "unless you are already familiar with the IPCop Firewall. "
"What would you like to do?"), name);
***************
*** 1299,1303 ****
*/
! newtDrawRootText(0, 0, "Red Hat Linux (C) 1999 Red Hat Software");
newtPushHelpLine(_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "));
--- 1299,1303 ----
*/
! newtDrawRootText(0, 0, "IPCop Firewall (C) 1999 Red Hat Software, 2003 IPCop Team");
newtPushHelpLine(_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "));
***************
*** 1360,1367 ****
"Remove the boot media and "
"press return to reboot. For information on fixes which are "
! "available for this release of Red Hat Linux, consult the "
! "Errata available from http://www.redhat.com.\n\n"
! "Information on configuring your system is available in the post "
! "install chapter of the Official Red Hat Linux User's Guide."));
}
--- 1360,1367 ----
"Remove the boot media and "
"press return to reboot. For information on fixes which are "
! "available for this release of the IPCop Firewall, consult the "
! "Fixes available from http://www.ipcop.org.\n\n"
! "Information on configuring your system is available in the "
! "Official IPCop Firewall Administration Guide."));
}
Index: lilo.c
===================================================================
RCS file: /cvsroot/ipcop/installer/lilo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lilo.c 29 Mar 2003 21:14:14 -0000 1.4
--- lilo.c 22 Apr 2003 12:36:03 -0000 1.5
***************
*** 330,334 ****
reflowedText = newtReflowText(
! _("The boot manager Red Hat uses can boot other "
"operating systems as well. You need to tell me "
"what partitions you would like to be able to boot "
--- 330,334 ----
reflowedText = newtReflowText(
! _("The boot manager IPCop uses can boot other "
"operating systems as well. You need to tell me "
"what partitions you would like to be able to boot "
Index: urlmethod.c
===================================================================
RCS file: /cvsroot/ipcop/installer/urlmethod.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** urlmethod.c 28 Mar 2003 08:03:50 -0000 1.1.1.1
--- urlmethod.c 22 Apr 2003 12:36:03 -0000 1.2
***************
*** 190,194 ****
" o the name or IP number of your FTP server\n"
" o the directory on that server containing\n"
! " Red Hat Linux for your architecure\n"),
47, 5, 5, &width, &height);
break;
--- 190,194 ----
" o the name or IP number of your FTP server\n"
" o the directory on that server containing\n"
! " the IPCop Firewall for your architecure\n"),
47, 5, 5, &width, &height);
break;
***************
*** 199,203 ****
" o the name or IP number of your web server\n"
" o the directory on that server containing\n"
! " Red Hat Linux for your architecure\n"),
47, 5, 5, &width, &height);
break;
--- 199,203 ----
" o the name or IP number of your web server\n"
" o the directory on that server containing\n"
! " the IPCop Firewall for your architecure\n"),
47, 5, 5, &width, &height);
break;
***************
*** 217,221 ****
0, 0, 1, 0, NEWT_ANCHOR_LEFT, 0);
newtGridSetField(entryGrid, 0, 1, NEWT_GRID_COMPONENT,
! newtLabel(-1, -1, _("Red Hat directory:")),
0, 0, 1, 0, NEWT_ANCHOR_LEFT, 0);
newtGridSetField(entryGrid, 1, 0, NEWT_GRID_COMPONENT, siteEntry,
--- 217,221 ----
0, 0, 1, 0, NEWT_ANCHOR_LEFT, 0);
newtGridSetField(entryGrid, 0, 1, NEWT_GRID_COMPONENT,
! newtLabel(-1, -1, _("IPCop directory:")),
0, 0, 1, 0, NEWT_ANCHOR_LEFT, 0);
newtGridSetField(entryGrid, 1, 0, NEWT_GRID_COMPONENT, siteEntry,
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
IPCop-cvs mailing list
IPCop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic