more lang changes

9 files changed, 225 insertions, 233 deletions

diff --git a/iw/language.py b/iw/language.py
index b1d29ae89..efab0b200 100644
--- a/iw/language.py
+++ b/iw/language.py
@@ -22,18 +22,6 @@ class LanguageWindow (InstallWindow):
         label = GtkLabel (self.question)
         label.set_alignment (0.5, 0.5)
         
-##         box = GtkVBox (FALSE, 5)
-## 	language_keys = self.todo.language.available ().keys ()
-##         language1 = GtkRadioButton (None, language_keys[0])
-##         language1.connect ("clicked", self.languageSelected, language_keys[0])
-##         self.todo.language.set (language_keys[0])
-
-##         box.pack_start (language1, FALSE)
-##         for locale in language_keys[1:]:
-##             language = GtkRadioButton (language1, locale)
-##             language.connect ("clicked", self.languageSelected, locale)
-##             box.pack_start (language, FALSE)
-
  	language_keys = self.todo.language.available ().keys ()
 
         self.language = GtkCList ()
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 2a910a6a6..89d988734 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-20 11:31-0400\n"
+"POT-Creation-Date: 1999-09-20 12:27-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"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../iw/language.py:10 ../text.py:43 ../text.py:866
+#: ../iw/language.py:10 ../text.py:46 ../text.py:869
 msgid "Language Selection"
 msgstr ""
 
-#: ../text.py:44
+#: ../text.py:47
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
@@ -31,40 +31,40 @@ msgstr ""
 #: ../loader/loader.c:853 ../loader/loader.c:939 ../loader/loader.c:1072
 #: ../loader/loader.c:1490 ../loader/net.c:162 ../loader/net.c:284
 #: ../loader/net.c:559 ../loader/urls.c:124 ../loader/urls.c:201
-#: ../loader/urls.c:206 ../loader/urls.c:322 ../text.py:46 ../text.py:100
-#: ../text.py:151 ../text.py:177 ../text.py:218 ../text.py:263 ../text.py:353
-#: ../text.py:373 ../text.py:404 ../text.py:453 ../text.py:475 ../text.py:540
-#: ../text.py:561 ../text.py:573 ../text.py:585 ../text.py:763 ../text.py:835
-#: ../text.py:839 ../textw/lilo.py:20 ../textw/lilo.py:65
-#: ../textw/packages.py:22 ../textw/packages.py:87 ../textw/packages.py:138
-#: ../textw/partitioning.py:184 ../textw/userauth.py:31
-#: ../textw/userauth.py:45 ../textw/userauth.py:50 ../textw/userauth.py:84
-#: ../textw/userauth.py:96 ../textw/userauth.py:104 ../textw/userauth.py:113
-#: ../textw/userauth.py:174 ../textw/userauth.py:246
+#: ../loader/urls.c:206 ../loader/urls.c:322 ../text.py:49 ../text.py:103
+#: ../text.py:154 ../text.py:180 ../text.py:221 ../text.py:266 ../text.py:356
+#: ../text.py:376 ../text.py:407 ../text.py:456 ../text.py:478 ../text.py:543
+#: ../text.py:564 ../text.py:576 ../text.py:588 ../text.py:766 ../text.py:838
+#: ../text.py:842 ../textw/lilo.py:21 ../textw/lilo.py:66
+#: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136
+#: ../textw/partitioning.py:182 ../textw/userauth.py:29
+#: ../textw/userauth.py:43 ../textw/userauth.py:48 ../textw/userauth.py:82
+#: ../textw/userauth.py:94 ../textw/userauth.py:102 ../textw/userauth.py:111
+#: ../textw/userauth.py:172 ../textw/userauth.py:244
 msgid "OK"
 msgstr ""
 
-#: ../text.py:64
+#: ../text.py:67
 msgid "/dev/ttyS0 (COM1 under DOS)"
 msgstr ""
 
-#: ../text.py:65
+#: ../text.py:68
 msgid "/dev/ttyS1 (COM2 under DOS)"
 msgstr ""
 
-#: ../text.py:66
+#: ../text.py:69
 msgid "/dev/ttyS2 (COM3 under DOS)"
 msgstr ""
 
-#: ../text.py:67
+#: ../text.py:70
 msgid "/dev/ttyS3 (COM4 under DOS)"
 msgstr ""
 
-#: ../iw/lilo.py:174 ../text.py:82 ../textw/lilo.py:78 ../textw/lilo.py:137
+#: ../iw/lilo.py:174 ../text.py:85 ../textw/lilo.py:79 ../textw/lilo.py:138
 msgid "Device"
 msgstr ""
 
-#: ../text.py:83
+#: ../text.py:86
 #, c-format
 msgid "What device is your mouse located on? %s %i"
 msgstr ""
@@ -86,9 +86,9 @@ msgstr ""
 #: ../libfdisk/newtfsedit.c:545 ../libfdisk/newtfsedit.c:581
 #: ../libfdisk/newtfsedit.c:1297 ../libfdisk/newtfsedit.c:1305
 #: ../libfdisk/newtfsedit.c:1430 ../libfdisk/newtfsedit.c:1451
-#: ../libfdisk/newtfsedit.c:1545 ../text.py:84 ../text.py:487
-#: ../textw/constants.py:10 ../textw/lilo.py:83 ../textw/lilo.py:96
-#: ../textw/lilo.py:146
+#: ../libfdisk/newtfsedit.c:1545 ../text.py:87 ../text.py:490
+#: ../textw/constants.py:10 ../textw/lilo.py:84 ../textw/lilo.py:97
+#: ../textw/lilo.py:147
 msgid "Ok"
 msgstr ""
 
@@ -97,67 +97,67 @@ msgstr ""
 #: ../loader/devices.c:165 ../loader/devices.c:210 ../loader/lang.c:503
 #: ../loader/loader.c:242 ../loader/loader.c:579 ../loader/loader.c:615
 #: ../loader/loader.c:715 ../loader/loader.c:1072 ../loader/net.c:162
-#: ../loader/net.c:284 ../loader/urls.c:124 ../loader/urls.c:322 ../text.py:84
-#: ../text.py:85 ../text.py:100 ../text.py:123 ../text.py:151 ../text.py:154
-#: ../text.py:177 ../text.py:204 ../text.py:218 ../text.py:220 ../text.py:239
-#: ../text.py:241 ../text.py:263 ../text.py:265 ../text.py:353 ../text.py:404
-#: ../text.py:406 ../text.py:425 ../text.py:434 ../text.py:453 ../text.py:455
-#: ../text.py:475 ../text.py:478 ../text.py:487 ../text.py:540 ../text.py:541
-#: ../text.py:763 ../text.py:785 ../textw/constants.py:10 ../textw/lilo.py:21
-#: ../textw/lilo.py:65 ../textw/lilo.py:72 ../textw/lilo.py:147
-#: ../textw/packages.py:22 ../textw/packages.py:87 ../textw/packages.py:138
-#: ../textw/packages.py:147 ../textw/partitioning.py:27
-#: ../textw/partitioning.py:64 ../textw/partitioning.py:184
-#: ../textw/userauth.py:31 ../textw/userauth.py:143 ../textw/userauth.py:174
-#: ../textw/userauth.py:246
+#: ../loader/net.c:284 ../loader/urls.c:124 ../loader/urls.c:322 ../text.py:87
+#: ../text.py:88 ../text.py:103 ../text.py:126 ../text.py:154 ../text.py:157
+#: ../text.py:180 ../text.py:207 ../text.py:221 ../text.py:223 ../text.py:242
+#: ../text.py:244 ../text.py:266 ../text.py:268 ../text.py:356 ../text.py:407
+#: ../text.py:409 ../text.py:428 ../text.py:437 ../text.py:456 ../text.py:458
+#: ../text.py:478 ../text.py:481 ../text.py:490 ../text.py:543 ../text.py:544
+#: ../text.py:766 ../text.py:788 ../textw/constants.py:10 ../textw/lilo.py:22
+#: ../textw/lilo.py:66 ../textw/lilo.py:73 ../textw/lilo.py:148
+#: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136
+#: ../textw/packages.py:145 ../textw/partitioning.py:25
+#: ../textw/partitioning.py:62 ../textw/partitioning.py:182
+#: ../textw/userauth.py:29 ../textw/userauth.py:141 ../textw/userauth.py:172
+#: ../textw/userauth.py:244
 msgid "Back"
 msgstr ""
 
-#: ../text.py:102
+#: ../text.py:105
 msgid "Which model mouse is attached to this computer?"
 msgstr ""
 
-#: ../text.py:111
+#: ../text.py:114
 msgid "Emulate 3 Buttons?"
 msgstr ""
 
-#: ../text.py:113
+#: ../text.py:116
 msgid "Mouse Selection"
 msgstr ""
 
-#: ../text.py:149 ../text.py:868
+#: ../text.py:152 ../text.py:871
 msgid "Keyboard Selection"
 msgstr ""
 
-#: ../text.py:150
+#: ../text.py:153
 msgid "Which model keyboard is attached to this computer?"
 msgstr ""
 
-#: ../text.py:170
+#: ../text.py:173
 msgid "Install GNOME Workstation"
 msgstr ""
 
-#: ../text.py:171
+#: ../text.py:174
 msgid "Install KDE Workstation"
 msgstr ""
 
-#: ../text.py:172
+#: ../text.py:175
 msgid "Install Server System"
 msgstr ""
 
-#: ../text.py:173
+#: ../text.py:176
 msgid "Install Custom System"
 msgstr ""
 
-#: ../text.py:174
+#: ../text.py:177
 msgid "Upgrade Existing Installation"
 msgstr ""
 
-#: ../text.py:175 ../text.py:871
+#: ../text.py:178 ../text.py:874
 msgid "Installation Type"
 msgstr ""
 
-#: ../text.py:176
+#: ../text.py:179
 msgid "What type of system would you like to install?"
 msgstr ""
 
@@ -165,27 +165,27 @@ msgstr ""
 #: ../loader/devices.c:178 ../loader/loader.c:458 ../loader/loader.c:468
 #: ../loader/loader.c:670 ../loader/loader.c:715 ../loader/loader.c:848
 #: ../loader/loader.c:853 ../loader/loader.c:1490 ../loader/urls.c:201
-#: ../loader/urls.c:206 ../text.py:201 ../text.py:581
+#: ../loader/urls.c:206 ../text.py:204 ../text.py:584
 msgid "Error"
 msgstr ""
 
-#: ../text.py:202
+#: ../text.py:205
 msgid "You don't have any Linux partitions. You can't upgrade this system!"
 msgstr ""
 
-#: ../text.py:215
+#: ../text.py:218
 msgid "System to Upgrade"
 msgstr ""
 
-#: ../text.py:216
+#: ../text.py:219
 msgid "What partition holds the root partition of your installation?"
 msgstr ""
 
-#: ../text.py:231
+#: ../text.py:234
 msgid "Customize Packages to Upgrade"
 msgstr ""
 
-#: ../text.py:232
+#: ../text.py:235
 msgid ""
 "The packages you have installed, and any other packages which are needed to "
 "satisfy their dependencies, have been selected for installation. Would you "
@@ -198,7 +198,7 @@ msgstr ""
 #: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
 #: ../libfdisk/newtfsedit.c:1483 ../libfdisk/newtfsedit.c:1501
 #: ../libfdisk/newtfsedit.c:1586 ../loader/loader.c:579 ../loader/net.c:698
-#: ../text.py:239 ../text.py:425 ../text.py:428 ../textw/partitioning.py:147
+#: ../text.py:242 ../text.py:428 ../text.py:431 ../textw/partitioning.py:145
 msgid "Yes"
 msgstr ""
 
@@ -207,16 +207,16 @@ msgstr ""
 #: ../libfdisk/gnomefsedit.c:2291 ../libfdisk/gnomefsedit.c:2344
 #: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
 #: ../libfdisk/newtfsedit.c:1483 ../libfdisk/newtfsedit.c:1501
-#: ../libfdisk/newtfsedit.c:1586 ../loader/net.c:698 ../text.py:239
-#: ../text.py:244 ../text.py:425 ../text.py:431 ../textw/partitioning.py:147
+#: ../libfdisk/newtfsedit.c:1586 ../loader/net.c:698 ../text.py:242
+#: ../text.py:247 ../text.py:428 ../text.py:434 ../textw/partitioning.py:145
 msgid "No"
 msgstr ""
 
-#: ../text.py:254
+#: ../text.py:257
 msgid "Red Hat Linux"
 msgstr ""
 
-#: ../text.py:255
+#: ../text.py:258
 msgid ""
 "Welcome to Red Hat Linux!\n"
 "\n"
@@ -228,57 +228,57 @@ msgid ""
 "purchase through our web site, http://www.redhat.com/."
 msgstr ""
 
-#: ../text.py:325
+#: ../text.py:328
 msgid "Use bootp/dhcp"
 msgstr ""
 
-#: ../loader/net.c:234 ../text.py:330
+#: ../loader/net.c:234 ../text.py:333
 msgid "IP address:"
 msgstr ""
 
-#: ../loader/net.c:237 ../text.py:331
+#: ../loader/net.c:237 ../text.py:334
 msgid "Netmask:"
 msgstr ""
 
-#: ../loader/net.c:240 ../text.py:332
+#: ../loader/net.c:240 ../text.py:335
 msgid "Default gateway (IP):"
 msgstr ""
 
-#: ../loader/net.c:243 ../text.py:333
+#: ../loader/net.c:243 ../text.py:336
 msgid "Primary nameserver:"
 msgstr ""
 
-#: ../text.py:355
+#: ../text.py:358
 msgid "Network Configuration"
 msgstr ""
 
-#: ../text.py:371
+#: ../text.py:374
 msgid "Invalid information"
 msgstr ""
 
-#: ../text.py:372
+#: ../text.py:375
 msgid "You must enter valid IP information to continue"
 msgstr ""
 
-#: ../text.py:400
+#: ../text.py:403
 msgid "Hostname Configuration"
 msgstr ""
 
-#: ../text.py:401
+#: ../text.py:404
 msgid ""
 "The hostname is the name of your computer.  If your computer is attached to "
 "a network, this may be assigned by your network administrator."
 msgstr ""
 
-#: ../iw/network.py:189 ../loader/net.c:460 ../loader/net.c:617 ../text.py:404
+#: ../iw/network.py:189 ../loader/net.c:460 ../loader/net.c:617 ../text.py:407
 msgid "Hostname"
 msgstr ""
 
-#: ../text.py:415 ../text.py:569 ../text.py:923
+#: ../text.py:418 ../text.py:572 ../text.py:926
 msgid "Bootdisk"
 msgstr ""
 
-#: ../text.py:416
+#: ../text.py:419
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without "
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -290,45 +290,45 @@ msgid ""
 "Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../text.py:451
+#: ../text.py:454
 msgid "X probe results"
 msgstr ""
 
-#: ../text.py:464 ../text.py:483
+#: ../text.py:467 ../text.py:486
 msgid "Unlisted Card"
 msgstr ""
 
-#: ../text.py:472
+#: ../text.py:475
 msgid "Video Card Selection"
 msgstr ""
 
-#: ../text.py:473
+#: ../text.py:476
 msgid "Which video card do you have?"
 msgstr ""
 
-#: ../text.py:485
+#: ../text.py:488
 msgid "X Server Selection"
 msgstr ""
 
-#: ../text.py:485
+#: ../text.py:488
 msgid "Choose a server"
 msgstr ""
 
-#: ../text.py:536
+#: ../text.py:539
 msgid "Installation to begin"
 msgstr ""
 
-#: ../iw/confirm.py:19 ../text.py:537
+#: ../iw/confirm.py:19 ../text.py:540
 msgid ""
 "A complete log of your installation will be in /tmp/install.log after "
 "rebooting your system. You may want to keep this file for later reference."
 msgstr ""
 
-#: ../text.py:553
+#: ../text.py:556
 msgid "Complete"
 msgstr ""
 
-#: ../iw/congrats.py:17 ../text.py:554
+#: ../iw/congrats.py:17 ../text.py:557
 msgid ""
 "Congratulations, installation is complete.\n"
 "\n"
@@ -340,191 +340,191 @@ msgid ""
 "chapter of the Official Red Hat Linux User's Guide."
 msgstr ""
 
-#: ../iw/bootdisk.py:41 ../text.py:570
+#: ../iw/bootdisk.py:41 ../text.py:573
 msgid ""
 "Insert a blank floppy in the first floppy drive. All data on this disk will "
 "be erased during creation of the boot disk."
 msgstr ""
 
-#: ../text.py:573 ../text.py:574 ../text.py:585 ../text.py:586
-#: ../textw/lilo.py:20
+#: ../text.py:576 ../text.py:577 ../text.py:588 ../text.py:589
+#: ../textw/lilo.py:21
 msgid "Skip"
 msgstr ""
 
-#: ../iw/bootdisk.py:45 ../text.py:582
+#: ../iw/bootdisk.py:45 ../text.py:585
 msgid ""
 "An error occured while making the boot disk. Please make sure that there is "
 "a formatted floppy in the first floppy drive."
 msgstr ""
 
-#: ../text.py:644
+#: ../text.py:647
 msgid "Package Installation"
 msgstr ""
 
-#: ../text.py:646
+#: ../text.py:649
 msgid "Name   : "
 msgstr ""
 
-#: ../text.py:647
+#: ../text.py:650
 msgid "Size   : "
 msgstr ""
 
-#: ../text.py:648
+#: ../text.py:651
 msgid "Summary: "
 msgstr ""
 
-#: ../text.py:674
+#: ../text.py:677
 msgid "    Packages"
 msgstr ""
 
-#: ../text.py:675
+#: ../text.py:678
 msgid "       Bytes"
 msgstr ""
 
-#: ../text.py:676
+#: ../text.py:679
 msgid "        Time"
 msgstr ""
 
-#: ../text.py:678
+#: ../text.py:681
 msgid "Total    :"
 msgstr ""
 
-#: ../text.py:685
+#: ../text.py:688
 msgid "Completed:   "
 msgstr ""
 
-#: ../text.py:695
+#: ../text.py:698
 msgid "Remaining:  "
 msgstr ""
 
-#: ../text.py:765
+#: ../text.py:768
 msgid "What time zone are you located in?"
 msgstr ""
 
-#: ../text.py:773
+#: ../text.py:776
 msgid "Hardware clock set to GMT?"
 msgstr ""
 
-#: ../iw/timezone.py:29 ../text.py:775
+#: ../iw/timezone.py:29 ../text.py:778
 msgid "Time Zone Selection"
 msgstr ""
 
-#: ../text.py:839 ../text.py:840
+#: ../text.py:842 ../text.py:843
 msgid "Debug"
 msgstr ""
 
-#: ../text.py:852
+#: ../text.py:855
 msgid "Red Hat Linux (C) 1999 Red Hat, Inc."
 msgstr ""
 
-#: ../text.py:854
+#: ../text.py:857
 msgid ""
 "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
 "screen"
 msgstr ""
 
-#: ../text.py:870
+#: ../text.py:873
 msgid "Welcome"
 msgstr ""
 
-#: ../iw/lilo.py:94 ../iw/lilo.py:197 ../text.py:876 ../text.py:882
+#: ../iw/lilo.py:94 ../iw/lilo.py:197 ../text.py:879 ../text.py:885
 msgid "Partition"
 msgstr ""
 
-#: ../text.py:878
+#: ../text.py:881
 msgid "Manually Partition"
 msgstr ""
 
-#: ../text.py:880
+#: ../text.py:883
 msgid "Automatic Partition"
 msgstr ""
 
-#: ../text.py:884
+#: ../text.py:887
 msgid "Swap"
 msgstr ""
 
-#: ../text.py:886
+#: ../text.py:889
 msgid "Filesystem Formatting"
 msgstr ""
 
-#: ../text.py:888 ../text.py:890 ../text.py:892 ../textw/lilo.py:23
-#: ../textw/lilo.py:62 ../textw/lilo.py:154
+#: ../text.py:891 ../text.py:893 ../text.py:895 ../textw/lilo.py:24
+#: ../textw/lilo.py:63 ../textw/lilo.py:155
 msgid "LILO Configuration"
 msgstr ""
 
-#: ../text.py:894
+#: ../text.py:897
 msgid "Hostname Setup"
 msgstr ""
 
-#: ../text.py:896
+#: ../text.py:899
 msgid "Network Setup"
 msgstr ""
 
-#: ../text.py:898 ../text.py:900
+#: ../text.py:901 ../text.py:903
 msgid "Mouse Configuration"
 msgstr ""
 
-#: ../text.py:902
+#: ../text.py:905
 msgid "Time Zone Setup"
 msgstr ""
 
-#: ../text.py:904 ../textw/userauth.py:10
+#: ../text.py:907 ../textw/userauth.py:8
 msgid "Root Password"
 msgstr ""
 
-#: ../text.py:906 ../textw/userauth.py:150
+#: ../text.py:909 ../textw/userauth.py:148
 msgid "User Account Setup"
 msgstr ""
 
-#: ../text.py:908
+#: ../text.py:911
 msgid "Authentication"
 msgstr ""
 
-#: ../text.py:910
+#: ../text.py:913
 msgid "Package Groups"
 msgstr ""
 
-#: ../text.py:912 ../text.py:933
+#: ../text.py:915 ../text.py:936
 msgid "Individual Packages"
 msgstr ""
 
-#: ../text.py:914 ../textw/packages.py:116
+#: ../text.py:917 ../textw/packages.py:114
 msgid "Package Dependencies"
 msgstr ""
 
-#: ../iw/xconfig.py:89 ../text.py:916 ../text.py:924
+#: ../iw/xconfig.py:89 ../text.py:919 ../text.py:927
 msgid "X Configuration"
 msgstr ""
 
-#: ../text.py:918
+#: ../text.py:921
 msgid "Boot Disk"
 msgstr ""
 
-#: ../text.py:920
+#: ../text.py:923
 msgid "Installation Begins"
 msgstr ""
 
-#: ../text.py:922
+#: ../text.py:925
 msgid "Install System"
 msgstr ""
 
-#: ../text.py:926
+#: ../text.py:929
 msgid "Installation Complete"
 msgstr ""
 
-#: ../text.py:931
+#: ../text.py:934
 msgid "Examine System"
 msgstr ""
 
-#: ../text.py:932
+#: ../text.py:935
 msgid "Customize Upgrade"
 msgstr ""
 
-#: ../text.py:934
+#: ../text.py:937
 msgid "Upgrade System"
 msgstr ""
 
-#: ../text.py:935
+#: ../text.py:938
 msgid "Upgrade Complete"
 msgstr ""
 
@@ -564,31 +564,31 @@ msgstr ""
 msgid "Account Name"
 msgstr ""
 
-#: ../iw/account.py:187 ../textw/userauth.py:82
+#: ../iw/account.py:187 ../textw/userauth.py:80
 msgid "Password"
 msgstr ""
 
-#: ../iw/account.py:191 ../textw/userauth.py:83
+#: ../iw/account.py:191 ../textw/userauth.py:81
 msgid "Password (confirm)"
 msgstr ""
 
-#: ../iw/account.py:195 ../iw/account.py:226 ../textw/userauth.py:81
-#: ../textw/userauth.py:162
+#: ../iw/account.py:195 ../iw/account.py:226 ../textw/userauth.py:79
+#: ../textw/userauth.py:160
 msgid "Full Name"
 msgstr ""
 
-#: ../iw/account.py:204 ../libfdisk/newtfsedit.c:1303 ../textw/userauth.py:173
+#: ../iw/account.py:204 ../libfdisk/newtfsedit.c:1303 ../textw/userauth.py:171
 msgid "Add"
 msgstr ""
 
 #: ../iw/account.py:206 ../libfdisk/newtfsedit.c:1296
-#: ../libfdisk/newtfsedit.c:1304 ../textw/lilo.py:146 ../textw/lilo.py:167
-#: ../textw/partitioning.py:63 ../textw/userauth.py:174
+#: ../libfdisk/newtfsedit.c:1304 ../textw/lilo.py:147 ../textw/lilo.py:168
+#: ../textw/partitioning.py:61 ../textw/userauth.py:172
 msgid "Edit"
 msgstr ""
 
 #: ../iw/account.py:208 ../libfdisk/newtfsedit.c:1296
-#: ../libfdisk/newtfsedit.c:1304 ../textw/userauth.py:173
+#: ../libfdisk/newtfsedit.c:1304 ../textw/userauth.py:171
 msgid "Delete"
 msgstr ""
 
@@ -596,7 +596,7 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../iw/auth.py:11 ../textw/userauth.py:248
+#: ../iw/auth.py:11 ../textw/userauth.py:246
 msgid "Authentication Configuration"
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 msgid "Enable shadow passwords"
 msgstr ""
 
-#: ../iw/auth.py:53 ../textw/userauth.py:253
+#: ../iw/auth.py:53 ../textw/userauth.py:251
 msgid "Enable NIS"
 msgstr ""
 
@@ -652,15 +652,15 @@ msgstr ""
 msgid "Unresolved Dependencies"
 msgstr ""
 
-#: ../iw/dependencies.py:30 ../iw/progress.py:117 ../textw/packages.py:123
+#: ../iw/dependencies.py:30 ../iw/progress.py:117 ../textw/packages.py:121
 msgid "Package"
 msgstr ""
 
-#: ../iw/dependencies.py:30 ../textw/packages.py:123
+#: ../iw/dependencies.py:30 ../textw/packages.py:121
 msgid "Requirement"
 msgstr ""
 
-#: ../iw/dependencies.py:37 ../textw/packages.py:135
+#: ../iw/dependencies.py:37 ../textw/packages.py:133
 msgid "Install packages to satisfy dependencies"
 msgstr ""
 
@@ -678,7 +678,7 @@ msgstr ""
 msgid "Customize packages to be upgraded"
 msgstr ""
 
-#: ../iw/fdisk.py:12 ../textw/partitioning.py:26
+#: ../iw/fdisk.py:12 ../textw/partitioning.py:24
 msgid "fdisk"
 msgstr ""
 
@@ -771,7 +771,7 @@ msgstr ""
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../iw/lilo.py:141 ../textw/lilo.py:18
+#: ../iw/lilo.py:141 ../textw/lilo.py:19
 msgid "Use linear mode (needed for some SCSI drives)"
 msgstr ""
 
@@ -787,16 +787,16 @@ msgstr ""
 msgid "Do not install LILO"
 msgstr ""
 
-#: ../iw/lilo.py:174 ../textw/lilo.py:137
+#: ../iw/lilo.py:174 ../textw/lilo.py:138
 msgid "Default"
 msgstr ""
 
-#: ../iw/lilo.py:174 ../textw/lilo.py:137
+#: ../iw/lilo.py:174 ../textw/lilo.py:138
 msgid "Partition type"
 msgstr ""
 
-#: ../iw/lilo.py:174 ../iw/lilo.py:209 ../textw/lilo.py:79
-#: ../textw/lilo.py:137
+#: ../iw/lilo.py:174 ../iw/lilo.py:209 ../textw/lilo.py:80
+#: ../textw/lilo.py:138
 msgid "Boot label"
 msgstr ""
 
@@ -864,11 +864,11 @@ msgstr ""
 msgid "Select Package For Installation"
 msgstr ""
 
-#: ../iw/package.py:377 ../textw/packages.py:24 ../textw/packages.py:89
+#: ../iw/package.py:377 ../textw/packages.py:22 ../textw/packages.py:87
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../iw/package.py:442 ../textw/packages.py:20
+#: ../iw/package.py:442 ../textw/packages.py:18
 msgid "Select individual packages"
 msgstr ""
 
@@ -912,15 +912,15 @@ msgstr ""
 msgid "Confirm Partitioning Selection"
 msgstr ""
 
-#: ../iw/rootpartition.py:29 ../textw/partitioning.py:26
+#: ../iw/rootpartition.py:29 ../textw/partitioning.py:24
 msgid "Disk Druid"
 msgstr ""
 
-#: ../iw/rootpartition.py:91 ../textw/partitioning.py:109
+#: ../iw/rootpartition.py:91 ../textw/partitioning.py:107
 msgid "Automatic Partitioning"
 msgstr ""
 
-#: ../iw/rootpartition.py:130 ../textw/partitioning.py:110
+#: ../iw/rootpartition.py:130 ../textw/partitioning.py:108
 #, c-format
 msgid ""
 "%s\n"
@@ -934,7 +934,7 @@ msgstr ""
 msgid "Remove data"
 msgstr ""
 
-#: ../iw/rootpartition.py:145 ../textw/partitioning.py:114
+#: ../iw/rootpartition.py:145 ../textw/partitioning.py:112
 msgid "Manually partition"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "Skip X Configuration"
 msgstr ""
 
-#: ../textw/lilo.py:12
+#: ../textw/lilo.py:13
 msgid ""
 "A few systems will need to pass special options to the kernel at boot time "
 "for the system to function properly. If you need to pass boot options to the "
@@ -1025,44 +1025,44 @@ msgid ""
 "blank."
 msgstr ""
 
-#: ../textw/lilo.py:63
+#: ../textw/lilo.py:64
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../textw/lilo.py:83 ../textw/lilo.py:104
+#: ../textw/lilo.py:84 ../textw/lilo.py:105
 msgid "Clear"
 msgstr ""
 
 #: ../libfdisk/gnomefsedit.c:655 ../libfdisk/gnomefsedit.c:1620
 #: ../libfdisk/gnomefsedit.c:2129 ../libfdisk/newtfsedit.c:450
-#: ../libfdisk/newtfsedit.c:1501 ../loader/devices.c:165 ../textw/lilo.py:83
-#: ../textw/lilo.py:101 ../textw/userauth.py:64
+#: ../libfdisk/newtfsedit.c:1501 ../loader/devices.c:165 ../textw/lilo.py:84
+#: ../textw/lilo.py:102 ../textw/userauth.py:62
 msgid "Cancel"
 msgstr ""
 
-#: ../textw/lilo.py:91
+#: ../textw/lilo.py:92
 msgid "Edit Boot Label"
 msgstr ""
 
-#: ../textw/lilo.py:149
+#: ../textw/lilo.py:150
 msgid ""
 "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 and what "
 "label you want to use for each of them."
 msgstr ""
 
-#: ../textw/packages.py:117
+#: ../textw/packages.py:115
 msgid ""
 "Some of the packages you have selected to install require packages you have "
 "not selected. If you just select Ok all of those required packages will be "
 "installed."
 msgstr ""
 
-#: ../textw/partitioning.py:18 ../textw/partitioning.py:57
+#: ../textw/partitioning.py:16 ../textw/partitioning.py:55
 msgid "Disk Setup"
 msgstr ""
 
-#: ../textw/partitioning.py:19
+#: ../textw/partitioning.py:17
 msgid ""
 "Disk Druid is a tool for partitioning and setting up mount points. It is "
 "designed to be easier to use than Linux's traditional disk partitioning "
@@ -1072,33 +1072,33 @@ msgid ""
 "Which tool would you like to use?"
 msgstr ""
 
-#: ../textw/partitioning.py:58
+#: ../textw/partitioning.py:56
 msgid ""
 "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 boot into Linux with LILO."
 msgstr ""
 
-#: ../loader/loader.c:290 ../loader/loader.c:315 ../textw/partitioning.py:63
+#: ../loader/loader.c:290 ../loader/loader.c:315 ../textw/partitioning.py:61
 msgid "Done"
 msgstr ""
 
-#: ../textw/partitioning.py:114 ../textw/partitioning.py:115
+#: ../textw/partitioning.py:112 ../textw/partitioning.py:113
 msgid "Continue"
 msgstr ""
 
-#: ../textw/partitioning.py:142
+#: ../textw/partitioning.py:140
 msgid "Low Memory"
 msgstr ""
 
-#: ../textw/partitioning.py:143
+#: ../textw/partitioning.py:141
 msgid ""
 "As you don't have much memory in this machine, we need to turn on swap space "
 "immediately. To do this we'll have to write your new partition table to the "
 "disk immediately. Is that okay?"
 msgstr ""
 
-#: ../textw/partitioning.py:162
+#: ../textw/partitioning.py:160
 msgid ""
 "What partitions would you like to format? We strongly suggest formatting all "
 "of the system partitions, including /, /usr, and /var. There is no need to "
@@ -1106,116 +1106,116 @@ msgid ""
 "previous install."
 msgstr ""
 
-#: ../textw/partitioning.py:182
+#: ../textw/partitioning.py:180
 msgid "Check for bad blocks during format"
 msgstr ""
 
-#: ../textw/partitioning.py:186
+#: ../textw/partitioning.py:184
 msgid "Choose Partitions to Format"
 msgstr ""
 
-#: ../textw/userauth.py:12
+#: ../textw/userauth.py:10
 msgid ""
 "Pick a root password. You must type it twice to ensure you know what it is "
 "and didn't make a mistake in typing. Remember that the root password is a "
 "critical part of system security!"
 msgstr ""
 
-#: ../loader/urls.c:298 ../textw/userauth.py:25
+#: ../loader/urls.c:298 ../textw/userauth.py:23
 msgid "Password:"
 msgstr ""
 
-#: ../textw/userauth.py:26
+#: ../textw/userauth.py:24
 msgid "Password (again):"
 msgstr ""
 
-#: ../textw/userauth.py:42 ../textw/userauth.py:93
+#: ../textw/userauth.py:40 ../textw/userauth.py:91
 msgid "Password Length"
 msgstr ""
 
-#: ../textw/userauth.py:43
+#: ../textw/userauth.py:41
 msgid "The root password must be at least 6 characters long."
 msgstr ""
 
-#: ../textw/userauth.py:47 ../textw/userauth.py:101
+#: ../textw/userauth.py:45 ../textw/userauth.py:99
 msgid "Password Mismatch"
 msgstr ""
 
-#: ../textw/userauth.py:48 ../textw/userauth.py:102
+#: ../textw/userauth.py:46 ../textw/userauth.py:100
 msgid "The passwords you entered were different. Please try again."
 msgstr ""
 
-#: ../textw/userauth.py:73
+#: ../textw/userauth.py:71
 msgid "Edit User"
 msgstr ""
 
-#: ../textw/userauth.py:75
+#: ../textw/userauth.py:73
 msgid "Add User"
 msgstr ""
 
-#: ../textw/userauth.py:80
+#: ../textw/userauth.py:78
 msgid "User ID"
 msgstr ""
 
-#: ../textw/userauth.py:94
+#: ../textw/userauth.py:92
 msgid "The password must be at least 6 characters long."
 msgstr ""
 
-#: ../textw/userauth.py:111
+#: ../textw/userauth.py:109
 msgid "User Exists"
 msgstr ""
 
-#: ../textw/userauth.py:112
+#: ../textw/userauth.py:110
 msgid "This user id already exists.  Choose another."
 msgstr ""
 
-#: ../textw/userauth.py:139
+#: ../textw/userauth.py:137
 msgid ""
 "You should use a normal user account for most activities on your system. By "
 "not using the root account casually, you'll reduce the chance of disrupting "
 "your system's configuration."
 msgstr ""
 
-#: ../textw/userauth.py:152
+#: ../textw/userauth.py:150
 msgid ""
 "What user account would you like to have on the system? You should have at "
 "least one non-root account for normal work, but multi-user systems can have "
 "any number of accounts set up."
 msgstr ""
 
-#: ../textw/userauth.py:162
+#: ../textw/userauth.py:160
 msgid "User name"
 msgstr ""
 
-#: ../textw/userauth.py:186
+#: ../textw/userauth.py:184
 msgid "Enter the information for the user."
 msgstr ""
 
-#: ../textw/userauth.py:198
+#: ../textw/userauth.py:196
 msgid "Change the information for this user."
 msgstr ""
 
-#: ../textw/userauth.py:249
+#: ../textw/userauth.py:247
 msgid "Use Shadow Passwords"
 msgstr ""
 
-#: ../textw/userauth.py:251
+#: ../textw/userauth.py:249
 msgid "Enable MD5 Passwords"
 msgstr ""
 
-#: ../textw/userauth.py:258
+#: ../textw/userauth.py:256
 msgid "NIS Domain:"
 msgstr ""
 
-#: ../textw/userauth.py:260
+#: ../textw/userauth.py:258
 msgid "NIS Server:"
 msgstr ""
 
-#: ../textw/userauth.py:262
+#: ../textw/userauth.py:260
 msgid "or use:"
 msgstr ""
 
-#: ../textw/userauth.py:265
+#: ../textw/userauth.py:263
 msgid "Request server via broadcast"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 87177e078..35c440c3e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -414,39 +414,39 @@ msgstr "Installation von Paketen"
 
 #: ../text.py:636
 msgid "Name   : "
-msgstr "Name           :"
+msgstr "Name           : "
 
 #: ../text.py:637
 msgid "Size   : "
-msgstr "Gr÷˜e          :"
+msgstr "Gr÷˜e          : "
 
 #: ../text.py:638
 msgid "Summary: "
-msgstr "Zusammenfassung:"
+msgstr "Zusammenfassung: "
 
 #: ../text.py:664
 msgid "    Packages"
-msgstr " Pakete"
+msgstr "    Pakete"
 
 #: ../text.py:665
 msgid "       Bytes"
-msgstr " Byte"
+msgstr "       Byte"
 
 #: ../text.py:666
 msgid "        Time"
-msgstr " Zeit"
+msgstr "        Zeit"
 
 #: ../text.py:668
 msgid "Total    :"
-msgstr "Gesamt  :"
+msgstr "Gesamt       :"
 
 #: ../text.py:675
 msgid "Completed:   "
-msgstr "Abgeschlossen:   "
+msgstr "Abgeschlossen:"
 
 #: ../text.py:685
 msgid "Remaining:  "
-msgstr "Verbleibend:  "
+msgstr "Verbleibend  :"
 
 #: ../text.py:755
 msgid "What time zone are you located in?"
@@ -1150,6 +1150,12 @@ msgid ""
 "\n"
 "Which tool would you like to use?"
 msgstr ""
+"Disk Druid ist ein Tool zum Partitionieren und Einrichten von Mount-Points. "
+"Es ist leistungsfähiger und leichter zu bedienen als fdisk, das herkömmliche "
+"Linux-Tool zur Festplattenpartitionierung. Es gibt jedoch einige Fälle, in "
+"denen fdisk möglicherweise geeigneter ist.\n"
+"\n"
+"Welches Tool möchten Sie verwenden?"
 
 #: ../textw/partitioning.py:58
 msgid ""
diff --git a/text.py b/text.py
index e947e6d3a..41f6ddf98 100644
--- a/text.py
+++ b/text.py
@@ -7,6 +7,12 @@ import rpm
 import time
 import gettext
 import glob
+
+cat = gettext.Catalog ("anaconda", "/usr/share/locale")
+
+def _(string):
+    return cat.gettext (string)
+
 from textw.constants import *
 from textw.lilo import LiloWindow
 from textw.lilo import LiloAppendWindow
@@ -25,9 +31,6 @@ from textw.packages import IndividualPackageWindow
 from textw.packages import PackageDepWindow
 import installclass
 
-cat = gettext.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
-
 class LanguageWindow:
     def __call__(self, screen, todo):
         languages = todo.language.available ()
diff --git a/textw/constants.py b/textw/constants.py
index 2b7c1c94f..0b577ff0d 100644
--- a/textw/constants.py
+++ b/textw/constants.py
@@ -1,10 +1,10 @@
 import gettext
-
+from text import _
 INSTALL_OK = 0
 INSTALL_BACK = -1
 INSTALL_NOOP = -2
 
-cat = gettext.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
+#cat = gettext.Catalog ("anaconda", "/usr/share/locale")
+#_ = cat.gettext
 
 basicButtons = ((_("Ok"), "ok"), (_("Back"), "back"))
diff --git a/textw/lilo.py b/textw/lilo.py
index 556f6b2ae..4b828523a 100644
--- a/textw/lilo.py
+++ b/textw/lilo.py
@@ -1,9 +1,10 @@
 import gettext
 from snack import *
 from textw.constants import *
+from text import _
 
-cat = gettext.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
+#cat = gettext.Catalog ("anaconda", "/usr/share/locale")
+#_ = cat.gettext
 
 class LiloAppendWindow:
 
diff --git a/textw/packages.py b/textw/packages.py
index 379239362..e659abbfd 100644
--- a/textw/packages.py
+++ b/textw/packages.py
@@ -2,9 +2,7 @@ import rpm
 import gettext
 from snack import *
 from textw.constants import *
-
-cat = gettext.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
+from text import _
 
 class PackageGroupWindow:
     def __call__(self, screen, todo, individual):
diff --git a/textw/partitioning.py b/textw/partitioning.py
index 98328ba9f..dd79597d6 100644
--- a/textw/partitioning.py
+++ b/textw/partitioning.py
@@ -5,9 +5,7 @@ import isys
 from snack import *
 from textw.constants import *
 from newtpyfsedit import fsedit        
-
-cat = gettext.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
+from text import _
 
 class PartitionMethod:
     def __call__(self, screen, todo):
diff --git a/textw/userauth.py b/textw/userauth.py
index b4c55126a..abb38ea9f 100644
--- a/textw/userauth.py
+++ b/textw/userauth.py
@@ -1,9 +1,7 @@
 import gettext
 from snack import *
 from textw.constants import *
-
-cat = gettext.Catalog ("anaconda", "/usr/share/locale")
-_ = cat.gettext
+from text import _
         
 class RootPasswordWindow:
     def __call__ (self, screen, todo):