more merging

9 files changed, 37 insertions, 31 deletions

diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py
index dd4343797..fcadc2ced 100644
--- a/iw/bootdisk_gui.py
+++ b/iw/bootdisk_gui.py
@@ -51,11 +51,11 @@ class BootdiskWindow (InstallWindow):
         
         label = None
 
-        text = _("The boot disk allows you to boot your Red Hat "
-                 "Linux system from a floppy diskette.\n\n"
+        text = _("The boot disk allows you to boot your %s "
+                 "system from a floppy diskette.\n\n"
                  "Please remove any diskettes from the floppy drive and "
                  "insert a blank diskette. All data will be ERASED "
-                 "during creation of the boot disk.")
+                 "during creation of the boot disk.") % (productName,)
 
         if fsset.rootOnLoop():
             text = text + _("\n\nA boot disk is REQUIRED to boot a "
diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py
index 0c5a20229..b5fee41b2 100644
--- a/iw/confirm_gui.py
+++ b/iw/confirm_gui.py
@@ -14,6 +14,7 @@
 import gtk
 from iw_gui import *
 from translate import _, N_
+from constants import *
 from package_gui import queryUpgradeContinue
 import gui
 
@@ -56,9 +57,9 @@ class InstallConfirmWindow (ConfirmWindow):
 
     def getScreen(self):
 	return ConfirmWindow.getScreen(self,
-	    _("Click next to begin installation of Red Hat Linux."),
+	    _("Click next to begin installation of %s.") % (productName,),
 	    _("A complete log of your installation will be in "
-	      "/tmp/install.log after rebooting your system. You "
+	      "/root/install.log after rebooting your system. You "
 	      "may want to keep this file for later reference. "
               "A kickstart file representing the choices you have made "
               "will be in /root/anaconda-ks.cfg."))
@@ -69,8 +70,8 @@ class UpgradeConfirmWindow (ConfirmWindow):
 
     def getScreen(self):
 	return ConfirmWindow.getScreen(self,
-            _("Click next to begin upgrade of Red Hat Linux."),
+            _("Click next to begin upgrade of %s.") % (productName,),
             _("A complete log of your upgrade will be in "
-	      "/tmp/upgrade.log after rebooting your system. You "
+	      "/root/upgrade.log after rebooting your system. You "
 	      "may want to keep this file for later reference."))
 
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 8af9655af..736e38aa4 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -14,6 +14,7 @@
 import gtk
 from iw_gui import *
 from translate import _, N_
+from constants import *
 import iutil
 
 class CongratulationWindow (InstallWindow):		
@@ -44,14 +45,14 @@ class CongratulationWindow (InstallWindow):
 
         if iutil.getArch() != "ia64":
             bootstr = _("If you created a boot disk to use to boot your "
-                        "Red Hat Linux system, insert it before you "
-                        "press <Enter> to reboot.\n\n")
+                        "%s system, insert it before you "
+                        "press <Enter> to reboot.\n\n") % (productName,)
         else:
             bootstr = ""
             
 
 	label = gtk.Label(
-             _("Congratulations, your Red Hat Linux installation is "
+             _("Congratulations, your %s installation is "
                "complete.\n\n"
                "Remove any floppy diskettes you used during the "
                "installation process and press <Enter> to reboot your system. "
@@ -60,8 +61,9 @@ class CongratulationWindow (InstallWindow):
                "For information on errata (updates and bug fixes), visit "
                "http://www.redhat.com/errata.\n\n"
                "Information on using and configuring your "
-               "system is available in the Red Hat Linux manuals "
-               "at http://www.redhat.com/docs.") % bootstr,
+               "system is available in the %s manuals "
+               "at http://www.redhat.com/docs.") % (productName,
+                                                    bootstr, productName),
              )
                 
         label.set_line_wrap (gtk.TRUE)
@@ -102,8 +104,8 @@ class ReconfigCongratulationWindow (InstallWindow):
                   "For information on errata (updates and bug fixes), visit "
                   "http://www.redhat.com/errata.\n\n"
                   "Information on using and configuring your "
-                  "system is available in the Red Hat Linux manuals "
-                  "at http://www.redhat.com/docs."))
+                  "system is available in the %s manuals "
+                  "at http://www.redhat.com/docs.") % (productName,))
         
         label.set_line_wrap (gtk.TRUE)
         label.set_alignment (0.0, 0.5)
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 463d28ece..3fc90ed89 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -16,6 +16,7 @@ import gtk
 from iw_gui import *
 from package_gui import *
 from translate import _, N_
+from constants import *
 from upgrade import *
 
 class UpgradeExamineWindow (InstallWindow):		
@@ -85,9 +86,9 @@ class UpgradeExamineWindow (InstallWindow):
             # if there is only one partition, go on.
             self.ics.setNextEnabled (gtk.TRUE)
             self.root = self.parts[0]
-	    label = gtk.Label (_("Upgrading the Red Hat Linux installation "
+	    label = gtk.Label (_("Upgrading the %s installation "
                                 "on partition /dev/%s")
-                              % (self.root[0] + "\n\n",))
+                              % (productName, self.root[0] + "\n\n",))
 	    label.set_alignment(0.0, 0.5)
 	    vbox.pack_start(label, gtk.FALSE)
             
diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py
index 436394ffe..da7150c5e 100644
--- a/iw/installpath_gui.py
+++ b/iw/installpath_gui.py
@@ -168,6 +168,8 @@ class InstallPathWindow (InstallWindow):
 		table.attach(box, 1, 3, row, row + 1)
 		row = row + 1
 
+                self.toggled(button)
+
 	box = gtk.VBox (gtk.FALSE, 5)
 	box.pack_start(table, gtk.FALSE)
         box.set_border_width (5)
diff --git a/iw/package_gui.py b/iw/package_gui.py
index bead343a7..79e3b925b 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -47,7 +47,6 @@ class IndividualPackageSelectionWindow (InstallWindow):
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
         self.ics = ics
-        self.ics.setHelpEnabled (gtk.FALSE)
         self.DIR = 0
         self.DIR_UP = 1
         self.RPM = 2
@@ -56,7 +55,6 @@ class IndividualPackageSelectionWindow (InstallWindow):
         self.updatingIcons = gtk.FALSE
 
     def getPrev (self):
-        self.ics.setHelpEnabled (gtk.TRUE)
         return None
     
 
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index f8037a7bb..aa6afe814 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -33,6 +33,7 @@ from partIntfHelpers import *
 from partedUtils import *
 from fsset import *
 from partRequests import *
+from constants import *
 
 STRIPE_HEIGHT = 32.0
 LOGICAL_INSET = 3.0
@@ -447,7 +448,7 @@ def createMountPointCombo(request):
 	mntptlist.append(request.fslabel)
     
     for p in defaultMountPoints:
-	if not p in mntptlist:
+	if not p in mntptlist and (p[0] == "/"):
 	    mntptlist.append(p)
 	
     mountCombo.set_popdown_strings (mntptlist)
@@ -760,7 +761,7 @@ class PartitionWindow(InstallWindow):
                            "scheme.")
             labelstr2 = _("These errors must be corrected prior "
                           "to continuing with your install of "
-                          "Red Hat Linux.")
+                          "%s.") % (productName,)
 
             commentstr = string.join(errors, "\n\n")
             
@@ -2324,8 +2325,8 @@ class AutoPartitionWindow(InstallWindow):
             dlg = gtk.MessageDialog(self.parent, 0, gtk.MESSAGE_ERROR,
                                     gtk.BUTTONS_OK,
                                     _("You need to select at least one "
-                                      "drive to have Red Hat Linux installed "
-                                      "onto."))
+                                      "drive to have %s installed "
+                                      "onto.") % (productName,))
             gui.addFrame(dlg)
             dlg.show_all()
             rc = dlg.run()
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 18a3108fd..6c809aeea 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -178,13 +178,9 @@ class InstallProgressWindow (InstallWindow):
             shortlang = ''
                 
         pixmaps1 = glob.glob("/usr/share/anaconda/pixmaps/rnotes/%s/*.png" % shortlang)
-        pixmaps2 = glob.glob("pixmaps/rnotes/%s/*.png" % shortlang)
 
-        if len(pixmaps1) > 0 or len(pixmaps2) > 0:
-            if len(pixmaps1) < len(pixmaps2):
-                files = pixmaps2
-            else:
-                files = pixmaps1
+        if len(pixmaps1) > 0:
+            files = pixmaps1
         else:
             files = ["progress_first.png"]
 
@@ -192,6 +188,9 @@ class InstallProgressWindow (InstallWindow):
         if intf.runres != '800x600':
             files = ["progress_first.png"]
 
+        # sort the list of filenames
+        files.sort()
+
         pixmaps = []
         for pixmap in files:
             if string.find (pixmap, "progress_first.png") < 0:
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index 6b0ade28b..37635dd2e 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -15,6 +15,7 @@
 
 from iw_gui import *
 from translate import _, N_
+from constants import *
 import string
 import isys 
 import iutil
@@ -50,12 +51,13 @@ class UpgradeMigrateFSWindow (InstallWindow):
         box = gtk.VBox (gtk.FALSE, 5)
         box.set_border_width (5)
 
-	text = N_("This release of Red Hat Linux supports "
+	text = N_("This release of %s supports "
                  "the ext3 journalling filesystem.  It has several "
                  "benefits over the ext2 filesystem traditionally shipped "
-                 "in Red Hat Linux.  It is possible to migrate the ext2 "
+                 "in %s.  It is possible to migrate the ext2 "
                  "formatted partitions to ext3 without data loss.\n\n"
-                 "Which of these partitions would you like to migrate?")
+                 "Which of these partitions would you like to migrate?" %
+                  (productName, productName))
         
 	label = gtk.Label (_(text))
         label.set_alignment (0.5, 0.0)