diff options
| -rw-r--r-- | iw/examine_gui.py | 2 | ||||
| -rw-r--r-- | iw/pixmapRadioButtonGroup_gui.py | 8 | ||||
| -rw-r--r-- | loader2/hdinstall.c | 4 | ||||
| -rw-r--r-- | partIntfHelpers.py | 2 | ||||
| -rw-r--r-- | rescue.py | 2 | ||||
| -rw-r--r-- | textw/bootloader_text.py | 5 | ||||
| -rw-r--r-- | upgrade.py | 8 |
7 files changed, 16 insertions, 15 deletions
diff --git a/iw/examine_gui.py b/iw/examine_gui.py index 3255af112..850b22ec7 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -126,7 +126,7 @@ class UpgradeExamineWindow (InstallWindow): # hack hack hackity hack upboxtmp = gtk.VBox(gtk.FALSE, 5) - uplabelstr = _("The following Red Hat product will be upgraded:") + uplabelstr = _("The following installed system will be upgraded:") self.uplabel = gtk.Label(uplabelstr) self.uplabel.set_alignment(0.0, 0.0) self.upgradeoption = gtk.OptionMenu() diff --git a/iw/pixmapRadioButtonGroup_gui.py b/iw/pixmapRadioButtonGroup_gui.py index e7fe23205..cbd8797a8 100644 --- a/iw/pixmapRadioButtonGroup_gui.py +++ b/iw/pixmapRadioButtonGroup_gui.py @@ -14,7 +14,7 @@ import gtk from rhpl.translate import _, N_ - +from constants import * class pixmapRadioButtonGroup: @@ -194,7 +194,7 @@ if __name__ == "__main__": else: opts = ['Red Hat 8.0 - /dev/hda1'] - label = _("The following Red Hat product will be upgraded:") + label = _("The following installed system will be upgraded:") upgradeoption = gtk.OptionMenu() upgradeoptionmenu = gtk.Menu() for lev in opts: @@ -221,9 +221,9 @@ if __name__ == "__main__": upbox.pack_start(upboxtmp, gtk.TRUE, gtk.TRUE) r = pixmapRadioButtonGroup() - r.addEntry("upgrade", "_Upgrade Existing Installation", pixmap=readPixmap("/usr/share/anaconda/pixmaps/upgrade.png"), descr="Choose this option if you would like to upgrade your existing Red Hat Linux system. This option will preserve the data on your driver.", userdata="data") + r.addEntry("upgrade", "_Upgrade Existing Installation", pixmap=readPixmap("/usr/share/anaconda/pixmaps/upgrade.png"), descr="Choose this option if you would like to upgrade your existing %s system. This option will preserve the data on your drive" % (productName,), userdata="data") - r.addEntry("install", "_Reinstall Red Hat Linux", pixmap=readPixmap("../pixmaps/install.png"), + r.addEntry("install", "_Reinstall %s" %(productName,), pixmap=readPixmap("../pixmaps/install.png"), descr="Choose this option to reinstall your system. Depending on how you partition your system your previous data may or may not be lost.", userdata="data2") b = r.render() r.setCurrent("Don't Upgrade") diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c index 875d611c2..9d623131f 100644 --- a/loader2/hdinstall.c +++ b/loader2/hdinstall.c @@ -430,7 +430,7 @@ char * mountHardDrive(struct installMethod * method, } else { url = setupIsoImages(kspartition, ksdirectory, flags); if (!url) { - logMessage("unable to find Red Hat installation images on hd"); + logMessage("unable to find %s installation images on hd",getProductName()); free(loaderData->method); loaderData->method = NULL; } else { @@ -566,7 +566,7 @@ char * mountHardDrive(struct installMethod * method, if (!url) { newtWinMessage(_("Error"), _("OK"), _("Device %s does not appear to contain " - "Red Hat CDROM images."), selpart); + "%s CDROM images."), selpart, getProductName()); continue; } diff --git a/partIntfHelpers.py b/partIntfHelpers.py index 50de1ef02..bd7382b65 100644 --- a/partIntfHelpers.py +++ b/partIntfHelpers.py @@ -400,7 +400,7 @@ def queryNoFormatPreExisting(intf): """Ensure the user wants to use a partition without formatting.""" txt = _("You have chosen to use a pre-existing " "partition for this installation without formatting it. " - "Red Hat recommends that you format this partition " + "We recommend that you format this partition " "to make sure files from a previous operating system installation " "do not cause problems with this installation of Linux. " "However, if this partition contains files that you need " @@ -254,7 +254,7 @@ def runRescue(instPath, mountroot, id): # prompt to see if we should try and find root filesystem and mount # everything in /etc/fstab on that root rc = ButtonChoiceWindow(screen, _("Rescue"), - _("The rescue environment will now attempt to find your Red Hat " + _("The rescue environment will now attempt to find your " "Linux installation and mount it under the directory " "%s. You can then make any changes required to your " "system. If you want to proceed with this step choose " diff --git a/textw/bootloader_text.py b/textw/bootloader_text.py index 8ca4e469c..8f7ef8ae6 100644 --- a/textw/bootloader_text.py +++ b/textw/bootloader_text.py @@ -12,6 +12,7 @@ # from snack import * +from constants import * from constants_text import * from rhpl.translate import _ from flags import flags @@ -298,10 +299,10 @@ class BootloaderImagesWindow: TEXT_BACK_BUTTON ] ) text = TextboxReflowed(55, - _("The boot manager Red Hat uses can boot other " + _("The boot manager %s uses can boot other " "operating systems as well. You need to tell me " "what partitions you would like to be able to boot " - "and what label you want to use for each of them.")) + "and what label you want to use for each of them.") % (productName,)) g = GridFormHelp(screen, _("Boot Loader Configuration"), "bootloaderlabels", 1, 4) diff --git a/upgrade.py b/upgrade.py index 89ab051c2..b801a8759 100644 --- a/upgrade.py +++ b/upgrade.py @@ -475,7 +475,7 @@ def upgradeFindPackages(intf, method, id, instPath, dir): _("This system appears to have third " "party packages installed that " "overlap with packages included in " - "Red Hat Linux. Because these packages " + "%s. Because these packages " "overlap, continuing the upgrade " "process may cause them to stop " "functioning properly or may cause " @@ -483,7 +483,7 @@ def upgradeFindPackages(intf, method, id, instPath, dir): "the release notes for more information." "\n\n" "Do you wish to continue the upgrade " - "process?"), + "process?") % (productName,), type="yesno") if rc == 0: try: @@ -497,10 +497,10 @@ def upgradeFindPackages(intf, method, id, instPath, dir): rc = intf.messageWindow(_("Warning"), _("This system does not have an " "/etc/redhat-release file. It is possible " - "that this is not a Red Hat Linux system. " + "that this is not a %s system. " "Continuing with the upgrade process may " "leave the system in an unusable state. Do " - "you wish to continue the upgrade process?"), + "you wish to continue the upgrade process?") % (productName,), type="yesno") if rc == 0: try: |