o massive move to a better translation model

o  rename unprobed monitor to Generic Monitor

36 files changed, 127 insertions, 148 deletions

diff --git a/fstab.py b/fstab.py
index 1871dd7b7..b12248083 100644
--- a/fstab.py
+++ b/fstab.py
@@ -20,9 +20,7 @@ import os
 import string
 import raid
 import struct
-
-def _(str):
-    return str
+from translate import _
 
 def isValidExt2(device):
     file = '/tmp/' + device
diff --git a/gui.py b/gui.py
index 59f011428..cc6cf0b1c 100755
--- a/gui.py
+++ b/gui.py
@@ -1,16 +1,11 @@
 import gettext_rh
 import os
-
-cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
-
-def _(string):
-    return cat.gettext(string)
-
 from gtk import *
 from gtk import _root_window
 from _gtk import gtk_set_locale
 import GdkImlib
 from GDK import *
+from translate import cat, _
 
 im = None
 splashwindow = None
@@ -256,17 +251,14 @@ class InstallInterface:
 
 class InstallControlWindow (Thread):
     def setLanguage (self, lang):
-        global cat
-        
         newlangs = [lang]
         
         if len(lang) > 2:
             newlangs.append(lang[:2])
         self.locale = lang[:2]
 
-        gettext_rh.setlangs (newlangs)
-        
-        cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
+        cat.setlangs (newlangs)
+
         for l in newlangs:
             if os.access ("/etc/gtk/gtkrc." + l, os.R_OK):
                 rc_parse("/etc/gtk/gtkrc." + l)
diff --git a/installclass.py b/installclass.py
index a17d522eb..0c0856747 100644
--- a/installclass.py
+++ b/installclass.py
@@ -12,9 +12,7 @@ FSEDIT_USE_EXISTING = (1 << 3)
 
 import gettext_rh, os, iutil
 from xf86config import XF86Config
-
-cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
+from translate import _
 
 class InstallClass:
 
diff --git a/iw/account.py b/iw/account.py
index 27fdad51b..1efe27596 100644
--- a/iw/account.py
+++ b/iw/account.py
@@ -1,6 +1,6 @@
 from gtk import *
 from iw import *
-from gui import _
+from translate import _
 import re
 import string
 
diff --git a/iw/auth.py b/iw/auth.py
index 91b5b121b..0d99018de 100644
--- a/iw/auth.py
+++ b/iw/auth.py
@@ -1,6 +1,6 @@
 from gtk import *
 from iw import *
-from gui import _
+from translate import _
 
 class AuthWindow (InstallWindow):
 
diff --git a/iw/bootdisk.py b/iw/bootdisk.py
index 9d7b43c92..a28a50186 100644
--- a/iw/bootdisk.py
+++ b/iw/bootdisk.py
@@ -1,6 +1,6 @@
 from iw import *
 from gtk import *
-from gui import _
+from translate import _
 import iutil
 
 class BootdiskWindow (InstallWindow):
diff --git a/iw/confirm.py b/iw/confirm.py
index 6ebb18758..6a236b8d6 100644
--- a/iw/confirm.py
+++ b/iw/confirm.py
@@ -1,6 +1,6 @@
 from gtk import *
 from iw import *
-from gui import _
+from translate import _
 
 class ConfirmWindow (InstallWindow):
 
diff --git a/iw/congrats.py b/iw/congrats.py
index ae90fdfbd..8e1f7745e 100644
--- a/iw/congrats.py
+++ b/iw/congrats.py
@@ -1,7 +1,7 @@
 from gtk import *
 from gnome.ui import *
 from iw import *
-from gui import _
+from translate import _
 
 class CongratulationWindow (InstallWindow):		
 
diff --git a/iw/dependencies.py b/iw/dependencies.py
index 62e2d119f..f06dabc9b 100644
--- a/iw/dependencies.py
+++ b/iw/dependencies.py
@@ -1,6 +1,6 @@
 from iw import *
 from gtk import *
-from gui import _
+from translate import _
 
 class UnresolvedDependenciesWindow (InstallWindow):
 
diff --git a/iw/examine.py b/iw/examine.py
index 0e6462fc3..6a4479d0f 100644
--- a/iw/examine.py
+++ b/iw/examine.py
@@ -1,7 +1,7 @@
 from gtk import *
 from iw import *
 from package import *
-from gui import _
+from translate import _
 
 class UpgradeExamineWindow (InstallWindow):		
 
diff --git a/iw/fdisk.py b/iw/fdisk.py
index f39e2f0c2..714a6d6f3 100644
--- a/iw/fdisk.py
+++ b/iw/fdisk.py
@@ -1,7 +1,7 @@
 from gtk import *
 from iw import *
 from gnome.zvt import *
-from gui import _
+from translate import _
 import isys
 import os
 
diff --git a/iw/format.py b/iw/format.py
index 07b59f148..1aee7e315 100644
--- a/iw/format.py
+++ b/iw/format.py
@@ -2,7 +2,7 @@ from gtk import *
 from iw import *
 from thread import *
 import isys
-from gui import _
+from translate import _
 
 class FormatWindow (InstallWindow):
     def __init__ (self, ics):
diff --git a/iw/installpath.py b/iw/installpath.py
index adcaa5192..71cd2434f 100644
--- a/iw/installpath.py
+++ b/iw/installpath.py
@@ -22,7 +22,7 @@ from fdisk import *
 from rootpartition import *
 from confirm import *
 import iutil
-from gui import _
+from translate import _
 import installclass
 
 UPGRADE = 0
diff --git a/iw/keyboard.py b/iw/keyboard.py
index db70fe52d..3acce3cb2 100644
--- a/iw/keyboard.py
+++ b/iw/keyboard.py
@@ -3,7 +3,7 @@ from iw import *
 import xkb
 import string
 import keyboard
-from gui import _
+from translate import _
 
 class KeyboardWindow (InstallWindow):
 
diff --git a/iw/language.py b/iw/language.py
index 8ca133127..f77f6d350 100644
--- a/iw/language.py
+++ b/iw/language.py
@@ -1,6 +1,6 @@
 from gtk import *
 from iw import *
-from gui import _
+from translate import _
 
 class LanguageWindow (InstallWindow):
 
diff --git a/iw/lilo.py b/iw/lilo.py
index 546ab44bf..5c169bb5c 100644
--- a/iw/lilo.py
+++ b/iw/lilo.py
@@ -1,6 +1,6 @@
 from iw import *
 from gtk import *
-from gui import _
+from translate import _
 from xpms import SMALL_CHECK
 import GdkImlib
 
diff --git a/iw/mouse.py b/iw/mouse.py
index 6ef294e9c..73c9237fe 100644
--- a/iw/mouse.py
+++ b/iw/mouse.py
@@ -3,7 +3,7 @@ from iw import *
 from string import *
 from re import *
 import tree
-from gui import _
+from translate import _
 import xmouse
 
 class MouseWindow (InstallWindow):
diff --git a/iw/network.py b/iw/network.py
index e254c04f8..85b2c5722 100644
--- a/iw/network.py
+++ b/iw/network.py
@@ -1,7 +1,7 @@
 from gtk import *
 from iw import *
 from isys import *
-from gui import _
+from translate import _
 
 class NetworkWindow (InstallWindow):		
 
diff --git a/iw/package.py b/iw/package.py
index ece9226ad..4d64849a1 100644
--- a/iw/package.py
+++ b/iw/package.py
@@ -9,7 +9,7 @@ import GdkImlib
 import string
 import sys
 import xpms
-from gui import _
+from translate import _
 
 class IndividualPackageSelectionWindow (InstallWindow):
 
diff --git a/iw/progress.py b/iw/progress.py
index cd11bc086..f1cd709b5 100644
--- a/iw/progress.py
+++ b/iw/progress.py
@@ -4,7 +4,7 @@ import string
 import rpm
 import time
 from threading import *
-from gui import _
+from translate import _
 
 class DoInstall (Thread):
     def __init__ (self, icw, todo):
diff --git a/iw/rootpartition.py b/iw/rootpartition.py
index 22150b8bf..071cef737 100644
--- a/iw/rootpartition.py
+++ b/iw/rootpartition.py
@@ -2,7 +2,7 @@ from gtk import *
 from iw import *
 from thread import *
 import isys
-from gui import _
+from translate import _
 import gui
 from fdisk import *
 import isys
diff --git a/iw/silo.py b/iw/silo.py
index 9a3e71ff0..da2238e1e 100644
--- a/iw/silo.py
+++ b/iw/silo.py
@@ -1,6 +1,6 @@
 from iw import *
 from gtk import *
-from gui import _
+from translate import _
 from xpms import SMALL_CHECK
 import GdkImlib
 
diff --git a/iw/timezone.py b/iw/timezone.py
index 0c7afea7c..783f8e77c 100644
--- a/iw/timezone.py
+++ b/iw/timezone.py
@@ -2,7 +2,7 @@ from gtk import *
 from iw import *
 import string
 from gnome.ui import GnomeCanvas
-from gui import _
+from translate import _
 
 import timezonemap
 
diff --git a/iw/welcome.py b/iw/welcome.py
index 38cf0e8df..10e2e97ab 100644
--- a/iw/welcome.py
+++ b/iw/welcome.py
@@ -1,7 +1,7 @@
 from gtk import *
 from gnome.ui import *
 from iw import *
-from gui import _
+from translate import _
 
 class WelcomeWindow (InstallWindow):		
 
diff --git a/iw/xconfig.py b/iw/xconfig.py
index 7f0fc39e4..106920521 100644
--- a/iw/xconfig.py
+++ b/iw/xconfig.py
@@ -1,6 +1,6 @@
 from gtk import *
 from iw import *
-from gui import _
+from translate import _
 
 import string
 import sys
diff --git a/po/anaconda.pot b/po/anaconda.pot
index b9165fcd3..b3e6b3efc 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-23 15:29-0500\n"
+"POT-Creation-Date: 2000-02-25 11:23-0500\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"
@@ -25,13 +25,13 @@ msgstr ""
 
 #: ../fstab.py:246 ../fstab.py:326 ../fstab.py:460
 #: ../libfdisk/newtfsedit.c:1541 ../loader/devices.c:182
-#: ../loader/devices.c:187 ../loader/lang.c:89 ../loader/loader.c:471
-#: ../loader/loader.c:481 ../loader/loader.c:701 ../loader/loader.c:753
-#: ../loader/loader.c:910 ../loader/loader.c:915 ../loader/loader.c:1692
-#: ../loader/loader.c:1738 ../loader/loader.c:1809 ../loader/urls.c:70
+#: ../loader/devices.c:187 ../loader/lang.c:89 ../loader/loader.c:475
+#: ../loader/loader.c:485 ../loader/loader.c:705 ../loader/loader.c:757
+#: ../loader/loader.c:914 ../loader/loader.c:919 ../loader/loader.c:1696
+#: ../loader/loader.c:1742 ../loader/loader.c:1813 ../loader/urls.c:70
 #: ../loader/urls.c:79 ../loader/urls.c:86 ../loader/urls.c:223
-#: ../loader/urls.c:228 ../text.py:294 ../text.py:778 ../todo.py:341
-#: ../todo.py:659 ../todo.py:690
+#: ../loader/urls.c:228 ../text.py:294 ../text.py:778 ../todo.py:343
+#: ../todo.py:661 ../todo.py:692
 msgid "Error"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Error unmounting %s: %s"
 msgstr ""
 
-#: ../fstab.py:349 ../todo.py:424
+#: ../fstab.py:349 ../todo.py:426
 msgid "Creating"
 msgstr ""
 
@@ -78,8 +78,8 @@ msgstr ""
 #: ../gui.py:278 ../gui.py:522 ../libfdisk/newtfsedit.c:1292
 #: ../libfdisk/newtfsedit.c:1300 ../loader/cdrom.c:34 ../loader/devices.c:67
 #: ../loader/devices.c:171 ../loader/devices.c:249 ../loader/lang.c:548
-#: ../loader/loader.c:255 ../loader/loader.c:608 ../loader/loader.c:644
-#: ../loader/loader.c:753 ../loader/loader.c:1160 ../loader/net.c:162
+#: ../loader/loader.c:259 ../loader/loader.c:612 ../loader/loader.c:648
+#: ../loader/loader.c:757 ../loader/loader.c:1164 ../loader/net.c:162
 #: ../loader/net.c:284 ../loader/urls.c:146 ../loader/urls.c:361 ../text.py:55
 #: ../text.py:66 ../text.py:108 ../text.py:109 ../text.py:128 ../text.py:151
 #: ../text.py:181 ../text.py:184 ../text.py:243 ../text.py:297 ../text.py:311
@@ -208,11 +208,11 @@ msgstr ""
 #: ../loader/devices.c:182 ../loader/devices.c:187 ../loader/devices.c:249
 #: ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
 #: ../loader/lang.c:89 ../loader/lang.c:277 ../loader/lang.c:548
-#: ../loader/loader.c:255 ../loader/loader.c:471 ../loader/loader.c:481
-#: ../loader/loader.c:644 ../loader/loader.c:701 ../loader/loader.c:753
-#: ../loader/loader.c:910 ../loader/loader.c:915 ../loader/loader.c:1004
-#: ../loader/loader.c:1160 ../loader/loader.c:1692 ../loader/loader.c:1738
-#: ../loader/loader.c:1801 ../loader/loader.c:1809 ../loader/net.c:162
+#: ../loader/loader.c:259 ../loader/loader.c:475 ../loader/loader.c:485
+#: ../loader/loader.c:648 ../loader/loader.c:705 ../loader/loader.c:757
+#: ../loader/loader.c:914 ../loader/loader.c:919 ../loader/loader.c:1008
+#: ../loader/loader.c:1164 ../loader/loader.c:1696 ../loader/loader.c:1742
+#: ../loader/loader.c:1805 ../loader/loader.c:1813 ../loader/net.c:162
 #: ../loader/net.c:284 ../loader/net.c:560 ../loader/net.c:591
 #: ../loader/urls.c:146 ../loader/urls.c:223 ../loader/urls.c:228
 #: ../loader/urls.c:361 ../text.py:128 ../text.py:181 ../text.py:243
@@ -308,7 +308,7 @@ msgstr ""
 #: ../libfdisk/gnomefsedit.c:2493 ../libfdisk/newtfsedit.c:499
 #: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479
 #: ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582
-#: ../loader/loader.c:608 ../loader/net.c:719 ../text.py:332 ../text.py:530
+#: ../loader/loader.c:612 ../loader/net.c:719 ../text.py:332 ../text.py:530
 #: ../text.py:548 ../text.py:555 ../textw/partitioning.py:193
 msgid "Yes"
 msgstr ""
@@ -353,7 +353,7 @@ msgstr ""
 #: ../libfdisk/gnomefsedit.c:788 ../libfdisk/gnomefsedit.c:1770
 #: ../libfdisk/gnomefsedit.c:2278 ../libfdisk/newtfsedit.c:463
 #: ../libfdisk/newtfsedit.c:1497 ../loader/devices.c:171
-#: ../loader/loader.c:1801 ../text.py:373 ../text.py:375 ../textw/lilo.py:106
+#: ../loader/loader.c:1805 ../text.py:373 ../text.py:375 ../textw/lilo.py:106
 #: ../textw/silo.py:135 ../textw/silo.py:153 ../textw/userauth.py:63
 msgid "Cancel"
 msgstr ""
@@ -687,122 +687,122 @@ msgstr ""
 msgid "I can't go to the previous step from here. You will have to try again."
 msgstr ""
 
-#: ../todo.py:342
+#: ../todo.py:344
 #, c-format
 msgid "Error copying file: %s"
 msgstr ""
 
-#: ../todo.py:424
+#: ../todo.py:426
 msgid "Creating boot disk..."
 msgstr ""
 
-#: ../todo.py:444
+#: ../todo.py:446
 msgid "Reading"
 msgstr ""
 
-#: ../todo.py:445
+#: ../todo.py:447
 msgid "Reading package information..."
 msgstr ""
 
-#: ../todo.py:629 ../todo.py:642
+#: ../todo.py:631 ../todo.py:644
 msgid "no suggestion"
 msgstr ""
 
-#: ../todo.py:648
+#: ../todo.py:650
 msgid "Searching"
 msgstr ""
 
-#: ../todo.py:649
+#: ../todo.py:651
 msgid "Searching for Red Hat Linux installations..."
 msgstr ""
 
-#: ../todo.py:660 ../todo.py:691
+#: ../todo.py:662 ../todo.py:693
 #, c-format
 msgid "Error mounting ext2 filesystem on %s: %s"
 msgstr ""
 
-#: ../todo.py:702
+#: ../todo.py:704
 msgid "Finding"
 msgstr ""
 
-#: ../todo.py:703
+#: ../todo.py:705
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: ../todo.py:959
+#: ../todo.py:962
 msgid "Processing"
 msgstr ""
 
-#: ../todo.py:960
+#: ../todo.py:963
 msgid "Preparing to install..."
 msgstr ""
 
-#: ../todo.py:1139
+#: ../todo.py:1142
 #, c-format
 msgid "Upgrading %s.\n"
 msgstr ""
 
-#: ../todo.py:1141
+#: ../todo.py:1144
 #, c-format
 msgid "Installing %s.\n"
 msgstr ""
 
-#: ../todo.py:1162
+#: ../todo.py:1165
 msgid ""
 "You don't appear to have enough disk space to install the packages you've "
 "selected. You need more space on the following filesystems:\n"
 "\n"
 msgstr ""
 
-#: ../todo.py:1165
+#: ../todo.py:1168
 msgid "Mount Point"
 msgstr ""
 
-#: ../todo.py:1165
+#: ../todo.py:1168
 msgid "Space Needed"
 msgstr ""
 
-#: ../todo.py:1178
+#: ../todo.py:1181
 msgid "Disk Space"
 msgstr ""
 
-#: ../todo.py:1202
+#: ../todo.py:1205
 msgid "Post Install"
 msgstr ""
 
-#: ../todo.py:1203
+#: ../todo.py:1206
 msgid "Performing post install configuration..."
 msgstr ""
 
-#: ../iw/xconfig.py:10 ../xf86config.py:257
+#: ../iw/xconfig.py:10 ../xf86config.py:258
 msgid "Video Card"
 msgstr ""
 
-#: ../iw/xconfig.py:12 ../xf86config.py:259
+#: ../iw/xconfig.py:12 ../xf86config.py:260
 msgid "Video Ram"
 msgstr ""
 
-#: ../xf86config.py:261
+#: ../xf86config.py:262
 msgid "X server"
 msgstr ""
 
-#: ../xf86config.py:263
+#: ../xf86config.py:264
 msgid "Unable to detect video card"
 msgstr ""
 
-#: ../iw/xconfig.py:11 ../xf86config.py:270 ../xf86config.py:272
+#: ../iw/xconfig.py:11 ../xf86config.py:271 ../xf86config.py:273
 msgid "Monitor"
 msgstr ""
 
-#: ../xf86config.py:272
+#: ../xf86config.py:273
 msgid "Plug and Play Monitor"
 msgstr ""
 
-#: ../xf86config.py:274
+#: ../xf86config.py:275
 msgid "Horizontal frequency range"
 msgstr ""
 
-#: ../xf86config.py:276
+#: ../xf86config.py:277
 msgid "Vertical frequency range"
 msgstr ""
 
@@ -1113,7 +1113,7 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
-#: ../iw/network.py:163 ../loader/loader.c:240
+#: ../iw/network.py:163 ../loader/loader.c:244
 msgid "Network"
 msgstr ""
 
@@ -1432,7 +1432,7 @@ msgid ""
 "two hard drives in your system so you can boot into Linux with LILO."
 msgstr ""
 
-#: ../loader/loader.c:303 ../loader/loader.c:328 ../textw/partitioning.py:63
+#: ../loader/loader.c:307 ../loader/loader.c:332 ../textw/partitioning.py:63
 msgid "Done"
 msgstr ""
 
@@ -2170,8 +2170,8 @@ msgstr ""
 msgid "Module Parameters"
 msgstr ""
 
-#: ../loader/devices.c:170 ../loader/devices.c:272 ../loader/loader.c:253
-#: ../loader/loader.c:312 ../loader/loader.c:328 ../loader/loader.c:1801
+#: ../loader/devices.c:170 ../loader/devices.c:272 ../loader/loader.c:257
+#: ../loader/loader.c:316 ../loader/loader.c:332 ../loader/loader.c:1805
 msgid "Devices"
 msgstr ""
 
@@ -2179,7 +2179,7 @@ msgstr ""
 msgid "Insert your driver disk and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader/devices.c:183 ../loader/loader.c:1810
+#: ../loader/devices.c:183 ../loader/loader.c:1814
 msgid "Failed to mount floppy disk."
 msgstr ""
 
@@ -2234,158 +2234,158 @@ msgstr ""
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader/loader.c:101
+#: ../loader/loader.c:102
 msgid "Local CDROM"
 msgstr ""
 
-#: ../loader/loader.c:104
+#: ../loader/loader.c:105
 msgid "NFS image"
 msgstr ""
 
-#: ../loader/loader.c:109
+#: ../loader/loader.c:110
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader/loader.c:128
+#: ../loader/loader.c:129
 msgid "Welcome to Red Hat Linux"
 msgstr ""
 
-#: ../loader/loader.c:130
+#: ../loader/loader.c:131
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../loader/loader.c:240
+#: ../loader/loader.c:244
 msgid "SCSI"
 msgstr ""
 
-#: ../loader/loader.c:254
+#: ../loader/loader.c:258
 msgid "What kind of device would you like to add"
 msgstr ""
 
-#: ../loader/loader.c:301
+#: ../loader/loader.c:305
 msgid "I have found the following devices in your system:"
 msgstr ""
 
-#: ../loader/loader.c:303 ../loader/loader.c:328
+#: ../loader/loader.c:307 ../loader/loader.c:332
 msgid "Add Device"
 msgstr ""
 
-#: ../loader/loader.c:329
+#: ../loader/loader.c:333
 msgid ""
 "I don't have any special device drivers loaded for your system. Would you "
 "like to load some now?"
 msgstr ""
 
-#: ../loader/loader.c:413 ../loader/loader.c:415
+#: ../loader/loader.c:417 ../loader/loader.c:419
 msgid "Loading"
 msgstr ""
 
-#: ../loader/loader.c:467
+#: ../loader/loader.c:471
 msgid "Loading second stage ramdisk..."
 msgstr ""
 
-#: ../loader/loader.c:471
+#: ../loader/loader.c:475
 msgid "Error loading ramdisk."
 msgstr ""
 
-#: ../loader/loader.c:608
+#: ../loader/loader.c:612
 msgid "Hard Drives"
 msgstr ""
 
-#: ../loader/loader.c:609
+#: ../loader/loader.c:613
 msgid ""
 "You don't seem to have any hard drives on your system! Would you like to "
 "configure additional devices?"
 msgstr ""
 
-#: ../loader/loader.c:622
+#: ../loader/loader.c:626
 msgid ""
 "What partition and directory on that partition hold the RedHat/RPMS and "
 "RedHat/base directories? If you don't see the disk drive you're using listed "
 "here, press F2 to configure additional devices."
 msgstr ""
 
-#: ../loader/loader.c:636
+#: ../loader/loader.c:640
 msgid "Directory holding Red Hat:"
 msgstr ""
 
-#: ../loader/loader.c:656
+#: ../loader/loader.c:660
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader/loader.c:702
+#: ../loader/loader.c:706
 #, c-format
 msgid "Device %s does not appear to contain a Red Hat installation tree."
 msgstr ""
 
-#: ../loader/loader.c:754
+#: ../loader/loader.c:758
 msgid ""
 "I could not find a Red Hat Linux CDROM in any of your CDROM drives. Please "
 "insert the Red Hat CD and press \"OK\" to retry."
 msgstr ""
 
-#: ../loader/loader.c:911
+#: ../loader/loader.c:915
 msgid "That directory does not seem to contain a Red Hat installation tree."
 msgstr ""
 
-#: ../loader/loader.c:916
+#: ../loader/loader.c:920
 msgid "I could not mount that directory from the server"
 msgstr ""
 
-#: ../loader/loader.c:1004
+#: ../loader/loader.c:1008
 msgid "FTP"
 msgstr ""
 
-#: ../loader/loader.c:1005
+#: ../loader/loader.c:1009
 msgid "Unable to retrieve the second stage ramdisk"
 msgstr ""
 
-#: ../loader/loader.c:1152
+#: ../loader/loader.c:1156
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader/loader.c:1153
+#: ../loader/loader.c:1157
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader/loader.c:1155
+#: ../loader/loader.c:1159
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader/loader.c:1157
+#: ../loader/loader.c:1161
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader/loader.c:1693
+#: ../loader/loader.c:1697
 msgid "Cannot find ks.cfg on boot floppy."
 msgstr ""
 
-#: ../loader/loader.c:1739
+#: ../loader/loader.c:1743
 #, c-format
 msgid "Failed to read directory %s: %s"
 msgstr ""
 
-#: ../loader/loader.c:1802
+#: ../loader/loader.c:1806
 msgid "Insert your updates disk and press \"OK\" to continue."
 msgstr ""
 
 #. Copy everything to /tmp/updates so .so files don't get run
 #. from /dev/fd0. We could (and probably should) get smarter about
 #. this at some point.
-#: ../loader/loader.c:1815
+#: ../loader/loader.c:1819
 msgid "Updates"
 msgstr ""
 
-#: ../loader/loader.c:1815
+#: ../loader/loader.c:1819
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../loader/loader.c:1969
+#: ../loader/loader.c:1973
 msgid "PC Card"
 msgstr ""
 
-#: ../loader/loader.c:1969
+#: ../loader/loader.c:1973
 msgid "Initializing PC Card Devices..."
 msgstr ""
 
diff --git a/text.py b/text.py
index 5c07d01ae..340990120 100644
--- a/text.py
+++ b/text.py
@@ -9,11 +9,7 @@ import time
 import gettext_rh
 import glob
 import signal
-
-cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
-
-def _(string):
-    return cat.gettext (string)
+from translate import _, cat
 
 from textw.constants import *
 from textw.lilo import LiloWindow
@@ -38,8 +34,6 @@ from textw.packages import PackageDepWindow
 from textw.timezone import TimezoneWindow
 import installclass
 
-
-
 class LanguageWindow:
     def __call__(self, screen, todo):
         languages = todo.language.available ()
@@ -70,9 +64,7 @@ class LanguageWindow:
         newlangs = [lang]
 	if len(lang) > 2:
             newlangs.append(lang[:2])
-        gettext_rh.setlangs (newlangs)
-        global cat
-        cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
+        cat.setlangs (newlangs)
         todo.language.set (choice)
 	if not todo.serial:
 	    font = todo.language.getFont(choice)
diff --git a/textw/constants.py b/textw/constants.py
index 07f97899e..50885873c 100644
--- a/textw/constants.py
+++ b/textw/constants.py
@@ -1,5 +1,5 @@
 #import gettext
-from text import _
+from translate import _
 INSTALL_OK = 0
 INSTALL_BACK = -1
 INSTALL_NOOP = -2
diff --git a/textw/lilo.py b/textw/lilo.py
index 8d038ae71..856535468 100644
--- a/textw/lilo.py
+++ b/textw/lilo.py
@@ -1,7 +1,7 @@
 #import gettext
 from snack import *
 from textw.constants import *
-from text import _
+from translate import _
 import string
 
 #cat = gettext.Catalog ("anaconda", "/usr/share/locale")
diff --git a/textw/packages.py b/textw/packages.py
index 415966631..aa4886150 100644
--- a/textw/packages.py
+++ b/textw/packages.py
@@ -2,7 +2,7 @@ import rpm
 #import gettext
 from snack import *
 from textw.constants import *
-from text import _
+from translate import _
 
 class PackageGroupWindow:
     def __call__(self, screen, todo, individual):
diff --git a/textw/partitioning.py b/textw/partitioning.py
index 8fb183f76..29b7f553f 100644
--- a/textw/partitioning.py
+++ b/textw/partitioning.py
@@ -3,7 +3,7 @@ import os
 import isys
 from snack import *
 from textw.constants import *
-from text import _
+from translate import _
 
 class PartitionMethod:
     def __call__(self, screen, todo):
diff --git a/textw/silo.py b/textw/silo.py
index 2dab79807..5f8ab7e2e 100644
--- a/textw/silo.py
+++ b/textw/silo.py
@@ -2,7 +2,7 @@
 import iutil
 from snack import *
 from textw.constants import *
-from text import _
+from translate import _
 
 #cat = gettext.Catalog ("anaconda", "/usr/share/locale")
 #_ = cat.gettext
diff --git a/textw/timezone.py b/textw/timezone.py
index f90bc847b..dd80fdc09 100644
--- a/textw/timezone.py
+++ b/textw/timezone.py
@@ -4,7 +4,7 @@ import os
 from time import *
 from snack import *
 from textw.constants import *
-from text import _
+from translate import _
 
 class TimezoneWindow:
 
diff --git a/textw/userauth.py b/textw/userauth.py
index 8c8c89ed6..53018be72 100644
--- a/textw/userauth.py
+++ b/textw/userauth.py
@@ -1,7 +1,7 @@
 #import gettext_rh
 from snack import *
 from textw.constants import *
-from text import _
+from translate import _
 import iutil
 
 class RootPasswordWindow:
diff --git a/todo.py b/todo.py
index 68a952cec..13d1ed589 100644
--- a/todo.py
+++ b/todo.py
@@ -23,9 +23,8 @@ import errno
 import raid
 import fstab
 import time
-
-def _(x):
-    return x
+import gettext_rh
+from translate import _
 
 class LogFile:
     def __init__ (self, serial, reconfigOnly, test):
@@ -233,7 +232,7 @@ class Language (SimpleConfigFile):
         os.environ["LANG"] = self.langs[lang]
 
 	rpm.addMacro("_install_langs", self.langs[lang]);
-        os.environ["LINGUAS"] = self.langs[lang]        
+        os.environ["LINGUAS"] = self.langs[lang]
         
     def get (self):
 	return self.lang
diff --git a/xf86config.py b/xf86config.py
index ebc4c2e20..47461302b 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -26,7 +26,7 @@ class XF86Config:
         self.monHoriz = ""
         self.monVert = ""
 	self.monSect = None
-        self.monID = "Generic VGA Monitor"
+        self.monID = "Generic Monitor"
         self.devID = None
         self.probed = 0
         self.skip = 0
@@ -531,7 +531,7 @@ Section "Keyboard"
 
 # Any number of monitor sections may be present
 Section "Monitor"
-    Identifier  "Generic VGA Monitor"
+    Identifier  "Generic Monitor"
     VendorName  "Unknown"
     ModelName   "Unknown"
     HorizSync   31.5
@@ -806,7 +806,7 @@ Section "Device"
 	else:
 	    monID = self.monID
         if not monID:
-            monID = "Generic VGA Monitor"
+            monID = "Generic Monitor"
             
         info = { "DEVICE"  : self.devID,
                  "MONITOR" : monID }