more changes

5 files changed, 51 insertions, 24 deletions

diff --git a/anaconda b/anaconda
index 5f953f66e..af67025ee 100755
--- a/anaconda
+++ b/anaconda
@@ -69,6 +69,7 @@ if (os.path.exists('rpmmodule')):
     sys.path.append('libfdisk')
     sys.path.append('balkan')
     sys.path.append('kudzu')
+    sys.path.append('gnome-map')
 #elif (mode == None):
 #      try:
 #          f = open('/dev/fb0', 'r')
diff --git a/iw/installpath.py b/iw/installpath.py
index 05699fae4..d2b7a15a0 100644
--- a/iw/installpath.py
+++ b/iw/installpath.py
@@ -32,16 +32,33 @@ class InstallPathWindow (InstallWindow):
         ics.setTitle (_("Install Path"))
         ics.setNextEnabled (1)
 
-        self.commonSteps = [LanguageWindow, KeyboardWindow, MouseWindow,
-                            WelcomeWindow, InstallPathWindow]
+        self.commonSteps = [ LanguageWindow,
+                             KeyboardWindow,
+                             MouseWindow,
+                             WelcomeWindow,
+                             InstallPathWindow
+                             ]
 
-        self.installSteps = [TimezoneWindow, NetworkWindow, PartitionWindow, FormatWindow, PackageSelectionWindow,
-	                     UnresolvedDependenciesWindow, LiloWindow, AuthWindow, AccountWindow,
-                             InstallProgressWindow, BootdiskWindow, CongratulationWindow]
+        self.installSteps = [ InstallTypeWindow,
+                              TimezoneWindow,
+	                      NetworkWindow,
+                              PartitionWindow,
+	                      FormatWindow,
+                              PackageSelectionWindow,
+	                      UnresolvedDependenciesWindow,
+	                      LiloWindow,
+                              AuthWindow,
+                              AccountWindow,
+	                      InstallProgressWindow,
+                              BootdiskWindow,
+	                      CongratulationWindow
+                              ]
 
-	self.upgradeSteps = [UpgradeExamineWindow,
-	                     UnresolvedDependenciesWindow, InstallProgressWindow,
-                             CongratulationWindow]
+	self.upgradeSteps = [ UpgradeExamineWindow,
+	                      UnresolvedDependenciesWindow,
+	                      InstallProgressWindow,
+	                      CongratulationWindow
+                              ]
 
     def toggled (self, widget, type):
         if not widget.get_active (): return
diff --git a/iw/installtype.py b/iw/installtype.py
index 7e4a6f32d..a75efcc5c 100644
--- a/iw/installtype.py
+++ b/iw/installtype.py
@@ -1,6 +1,7 @@
 from gtk import *
 from iw import *
 from thread import *
+from gui import _
 
 WORKSTATION_GNOME = 1
 WORKSTATION_KDE   = 2
@@ -16,8 +17,8 @@ class InstallTypeWindow (InstallWindow):
         ics.setTitle (_("Installation Type"))
 	ics.setNextEnabled (TRUE)
 
-        self.installTypes = ((WORKSTATION_GNOME, _("Workstation (Gnome)")),
-                             (WORKSTATION_KDE, _("Workstation (KDE)")),
+        self.installTypes = ((WORKSTATION_GNOME, _("GNOME Workstation")),
+                             (WORKSTATION_KDE, _("KDE Workstation")),
                              (SERVER, _("Server")),
                              (CUSTOM, _("Custom")))
 
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 06ad62867..5c91d87c0 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-08-27 01:03-0400\n"
+"POT-Creation-Date: 1999-08-27 10:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -80,7 +80,7 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: ../gui.py:268 ../libfdisk/fsedit.c:972 ../libfdisk/newtfsedit.c:1303
+#: ../gui.py:272 ../libfdisk/fsedit.c:972 ../libfdisk/newtfsedit.c:1303
 #: ../libfdisk/newtfsedit.c:1311 ../text.py:62 ../text.py:63 ../text.py:78
 #: ../text.py:101 ../text.py:129 ../text.py:132 ../text.py:143 ../text.py:145
 #: ../text.py:163 ../text.py:177 ../text.py:179 ../text.py:198 ../text.py:200
@@ -122,11 +122,11 @@ msgid ""
 "contains Red Hat Linux 2.0 or later?"
 msgstr ""
 
-#: ../iw/installpath.py:56 ../text.py:143
+#: ../iw/installpath.py:57 ../text.py:143
 msgid "Install"
 msgstr ""
 
-#: ../iw/installpath.py:60 ../text.py:143 ../text.py:147
+#: ../iw/installpath.py:61 ../text.py:143 ../text.py:147
 msgid "Upgrade"
 msgstr ""
 
@@ -632,23 +632,23 @@ msgstr ""
 msgid "Upgrade Complete"
 msgstr ""
 
-#: ../gui.py:261
+#: ../gui.py:265
 msgid "Red Hat Linux Installer"
 msgstr ""
 
-#: ../gui.py:271
+#: ../gui.py:275
 msgid "Finish"
 msgstr ""
 
-#: ../gui.py:272
+#: ../gui.py:276
 msgid "Hide Help"
 msgstr ""
 
-#: ../gui.py:273
+#: ../gui.py:277
 msgid "Show Help"
 msgstr ""
 
-#: ../gui.py:294
+#: ../gui.py:298
 msgid "Online Help"
 msgstr ""
 
@@ -724,17 +724,17 @@ msgstr ""
 msgid "Unresolved Dependencies"
 msgstr ""
 
-#: ../iw/examine.py:10
+#: ../iw/examine.py:11
 msgid "Upgrade Examine"
 msgstr ""
 
-#: ../iw/examine.py:34
+#: ../iw/examine.py:35
 msgid ""
 "You don't have any Linux partitions.\n"
 " You can't upgrade this sytem!"
 msgstr ""
 
-#: ../iw/examine.py:52
+#: ../iw/examine.py:53
 msgid "Customize packages to be upgraded"
 msgstr ""
 
@@ -746,7 +746,7 @@ msgstr ""
 msgid "Check for bad blocks while formatting"
 msgstr ""
 
-#: ../iw/installpath.py:31
+#: ../iw/installpath.py:32
 msgid "Install Path"
 msgstr ""
 
@@ -923,6 +923,14 @@ msgstr ""
 msgid "Root Partition Selection"
 msgstr ""
 
+#: ../iw/timezone.py:29
+msgid "Time Zone Selection"
+msgstr ""
+
+#: ../iw/timezone.py:50
+msgid "View"
+msgstr ""
+
 #: ../iw/welcome.py:10
 msgid "Welcome to Red Hat Linux!"
 msgstr ""
diff --git a/text.py b/text.py
index 065308591..2ab50e080 100644
--- a/text.py
+++ b/text.py
@@ -78,7 +78,7 @@ class MouseWindow:
 	bb = ButtonBar(screen, [_("OK"), _("Back")])
 	t = TextboxReflowed(30, 
 		_("Which model mouse is attached to this computer?"))
-	l = Listbox(7, scroll = 1, returnExit = 0)
+	l = Listbox(8, scroll = 1, returnExit = 0, anchorLeft = 1)
 
         key = 0
         for mouse in mice: