summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/anaconda.pot333
-rwxr-xr-xscripts/upd-bootimage10
-rw-r--r--text.py168
-rw-r--r--textw/bootdisk_text.py5
-rw-r--r--textw/lilo_text.py9
-rw-r--r--textw/network_text.py6
-rw-r--r--textw/packages_text.py17
-rw-r--r--textw/partitioning_text.py16
-rw-r--r--textw/silo_text.py8
-rw-r--r--textw/timezone_text.py3
-rw-r--r--textw/userauth_text.py10
-rw-r--r--translate.py5
12 files changed, 323 insertions, 267 deletions
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 0ae8512c0..2462f94f5 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-04-28 17:31-0400\n"
+"POT-Creation-Date: 2000-05-01 16:21-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,16 +14,16 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../fstab.py:248 ../fstab.py:416
+#: ../fstab.py:249 ../fstab.py:453
msgid "Formatting"
msgstr ""
-#: ../fstab.py:249
+#: ../fstab.py:250
#, c-format
msgid "Formatting swap space on /dev/%s..."
msgstr ""
-#: ../fstab.py:259 ../fstab.py:344 ../fstab.py:482
+#: ../fstab.py:260 ../fstab.py:345 ../fstab.py:516
#: ../libfdisk/newtfsedit.c:1573 ../loader/devices.c:211
#: ../loader/devices.c:216 ../loader/devices.c:380 ../loader/devices.c:417
#: ../loader/devices.c:437 ../loader/lang.c:90 ../loader/loader.c:475
@@ -31,43 +31,43 @@ msgstr ""
#: ../loader/loader.c:919 ../loader/loader.c:924 ../loader/loader.c:1734
#: ../loader/loader.c:1780 ../loader/loader.c:1851 ../loader/urls.c:72
#: ../loader/urls.c:81 ../loader/urls.c:88 ../loader/urls.c:227
-#: ../loader/urls.c:232 ../text.py:325 ../textw/bootdisk_text.py:66
-#: ../todo.py:359 ../todo.py:675 ../todo.py:706 ../todo.py:761
+#: ../loader/urls.c:232 ../text.py:326 ../textw/bootdisk_text.py:66
+#: ../todo.py:340 ../todo.py:663 ../todo.py:694 ../todo.py:751
msgid "Error"
msgstr ""
-#: ../fstab.py:259
+#: ../fstab.py:260
msgid "Error creating swap on device "
msgstr ""
-#: ../fstab.py:345
+#: ../fstab.py:346
#, c-format
msgid "Error unmounting %s: %s"
msgstr ""
-#: ../fstab.py:367 ../todo.py:443
+#: ../fstab.py:393 ../todo.py:424
msgid "Creating"
msgstr ""
-#: ../fstab.py:367
+#: ../fstab.py:393
msgid "Creating RAID devices..."
msgstr ""
-#: ../fstab.py:417
+#: ../fstab.py:454
#, c-format
msgid "Formatting %s filesystem..."
msgstr ""
-#: ../fstab.py:439
+#: ../fstab.py:473
msgid "Loopback"
msgstr ""
-#: ../fstab.py:440
+#: ../fstab.py:474
#, c-format
msgid "Creating loopback filesystem on device /dev/%s..."
msgstr ""
-#: ../fstab.py:483
+#: ../fstab.py:517
#, c-format
msgid "Error mounting %s: %s"
msgstr ""
@@ -82,16 +82,16 @@ msgstr ""
#: ../loader/loader.c:256 ../loader/loader.c:612 ../loader/loader.c:648
#: ../loader/loader.c:758 ../loader/loader.c:1201 ../loader/net.c:162
#: ../loader/net.c:230 ../loader/net.c:315 ../loader/urls.c:149
-#: ../loader/urls.c:370 ../text.py:83 ../text.py:94 ../text.py:134
-#: ../text.py:135 ../text.py:154 ../text.py:177 ../text.py:207 ../text.py:210
-#: ../text.py:274 ../text.py:328 ../text.py:342 ../text.py:344 ../text.py:363
-#: ../text.py:365 ../text.py:387 ../text.py:389 ../text.py:445 ../text.py:447
-#: ../text.py:473 ../text.py:476 ../text.py:485 ../text.py:545 ../text.py:546
+#: ../loader/urls.c:370 ../text.py:84 ../text.py:95 ../text.py:135
+#: ../text.py:136 ../text.py:155 ../text.py:178 ../text.py:208 ../text.py:211
+#: ../text.py:275 ../text.py:329 ../text.py:343 ../text.py:345 ../text.py:364
+#: ../text.py:366 ../text.py:388 ../text.py:390 ../text.py:446 ../text.py:448
+#: ../text.py:474 ../text.py:477 ../text.py:486 ../text.py:546 ../text.py:547
#: ../textw/bootdisk_text.py:12 ../textw/bootdisk_text.py:30
#: ../textw/bootdisk_text.py:43 ../textw/constants_text.py:10
#: ../textw/lilo_text.py:31 ../textw/lilo_text.py:87 ../textw/lilo_text.py:94
-#: ../textw/lilo_text.py:188 ../textw/network_text.py:92
-#: ../textw/network_text.py:142 ../textw/network_text.py:144
+#: ../textw/lilo_text.py:188 ../textw/network_text.py:93
+#: ../textw/network_text.py:143 ../textw/network_text.py:145
#: ../textw/packages_text.py:20 ../textw/packages_text.py:195
#: ../textw/packages_text.py:257 ../textw/packages_text.py:266
#: ../textw/partitioning_text.py:23 ../textw/partitioning_text.py:64
@@ -119,8 +119,8 @@ msgstr ""
msgid "Online Help"
msgstr ""
-#: ../gui.py:297 ../iw/language_gui.py:10 ../text.py:88 ../text.py:837
-#: ../text.py:866
+#: ../gui.py:297 ../iw/language_gui.py:10 ../text.py:89 ../text.py:838
+#: ../text.py:867
msgid "Language Selection"
msgstr ""
@@ -176,41 +176,41 @@ msgstr ""
#: ../libfdisk/newtfsedit.c:1322 ../libfdisk/newtfsedit.c:1330
#: ../libfdisk/newtfsedit.c:1458 ../libfdisk/newtfsedit.c:1479
#: ../libfdisk/newtfsedit.c:1573 ../loader/urls.c:72 ../loader/urls.c:81
-#: ../loader/urls.c:88 ../loader/urls.c:238 ../text.py:83 ../text.py:85
-#: ../text.py:134 ../text.py:485 ../textw/constants_text.py:10
+#: ../loader/urls.c:88 ../loader/urls.c:238 ../text.py:84 ../text.py:86
+#: ../text.py:135 ../text.py:486 ../textw/constants_text.py:10
#: ../textw/lilo_text.py:105 ../textw/lilo_text.py:187
#: ../textw/silo_text.py:135 ../textw/silo_text.py:148
#: ../textw/silo_text.py:204
msgid "Ok"
msgstr ""
-#: ../text.py:89
+#: ../text.py:90
msgid "What language would you like to use during the installation process?"
msgstr ""
-#: ../text.py:114
+#: ../text.py:115
msgid "/dev/ttyS0 (COM1 under DOS)"
msgstr ""
-#: ../text.py:115
+#: ../text.py:116
msgid "/dev/ttyS1 (COM2 under DOS)"
msgstr ""
-#: ../text.py:116
+#: ../text.py:117
msgid "/dev/ttyS2 (COM3 under DOS)"
msgstr ""
-#: ../text.py:117
+#: ../text.py:118
msgid "/dev/ttyS3 (COM4 under DOS)"
msgstr ""
-#: ../iw/lilo_gui.py:223 ../iw/silo_gui.py:256 ../text.py:132
+#: ../iw/lilo_gui.py:223 ../iw/silo_gui.py:256 ../text.py:133
#: ../textw/lilo_text.py:100 ../textw/lilo_text.py:178
#: ../textw/silo_text.py:130 ../textw/silo_text.py:195
msgid "Device"
msgstr ""
-#: ../text.py:133
+#: ../text.py:134
#, c-format
msgid "What device is your mouse located on? %s %i"
msgstr ""
@@ -228,92 +228,92 @@ msgstr ""
#: ../loader/net.c:162 ../loader/net.c:230 ../loader/net.c:315
#: ../loader/net.c:606 ../loader/net.c:637 ../loader/urls.c:149
#: ../loader/urls.c:227 ../loader/urls.c:232 ../loader/urls.c:370
-#: ../text.py:154 ../text.py:207 ../text.py:274 ../text.py:342 ../text.py:387
-#: ../text.py:404 ../text.py:445 ../text.py:473 ../text.py:545 ../text.py:570
-#: ../text.py:584 ../text.py:604 ../text.py:794 ../text.py:798 ../text.py:997
+#: ../text.py:155 ../text.py:208 ../text.py:275 ../text.py:343 ../text.py:388
+#: ../text.py:405 ../text.py:446 ../text.py:474 ../text.py:546 ../text.py:571
+#: ../text.py:585 ../text.py:605 ../text.py:795 ../text.py:799 ../text.py:998
#: ../textw/bootdisk_text.py:58 ../textw/bootdisk_text.py:70
#: ../textw/lilo_text.py:30 ../textw/lilo_text.py:87 ../textw/lilo_text.py:137
-#: ../textw/network_text.py:92 ../textw/network_text.py:112
-#: ../textw/network_text.py:142 ../textw/packages_text.py:20
+#: ../textw/network_text.py:93 ../textw/network_text.py:113
+#: ../textw/network_text.py:143 ../textw/packages_text.py:20
#: ../textw/packages_text.py:53 ../textw/packages_text.py:195
#: ../textw/packages_text.py:257 ../textw/partitioning_text.py:239
#: ../textw/partitioning_text.py:288 ../textw/partitioning_text.py:298
-#: ../textw/partitioning_text.py:306 ../textw/silo_text.py:25
-#: ../textw/silo_text.py:98 ../textw/timezone_text.py:66
-#: ../textw/userauth_text.py:30 ../textw/userauth_text.py:44
-#: ../textw/userauth_text.py:49 ../textw/userauth_text.py:82
-#: ../textw/userauth_text.py:95 ../textw/userauth_text.py:101
-#: ../textw/userauth_text.py:107 ../textw/userauth_text.py:115
-#: ../textw/userauth_text.py:124 ../textw/userauth_text.py:185
-#: ../textw/userauth_text.py:257
+#: ../textw/partitioning_text.py:306 ../textw/partitioning_text.py:313
+#: ../textw/silo_text.py:25 ../textw/silo_text.py:98
+#: ../textw/timezone_text.py:66 ../textw/userauth_text.py:30
+#: ../textw/userauth_text.py:44 ../textw/userauth_text.py:49
+#: ../textw/userauth_text.py:82 ../textw/userauth_text.py:95
+#: ../textw/userauth_text.py:101 ../textw/userauth_text.py:107
+#: ../textw/userauth_text.py:115 ../textw/userauth_text.py:124
+#: ../textw/userauth_text.py:185 ../textw/userauth_text.py:257
msgid "OK"
msgstr ""
-#: ../text.py:156
+#: ../text.py:157
msgid "Which model mouse is attached to this computer?"
msgstr ""
-#: ../text.py:165
+#: ../text.py:166
msgid "Emulate 3 Buttons?"
msgstr ""
-#: ../text.py:167
+#: ../text.py:168
msgid "Mouse Selection"
msgstr ""
-#: ../text.py:205 ../text.py:839 ../text.py:868
+#: ../text.py:206 ../text.py:840 ../text.py:869
msgid "Keyboard Selection"
msgstr ""
-#: ../text.py:206
+#: ../text.py:207
msgid "Which model keyboard is attached to this computer?"
msgstr ""
-#: ../text.py:267
+#: ../text.py:268
msgid "Install GNOME Workstation"
msgstr ""
-#: ../text.py:268
+#: ../text.py:269
msgid "Install KDE Workstation"
msgstr ""
-#: ../text.py:269
+#: ../text.py:270
msgid "Install Server System"
msgstr ""
-#: ../text.py:270
+#: ../text.py:271
msgid "Install Custom System"
msgstr ""
-#: ../text.py:271
+#: ../text.py:272
msgid "Upgrade Existing Installation"
msgstr ""
-#: ../text.py:272 ../text.py:871
+#: ../text.py:273 ../text.py:872
msgid "Installation Type"
msgstr ""
-#: ../text.py:273
+#: ../text.py:274
msgid "What type of system would you like to install?"
msgstr ""
-#: ../text.py:326
+#: ../text.py:327
msgid "You don't have any Linux partitions. You can't upgrade this system!"
msgstr ""
-#: ../text.py:339
+#: ../text.py:340
msgid "System to Upgrade"
msgstr ""
-#: ../text.py:340
+#: ../text.py:341
msgid "What partition holds the root partition of your installation?"
msgstr ""
-#: ../text.py:355
+#: ../text.py:356
msgid "Customize Packages to Upgrade"
msgstr ""
-#: ../text.py:356
+#: ../text.py:357
msgid ""
"The packages you have installed, and any other packages which are needed to "
"satisfy their dependencies, have been selected for installation. Would you "
@@ -327,7 +327,7 @@ msgstr ""
#: ../libfdisk/newtfsedit.c:518 ../libfdisk/newtfsedit.c:720
#: ../libfdisk/newtfsedit.c:1511 ../libfdisk/newtfsedit.c:1529
#: ../libfdisk/newtfsedit.c:1614 ../loader/devices.c:191
-#: ../loader/loader.c:612 ../loader/net.c:771 ../text.py:363
+#: ../loader/loader.c:612 ../loader/net.c:771 ../text.py:364
#: ../textw/bootdisk_text.py:12 ../textw/bootdisk_text.py:30
#: ../textw/bootdisk_text.py:37 ../textw/partitioning_text.py:200
msgid "Yes"
@@ -340,17 +340,17 @@ msgstr ""
#: ../libfdisk/newtfsedit.c:518 ../libfdisk/newtfsedit.c:720
#: ../libfdisk/newtfsedit.c:1511 ../libfdisk/newtfsedit.c:1529
#: ../libfdisk/newtfsedit.c:1614 ../loader/devices.c:192 ../loader/net.c:771
-#: ../text.py:363 ../text.py:368 ../textw/bootdisk_text.py:12
+#: ../text.py:364 ../text.py:369 ../textw/bootdisk_text.py:12
#: ../textw/bootdisk_text.py:30 ../textw/bootdisk_text.py:40
#: ../textw/partitioning_text.py:200
msgid "No"
msgstr ""
-#: ../text.py:378 ../text.py:396
+#: ../text.py:379 ../text.py:397
msgid "Red Hat Linux"
msgstr ""
-#: ../text.py:379
+#: ../text.py:380
msgid ""
"Welcome to Red Hat Linux!\n"
"\n"
@@ -362,7 +362,7 @@ msgid ""
"purchase through our web site, http://www.redhat.com/."
msgstr ""
-#: ../text.py:397
+#: ../text.py:398
msgid ""
"Welcome to the Red Hat Linux!\n"
"\n"
@@ -375,51 +375,51 @@ msgstr ""
#: ../libfdisk/gnomefsedit.c:788 ../libfdisk/gnomefsedit.c:1780
#: ../libfdisk/gnomefsedit.c:2288 ../libfdisk/newtfsedit.c:482
#: ../libfdisk/newtfsedit.c:1529 ../loader/devices.c:199
-#: ../loader/devices.c:463 ../loader/loader.c:1843 ../text.py:404
-#: ../text.py:406 ../textw/lilo_text.py:106 ../textw/silo_text.py:135
+#: ../loader/devices.c:463 ../loader/loader.c:1843 ../text.py:405
+#: ../text.py:407 ../textw/lilo_text.py:106 ../textw/silo_text.py:135
#: ../textw/silo_text.py:153 ../textw/userauth_text.py:63
msgid "Cancel"
msgstr ""
-#: ../text.py:443
+#: ../text.py:444
msgid "X probe results"
msgstr ""
-#: ../text.py:462 ../text.py:481
+#: ../text.py:463 ../text.py:482
msgid "Unlisted Card"
msgstr ""
-#: ../text.py:470
+#: ../text.py:471
msgid "Video Card Selection"
msgstr ""
-#: ../text.py:471
+#: ../text.py:472
msgid "Which video card do you have?"
msgstr ""
-#: ../text.py:483
+#: ../text.py:484
msgid "X Server Selection"
msgstr ""
-#: ../text.py:483
+#: ../text.py:484
msgid "Choose a server"
msgstr ""
-#: ../text.py:541
+#: ../text.py:542
msgid "Installation to begin"
msgstr ""
-#: ../iw/confirm_gui.py:33 ../text.py:542
+#: ../iw/confirm_gui.py:33 ../text.py:543
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:559 ../text.py:574 ../text.py:594
+#: ../text.py:560 ../text.py:575 ../text.py:595
msgid "Complete"
msgstr ""
-#: ../iw/congrats_gui.py:32 ../text.py:560
+#: ../iw/congrats_gui.py:32 ../text.py:561
msgid ""
"Congratulations, installation is complete.\n"
"\n"
@@ -432,7 +432,7 @@ msgid ""
"in the Red Hat Linux manuals."
msgstr ""
-#: ../text.py:575 ../text.py:595
+#: ../text.py:576 ../text.py:596
msgid ""
"Congratulations, configuration is complete.\n"
"\n"
@@ -443,276 +443,276 @@ msgid ""
"install chapter of the Official Red Hat Linux User's Guide."
msgstr ""
-#: ../text.py:658
+#: ../text.py:659
msgid "Package Installation"
msgstr ""
-#: ../text.py:660
+#: ../text.py:661
msgid "Name : "
msgstr ""
-#: ../text.py:661
+#: ../text.py:662
msgid "Size : "
msgstr ""
-#: ../text.py:662
+#: ../text.py:663
msgid "Summary: "
msgstr ""
-#: ../text.py:688
+#: ../text.py:689
msgid " Packages"
msgstr ""
-#: ../text.py:689
+#: ../text.py:690
msgid " Bytes"
msgstr ""
-#: ../text.py:690
+#: ../text.py:691
msgid " Time"
msgstr ""
-#: ../text.py:692
+#: ../text.py:693
msgid "Total :"
msgstr ""
-#: ../text.py:699
+#: ../text.py:700
msgid "Completed: "
msgstr ""
-#: ../text.py:709
+#: ../text.py:710
msgid "Remaining: "
msgstr ""
-#: ../text.py:798 ../text.py:799
+#: ../text.py:799 ../text.py:800
msgid "Debug"
msgstr ""
-#: ../text.py:811
+#: ../text.py:812
msgid "Red Hat Linux (C) 2000 Red Hat, Inc."
msgstr ""
-#: ../text.py:813 ../textw/packages_text.py:220
+#: ../text.py:814 ../textw/packages_text.py:220
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next "
"screen"
msgstr ""
-#: ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:835
-#: ../text.py:870
+#: ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:836
+#: ../text.py:871
msgid "Welcome"
msgstr ""
-#: ../text.py:841 ../text.py:909
+#: ../text.py:842 ../text.py:910
msgid "Hostname Setup"
msgstr ""
-#: ../text.py:843 ../text.py:911
+#: ../text.py:844 ../text.py:912
msgid "Network Setup"
msgstr ""
-#: ../text.py:849 ../text.py:917
+#: ../text.py:850 ../text.py:918
msgid "Time Zone Setup"
msgstr ""
-#: ../text.py:851 ../text.py:919 ../textw/userauth_text.py:9
+#: ../text.py:852 ../text.py:920 ../textw/userauth_text.py:9
msgid "Root Password"
msgstr ""
-#: ../text.py:853 ../text.py:921 ../textw/userauth_text.py:161
+#: ../text.py:854 ../text.py:922 ../textw/userauth_text.py:161
msgid "User Account Setup"
msgstr ""
-#: ../text.py:855 ../text.py:923
+#: ../text.py:856 ../text.py:924
msgid "Authentication"
msgstr ""
-#: ../text.py:861
+#: ../text.py:862
msgid "Configuration Complete"
msgstr ""
-#: ../text.py:879 ../textw/silo_text.py:28 ../textw/silo_text.py:100
+#: ../text.py:880 ../textw/silo_text.py:28 ../textw/silo_text.py:100
#: ../textw/silo_text.py:212
msgid "SILO Configuration"
msgstr ""
-#: ../text.py:885 ../textw/lilo_text.py:33 ../textw/lilo_text.py:84
+#: ../text.py:886 ../textw/lilo_text.py:33 ../textw/lilo_text.py:84
#: ../textw/lilo_text.py:198
msgid "LILO Configuration"
msgstr ""
#: ../iw/lilo_gui.py:124 ../iw/lilo_gui.py:247 ../iw/silo_gui.py:127
-#: ../iw/silo_gui.py:279 ../text.py:889 ../text.py:895
+#: ../iw/silo_gui.py:279 ../text.py:890 ../text.py:896
msgid "Partition"
msgstr ""
-#: ../text.py:891
+#: ../text.py:892
msgid "Manually Partition"
msgstr ""
-#: ../text.py:893
+#: ../text.py:894
msgid "Automatic Partition"
msgstr ""
-#: ../text.py:897 ../textw/partitioning_text.py:280
+#: ../text.py:898 ../textw/partitioning_text.py:280
msgid "Root Filesystem Size"
msgstr ""
-#: ../text.py:899
+#: ../text.py:900
msgid "Swap"
msgstr ""
-#: ../text.py:901
+#: ../text.py:902
msgid "Filesystem Formatting"
msgstr ""
-#: ../iw/mouse_gui.py:56 ../text.py:913 ../text.py:915
+#: ../iw/mouse_gui.py:56 ../text.py:914 ../text.py:916
msgid "Mouse Configuration"
msgstr ""
-#: ../text.py:925
+#: ../text.py:926
msgid "Package Groups"
msgstr ""
-#: ../text.py:927 ../text.py:955
+#: ../text.py:928 ../text.py:956
msgid "Individual Packages"
msgstr ""
-#: ../text.py:929 ../textw/packages_text.py:235
+#: ../text.py:930 ../textw/packages_text.py:235
msgid "Package Dependencies"
msgstr ""
-#: ../iw/xconfig_gui.py:250 ../text.py:931 ../text.py:939
+#: ../iw/xconfig_gui.py:250 ../text.py:932 ../text.py:940
msgid "X Configuration"
msgstr ""
-#: ../text.py:933
+#: ../text.py:934
msgid "Installation Begins"
msgstr ""
-#: ../text.py:935
+#: ../text.py:936
msgid "Install System"
msgstr ""
-#: ../text.py:936 ../text.py:938 ../text.py:957 ../text.py:959
+#: ../text.py:937 ../text.py:939 ../text.py:958 ../text.py:960
msgid "Boot Disk"
msgstr ""
-#: ../text.py:941
+#: ../text.py:942
msgid "Installation Complete"
msgstr ""
-#: ../text.py:946
+#: ../text.py:947
msgid "Examine System"
msgstr ""
-#: ../text.py:953
+#: ../text.py:954
msgid "Customize Upgrade"
msgstr ""
-#: ../text.py:956
+#: ../text.py:957
msgid "Upgrade System"
msgstr ""
-#: ../text.py:960
+#: ../text.py:961
msgid "Upgrade Complete"
msgstr ""
-#: ../text.py:994
+#: ../text.py:995
msgid "Cancelled"
msgstr ""
-#: ../text.py:995
+#: ../text.py:996
msgid "I can't go to the previous step from here. You will have to try again."
msgstr ""
-#: ../todo.py:360
+#: ../todo.py:341
#, c-format
msgid "Error copying file: %s"
msgstr ""
-#: ../todo.py:443
+#: ../todo.py:424
msgid "Creating boot disk..."
msgstr ""
-#: ../todo.py:463
+#: ../todo.py:444
msgid "Reading"
msgstr ""
-#: ../todo.py:464
+#: ../todo.py:445
msgid "Reading package information..."
msgstr ""
-#: ../todo.py:644 ../todo.py:657
+#: ../todo.py:625 ../todo.py:645
msgid "no suggestion"
msgstr ""
-#: ../todo.py:663
+#: ../todo.py:651
msgid "Searching"
msgstr ""
-#: ../todo.py:664
+#: ../todo.py:652
msgid "Searching for Red Hat Linux installations..."
msgstr ""
-#: ../todo.py:676 ../todo.py:707
+#: ../todo.py:664 ../todo.py:695
#, c-format
msgid "Error mounting ext2 filesystem on %s: %s"
msgstr ""
-#: ../todo.py:718
+#: ../todo.py:706
msgid "Finding"
msgstr ""
-#: ../todo.py:719
+#: ../todo.py:707
msgid "Finding packages to upgrade..."
msgstr ""
-#: ../todo.py:762
+#: ../todo.py:752
msgid "Rebuild of RPM database failed. You may be out of disk space?"
msgstr ""
-#: ../todo.py:986
+#: ../todo.py:976
msgid "Processing"
msgstr ""
-#: ../todo.py:987
+#: ../todo.py:977
msgid "Preparing to install..."
msgstr ""
-#: ../todo.py:1191
+#: ../todo.py:1182
#, c-format
msgid "Upgrading %s.\n"
msgstr ""
-#: ../todo.py:1193
+#: ../todo.py:1184
#, c-format
msgid "Installing %s.\n"
msgstr ""
-#: ../todo.py:1214
+#: ../todo.py:1205
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:1217
+#: ../todo.py:1208
msgid "Mount Point"
msgstr ""
-#: ../todo.py:1217
+#: ../todo.py:1208
msgid "Space Needed"
msgstr ""
-#: ../todo.py:1230
+#: ../todo.py:1221
msgid "Disk Space"
msgstr ""
-#: ../todo.py:1254
+#: ../todo.py:1245
msgid "Post Install"
msgstr ""
-#: ../todo.py:1255
+#: ../todo.py:1246
msgid "Performing post install configuration..."
msgstr ""
@@ -1039,7 +1039,7 @@ msgstr ""
msgid "Emulate 3 Buttons"
msgstr ""
-#: ../iw/network_gui.py:11 ../textw/network_text.py:94
+#: ../iw/network_gui.py:11 ../textw/network_text.py:95
msgid "Network Configuration"
msgstr ""
@@ -1068,7 +1068,7 @@ msgid "Broadcast"
msgstr ""
#: ../iw/network_gui.py:207 ../loader/net.c:496 ../loader/net.c:690
-#: ../textw/network_text.py:142
+#: ../textw/network_text.py:143
msgid "Hostname"
msgstr ""
@@ -1185,19 +1185,19 @@ msgid ""
"total less then %d megabytes in size."
msgstr ""
-#: ../iw/rootpartition_gui.py:135
+#: ../iw/rootpartition_gui.py:139
msgid "Root filesystem size:"
msgstr ""
-#: ../iw/rootpartition_gui.py:140
+#: ../iw/rootpartition_gui.py:144
msgid "Swap space size:"
msgstr ""
-#: ../iw/rootpartition_gui.py:191 ../textw/partitioning_text.py:132
+#: ../iw/rootpartition_gui.py:195 ../textw/partitioning_text.py:132
msgid "Automatic Partitioning"
msgstr ""
-#: ../iw/rootpartition_gui.py:228 ../textw/partitioning_text.py:133
+#: ../iw/rootpartition_gui.py:232 ../textw/partitioning_text.py:133
#, c-format
msgid ""
"%s\n"
@@ -1207,11 +1207,11 @@ msgid ""
"installation."
msgstr ""
-#: ../iw/rootpartition_gui.py:242
+#: ../iw/rootpartition_gui.py:246
msgid "Remove data"
msgstr ""
-#: ../iw/rootpartition_gui.py:245 ../textw/partitioning_text.py:137
+#: ../iw/rootpartition_gui.py:249 ../textw/partitioning_text.py:137
msgid "Manually partition"
msgstr ""
@@ -1403,39 +1403,39 @@ msgid ""
"Press the F2 key to select the partition to boot by default."
msgstr ""
-#: ../textw/network_text.py:64
+#: ../textw/network_text.py:65
msgid "Use bootp/dhcp"
msgstr ""
-#: ../loader/net.c:265 ../textw/network_text.py:69
+#: ../loader/net.c:265 ../textw/network_text.py:70
msgid "IP address:"
msgstr ""
-#: ../loader/net.c:268 ../textw/network_text.py:70
+#: ../loader/net.c:268 ../textw/network_text.py:71
msgid "Netmask:"
msgstr ""
-#: ../loader/net.c:271 ../textw/network_text.py:71
+#: ../loader/net.c:271 ../textw/network_text.py:72
msgid "Default gateway (IP):"
msgstr ""
-#: ../loader/net.c:274 ../textw/network_text.py:72
+#: ../loader/net.c:274 ../textw/network_text.py:73
msgid "Primary nameserver:"
msgstr ""
-#: ../textw/network_text.py:110
+#: ../textw/network_text.py:111
msgid "Invalid information"
msgstr ""
-#: ../textw/network_text.py:111
+#: ../textw/network_text.py:112
msgid "You must enter valid IP information to continue"
msgstr ""
-#: ../textw/network_text.py:138
+#: ../textw/network_text.py:139
msgid "Hostname Configuration"
msgstr ""
-#: ../textw/network_text.py:139
+#: ../textw/network_text.py:140
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."
@@ -1517,6 +1517,7 @@ msgid "Swap space"
msgstr ""
#: ../textw/partitioning_text.py:296 ../textw/partitioning_text.py:302
+#: ../textw/partitioning_text.py:309
msgid "Bad Size"
msgstr ""
@@ -1531,6 +1532,12 @@ msgid ""
"which is %d megabytes."
msgstr ""
+#: ../textw/partitioning_text.py:310
+msgid ""
+"Neither the root file system size nor the swap space size may be greater "
+"then 2000 megabytes."
+msgstr ""
+
#: ../textw/silo_text.py:65
msgid "Create PROM alias `linux'"
msgstr ""
diff --git a/scripts/upd-bootimage b/scripts/upd-bootimage
index 63b526479..785f21723 100755
--- a/scripts/upd-bootimage
+++ b/scripts/upd-bootimage
@@ -26,11 +26,15 @@ fi
if [ ! -x $LOOPMNT/sbin/$TO ]; then
echo "$LOOPMNT/sbin/$TO doesn't exist"
else
- install -s $FROM $LOOPMNT/sbin/$TO
+ cp $FROM $FROM.foo
+ strip $FROM.foo
+ install $FROM.foo $LOOPMNT/sbin/$TO
+ rm -f $FROM.foo
fi
umount $LOOPMNT
-gzip -9 < $INITRD > $MNTPOINT/initrd.img
+gzip -9 < $INITRD > $INITRD.new
+cp $INITRD.new $MNTPOINT/initrd.img
umount $MNTPOINT
-rm -rf $MNTPOINT $LOOPMNT $INITRD
+rm -rf $MNTPOINT $LOOPMNT $INITRD $INITRD.new
diff --git a/text.py b/text.py
index 906298a5f..9951e7b56 100644
--- a/text.py
+++ b/text.py
@@ -12,35 +12,6 @@ import signal
from translate import _, cat, N_
from log import log
-# dont do this anymore, makes update disk hard
-#from textw.constants import *
-#from textw.lilo import LiloWindow
-#from textw.lilo import LiloAppendWindow
-#from textw.lilo import LiloImagesWindow
-#from textw.silo import SiloWindow
-#from textw.silo import SiloAppendWindow
-#from textw.silo import SiloImagesWindow
-#from textw.network import NetworkWindow
-#from textw.network import HostnameWindow
-#from textw.userauth import RootPasswordWindow
-#from textw.userauth import UsersWindow
-#from textw.userauth import AuthConfigWindow
-#from textw.partitioning import PartitionMethod
-#from textw.partitioning import LoopSizeWindow
-#from textw.partitioning import ManualPartitionWindow
-#from textw.partitioning import AutoPartitionWindow
-#from textw.partitioning import PartitionWindow
-#from textw.partitioning import TurnOnSwapWindow
-#from textw.partitioning import FormatWindow
-#from textw.packages import PackageGroupWindow
-#from textw.packages import IndividualPackageWindow
-#from textw.packages import PackageDepWindow
-#from textw.timezone import TimezoneWindow
-#from textw.bootdisk import BootDiskWindow
-#from textw.bootdisk import MakeBootDiskWindow
-#
-# instead we do
-#
from constants_text import *
from lilo_text import LiloWindow
from lilo_text import LiloAppendWindow
@@ -84,13 +55,13 @@ class LanguageWindow:
buttons = [_("Ok"), _("Back")]
else:
buttons = [_("Ok")]
-
+
(button, choice) = \
ListboxChoiceWindow(screen, _("Language Selection"),
_("What language would you like to use during the "
"installation process?"), descriptions,
buttons, width = 30, default = default, scroll = 1,
- height = height)
+ height = height, help = "lang")
if (button == string.lower(_("Back"))): return INSTALL_BACK
@@ -135,7 +106,7 @@ class MouseDeviceWindow:
(button, result) = ListboxChoiceWindow(screen, _("Device"),
_("What device is your mouse located on? %s %i") % (mouse, default), l,
- [ _("Ok"), _("Back") ], default = default )
+ [ _("Ok"), _("Back") ], help = "mousedevice", default = default )
if (button == string.lower(_("Back"))): return INSTALL_BACK
todo.mouse.setDevice(choices[l[result]])
@@ -168,7 +139,7 @@ class MouseWindow:
c = Checkbox(_("Emulate 3 Buttons?"), isOn = emulate)
- g = GridForm(screen, _("Mouse Selection"), 1, 4)
+ g = GridFormHelp(screen, _("Mouse Selection"), "mousetype", 1, 4)
g.add(t, 0, 0)
g.add(l, 0, 1, padding = (0, 1, 0, 1))
g.add(c, 0, 2, padding = (0, 0, 0, 1))
@@ -209,7 +180,7 @@ class KeyboardWindow:
ListboxChoiceWindow(screen, _("Keyboard Selection"),
_("Which model keyboard is attached to this computer?"), keyboards,
buttons = [_("OK"), _("Back")], width = 30, scroll = 1, height = 8,
- default = default)
+ default = default, help = "kybd")
if button == string.lower (_("Back")):
return INSTALL_BACK
@@ -276,7 +247,7 @@ class InstallPathWindow:
(button, choice) = ListboxChoiceWindow(screen, _("Installation Type"),
_("What type of system would you like to install?"),
choices, [(_("OK"), "ok"), (_("Back"), "back")],
- width = 40, default = default)
+ width = 40, default = default, help = "installpath")
if button == "back":
return INSTALL_BACK
@@ -344,7 +315,8 @@ class UpgradeExamineWindow:
_("What partition holds the root partition "
"of your installation?"), parts,
[ _("OK"), _("Back") ], width = 30,
- scroll = scroll, height = height)
+ scroll = scroll, height = height,
+ root = "multipleroot")
if button == string.lower (_("Back")):
return INSTALL_BACK
else:
@@ -364,7 +336,8 @@ class CustomizeUpgradeWindow:
"for installation. Would you like "
"to customize the set of packages "
"that will be upgraded?"),
- buttons = [ _("Yes"), _("No"), _("Back") ])
+ buttons = [ _("Yes"), _("No"), _("Back") ],
+ help = "custupgrade")
if rc == string.lower (_("Back")):
return INSTALL_BACK
@@ -388,7 +361,8 @@ class WelcomeWindow:
"If you have purchased Official Red Hat Linux, be sure to "
"register your purchase through our web site, "
"http://www.redhat.com/."),
- buttons = [_("OK"), _("Back")], width = 50)
+ buttons = [_("OK"), _("Back")], width = 50,
+ help = "welcome")
if rc == string.lower(_("Back")):
return INSTALL_BACK
@@ -405,7 +379,8 @@ class ReconfigWelcomeWindow:
"\n\n"
"To exit without changing your setup "
"select the ""Cancel"" button below."),
- buttons = [_("OK"), _("Cancel")], width = 50)
+ buttons = [_("OK"), _("Cancel")], width = 50,
+ help = "reconfigwelcome")
if rc == string.lower(_("Cancel")):
screen.finish()
@@ -476,7 +451,8 @@ class XConfigWindow:
cards,
buttons = [_("OK"), _("Back")],
width = 70, scroll = 1,
- height = screen.height - 14)
+ height = screen.height - 14,
+ help = "videocard")
if rc == string.lower (_("Back")):
return INSTALL_BACK
@@ -488,7 +464,8 @@ class XConfigWindow:
servers,
buttons = [ (_("Ok"), "ok"), (_("Back"), "back") ],
scroll = 1,
- height = screen.height - 14)
+ height = screen.height - 14,
+ help = "xserver")
if (rc == "back"):
rc = INSTALL_BACK
@@ -546,7 +523,8 @@ class BeginInstallWindow:
_("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."),
- buttons = [ _("OK"), _("Back") ])
+ buttons = [ _("OK"), _("Back") ],
+ help = "begininstall")
if rc == string.lower (_("Back")):
return INSTALL_BACK
return INSTALL_OK
@@ -559,33 +537,18 @@ class InstallWindow:
class FinishedWindow:
def __call__ (self, screen, todo):
- if not todo.reconfigOnly:
- rc = ButtonChoiceWindow (screen, _("Complete"),
- _("Congratulations, installation is complete.\n\n"
- "Press return to reboot, and be sure to remove your "
- "boot medium as the system reboots, or your system "
- "will rerun the install. For information on fixes which "
- "are available for this release of Red Hat Linux, "
- "consult the "
- "Errata available from http://www.redhat.com/errata.\n\n"
- "Information on configuring and using your Red Hat "
- "Linux system is contained in the Red Hat Linux "
- "manuals."),
- [ _("OK") ])
- else:
- todo.writeConfiguration()
-
- rc = ButtonChoiceWindow (screen, _("Complete"),
- _("Congratulations, configuration is complete.\n\n"
- " For information on fixes which "
- "are available for this release of Red Hat Linux, "
- "consult the "
- "Errata available from http://www.redhat.com.\n\n"
- "Information on further configuring your system is "
- "available "
- "in the post install chapter of the Official Red Hat "
- "Linux User's Guide."),
- [ _("OK") ])
+ rc = ButtonChoiceWindow (screen, _("Complete"),
+ _("Congratulations, installation is complete.\n\n"
+ "Press return to reboot, and be sure to remove your "
+ "boot medium as the system reboots, or your system "
+ "will rerun the install. For information on fixes which "
+ "are available for this release of Red Hat Linux, "
+ "consult the "
+ "Errata available from http://www.redhat.com/errata.\n\n"
+ "Information on configuring and using your Red Hat "
+ "Linux system is contained in the Red Hat Linux "
+ "manuals."),
+ [ _("OK") ], help = "finished")
return INSTALL_OK
@@ -605,7 +568,7 @@ class ReconfigFinishedWindow:
"available "
"in the post install chapter of the Official Red Hat "
"Linux User's Guide."),
- [ _("OK") ])
+ [ _("OK") ], help = "reconfigfinished")
return INSTALL_OK
@@ -790,6 +753,65 @@ class ProgressWindow:
self.screen.refresh()
class InstallInterface:
+
+ def helpWindow(self, screen, key):
+ try:
+ lang = cat.getlangs()
+ if not lang or lang[0] == "en_US":
+ lang = 'C'
+ else:
+ lang = lang[0]
+
+ fn = "/usr/share/anaconda/help/%s/s1-help-screens-%s.txt" \
+ % (lang, key)
+ try:
+ f = open(fn)
+ except IOError:
+ return self.helpWindow(screen, "helponhelp")
+
+ l = f.readlines()
+ while not string.strip(l[0]):
+ l = l[1:]
+ title = string.strip(l[0])
+ l = l[1:]
+ while not string.strip(l[0]):
+ l = l[1:]
+ f.close()
+
+ height = 10
+ scroll = 1
+ if len(l) < height:
+ height = len(l)
+ scroll = 0
+
+ width = len(title) + 6
+ stream = ""
+ for line in l:
+ line = string.strip(line)
+ stream = stream + line + "\n"
+ if len(line) > width:
+ width = len(line)
+
+ bb = ButtonBar(screen, [ (_("OK"), "ok" ) ] )
+ t = Textbox(width, height, stream, scroll = scroll)
+
+ g = GridFormHelp(screen, title, "helponhelp", 1, 2)
+ g.add(t, 0, 0, padding = (0, 0, 0, 1))
+ g.add(bb, 0, 1, growx = 1)
+
+ g.runOnce()
+ except:
+ import sys, traceback
+ (type, value, tb) = sys.exc_info()
+ from string import joinfields
+ list = traceback.format_exception (type, value, tb)
+ text = joinfields (list, "")
+ rc = self.exceptionWindow (_("Exception Occurred"), text)
+ if rc:
+ import pdb
+ pdb.post_mortem (tb)
+ os._exit (1)
+
def progressWindow(self, title, text, total):
return ProgressWindow (self.screen, _(title), _(text), total)
@@ -813,10 +835,14 @@ class InstallInterface:
def drawFrame(self):
self.welcomeText = _("Red Hat Linux (C) 2000 Red Hat, Inc.")
self.screen.drawRootText (0, 0, self.welcomeText)
- self.screen.pushHelpLine (_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"))
+ if (os.access("/usr/share/anaconda/help/C/s1-help-screens-lang.txt", os.R_OK)):
+ self.screen.pushHelpLine (_(" <F1> for help> | <Tab> between elements | <Space> selects | <F12> next screen"))
+ else:
+ self.screen.pushHelpLine (_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"))
def __init__(self):
self.screen = SnackScreen()
+ self.screen.helpCallback(self.helpWindow)
self.drawFrame()
# uncomment this line to make the installer quit on <Ctrl+Z>
# handy for quick debugging.
diff --git a/textw/bootdisk_text.py b/textw/bootdisk_text.py
index bc7db0785..46afdc5fd 100644
--- a/textw/bootdisk_text.py
+++ b/textw/bootdisk_text.py
@@ -32,7 +32,8 @@ class BootDiskWindow:
_("\nOn SMCC made Ultra machines floppy booting "
"probably does not work\n\n"))
- rc = ButtonChoiceWindow(screen, _("Bootdisk"), text, buttons = buttons)
+ rc = ButtonChoiceWindow(screen, _("Bootdisk"), text, buttons = buttons,
+ help = "bootdiskquery")
if rc == string.lower (_("Yes")):
todo.bootdisk = 1
@@ -55,7 +56,7 @@ class MakeBootDiskWindow:
"floppy drive. "
"All data on this disk will be erased during creation "
"of the boot disk."),
- [ _("OK"), _("Skip") ])
+ [ _("OK"), _("Skip") ], help = "insertbootdisk")
if rc == string.lower (_("Skip")):
return INSTALL_OK
diff --git a/textw/lilo_text.py b/textw/lilo_text.py
index 972f27d5c..b82235992 100644
--- a/textw/lilo_text.py
+++ b/textw/lilo_text.py
@@ -28,7 +28,7 @@ class LiloAppendWindow:
entry.set(todo.lilo.getAppend())
buttons = ButtonBar(screen, [(_("OK"), "ok"), (_("Skip"), "skip"),
- (_("Back"), "back") ] )
+ (_("Back"), "back") ], help = "kernelopts" )
grid = GridForm(screen, _("LILO Configuration"), 1, 4)
grid.add(t, 0, 0)
@@ -84,7 +84,8 @@ class LiloWindow:
(rc, sel) = ListboxChoiceWindow (screen, _("LILO Configuration"),
_("Where do you want to install the bootloader?"),
locations, default = default,
- buttons = [ _("OK"), _("Back") ])
+ buttons = [ _("OK"), _("Back") ],
+ help = "lilolocation")
if sel == 0:
todo.lilo.setDevice("mbr")
@@ -111,7 +112,7 @@ class LiloImagesWindow:
subgrid.setField(bootLabel, 0, 1, anchorLeft = 1)
subgrid.setField(newLabel, 1, 1, padding = (1, 0, 0, 0), anchorLeft = 1)
- g = GridForm(screen, _("Edit Boot Label Please"), 1, 2)
+ g = GridFormHelp(screen, _("Edit Boot Label Please"), "bootlabel", 1, 2)
g.add(subgrid, 0, 0, padding = (0, 0, 0, 1))
g.add(buttons, 0, 1, growx = 1)
@@ -195,7 +196,7 @@ class LiloImagesWindow:
"Press the F2 key to select the partition to boot by "
"default."))
- g = GridForm(screen, _("LILO Configuration"), 1, 4)
+ g = GridFormHelp(screen, _("LILO Configuration"), "lilolabels", 1, 4)
g.add(text, 0, 0, anchorLeft = 1)
g.add(listboxLabel, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1)
g.add(listbox, 0, 2, padding = (0, 0, 0, 1), anchorLeft = 1)
diff --git a/textw/network_text.py b/textw/network_text.py
index 1f931610c..a0b23bf04 100644
--- a/textw/network_text.py
+++ b/textw/network_text.py
@@ -92,7 +92,8 @@ class NetworkWindow:
bb = ButtonBar (screen, ((_("OK"), "ok"), (_("Back"), "back")))
- toplevel = GridForm (screen, _("Network Configuration"), 1, 3)
+ toplevel = GridFormHelp (screen, _("Network Configuration"),
+ "network", 1, 3)
toplevel.add (firstg, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
toplevel.add (secondg, 0, 1, (0, 0, 0, 1))
toplevel.add (bb, 0, 2, growx = 1)
@@ -140,7 +141,8 @@ class HostnameWindow:
_("The hostname is the name of your computer. If your "
"computer is attached to a network, this may be "
"assigned by your network administrator."),
- [(_("Hostname"), entry)], buttons = [ _("OK"), _("Back")])
+ [(_("Hostname"), entry)], buttons = [ _("OK"), _("Back")],
+ help = "hostname")
if rc == string.lower (_("Back")):
return INSTALL_BACK
diff --git a/textw/packages_text.py b/textw/packages_text.py
index cdb550d81..e315f3c6c 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -19,7 +19,8 @@ class PackageGroupWindow:
bb = ButtonBar (screen, ((_("OK"), "ok"), (_("Back"), "back")))
- g = GridForm (screen, _("Package Group Selection"), 1, 3)
+ g = GridFormHelp (screen, _("Package Group Selection"),
+ "components", 1, 3)
g.add (ct, 0, 0, (0, 0, 0, 1))
g.add (cb, 0, 1, (0, 0, 0, 1))
g.add (bb, 0, 2, growx = 1)
@@ -63,7 +64,7 @@ class IndividualPackageWindow:
txt = TextboxReflowed(60, self.get_rpm_desc(header), maxHeight = 10)
- g = GridForm (screen, header[rpm.RPMTAG_NAME], 1, 3)
+ g = GridFormHelp (screen, header[rpm.RPMTAG_NAME], 1, 3)
g.add (sg, 0, 0, (0, 0, 0, 1))
g.add (txt, 0, 1, (0, 0, 0, 1))
g.add (bb, 0, 2, growx = 1)
@@ -197,18 +198,19 @@ class IndividualPackageWindow:
self.lbl = Label ("")
self.printTotal()
- g = GridForm (screen, _("Package Group Selection"), 1, 3)
+ g = GridFormHelp (screen, _("Package Group Selection"), "packagetree",
+ 1, 3)
g.add (ct, 0, 0, (0, 0, 0, 0))
g.add (self.lbl, 0, 1, (self.length + 5, 0, 0, 1))
g.add (bb, 0, 2, growx = 1)
- g.addHotKey("F1")
+ g.addHotKey("F2")
- screen.pushHelpLine (_(" <Space>,<+>,<-> selection | <F1> package description | <F12> next screen"))
+ screen.pushHelpLine (_(" <Space>,<+>,<-> selection | <F1> help | <F2> package description"))
while 1:
result = g.run ()
- if result != "F1":
+ if result != "F2":
break
header = self.ct.getCurrent()
(branch, isOn) = self.ct.getEntryValue(header)
@@ -232,7 +234,8 @@ class PackageDepWindow:
if not deps:
return INSTALL_NOOP
- g = GridForm(screen, _("Package Dependencies"), 1, 5)
+ g = GridFormHelp(screen, _("Package Dependencies"),
+ "pacakgedeps", 1, 5)
g.add (TextboxReflowed (45, _("Some of the packages you have "
"selected to install require "
"packages you have not selected. If "
diff --git a/textw/partitioning_text.py b/textw/partitioning_text.py
index bdc9e2108..8db8bd93e 100644
--- a/textw/partitioning_text.py
+++ b/textw/partitioning_text.py
@@ -20,7 +20,7 @@ class PartitionMethod:
"\n"
"Which tool would you like to use?"),
[ (_("Disk Druid"), "dd") , (_("fdisk"), "fd"),
- (_("Back"), "back") ], width = 50)
+ (_("Back"), "back") ], width = 50, help = "parttool")
if rc == "back":
return INSTALL_BACK
@@ -61,7 +61,7 @@ class ManualPartitionWindow:
"drives in your system so you can boot into Linux "
"with LILO."), choices,
[ (_("Done"), "done") , (_("Edit"), "edit"),
- (_("Back"), "back") ], width = 50)
+ (_("Back"), "back") ], width = 50, help = "fdisk")
if button != "done" and button != "back":
# free our fd's to the hard drive -- we have to
@@ -135,7 +135,8 @@ class AutoPartitionWindow:
"and perform a fully customized installation.") %
(todo.getPartitionWarningText(), ),
[_("Continue"), _("Manually partition")],
- buttons = basicButtons, default = _("Continue"))
+ buttons = basicButtons, default = _("Continue"),
+ help = "confirmautopart")
if (rc == "back"):
# This happens automatically when we go out of scope, but it's
@@ -197,7 +198,8 @@ class TurnOnSwapWindow:
"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?"),
- [ (_("Yes"), "yes"), (_("No"), "back") ], width = 50)
+ [ (_("Yes"), "yes"), (_("No"), "back") ], width = 50,
+ help = "earlyswapon")
if (rc == "back"):
return INSTALL_BACK
@@ -238,7 +240,8 @@ class FormatWindow:
bb = ButtonBar (screen, ((_("OK"), "ok"), (_("Back"), "back")))
- g = GridForm (screen, _("Choose Partitions to Format"), 1, 4)
+ g = GridFormHelp (screen, _("Choose Partitions to Format"),
+ "formatwhat", 1, 4)
g.add (tb, 0, 0, (0, 0, 0, 1))
g.add (ct, 0, 1)
g.add (cb, 0, 2, (0, 1, 0, 1))
@@ -285,7 +288,8 @@ class LoopSizeWindow:
"total less then %d megabytes in size." % (avail, )),
[ ( _("Root filesystem size"), sizeEntry ),
( _("Swap space"), swapSizeEntry ) ],
- buttons = [ (_("OK"), "ok"), (_("Back"), "back") ] )
+ buttons = [ (_("OK"), "ok"), (_("Back"), "back") ],
+ help = "loopbacksize")
if rc == "back": return INSTALL_BACK
diff --git a/textw/silo_text.py b/textw/silo_text.py
index a74173974..8fe6f2792 100644
--- a/textw/silo_text.py
+++ b/textw/silo_text.py
@@ -25,7 +25,7 @@ class SiloAppendWindow:
buttons = ButtonBar(screen, [(_("OK"), "ok"), (_("Skip"), "skip"),
(_("Back"), "back") ] )
- grid = GridForm(screen, _("SILO Configuration"), 1, 3)
+ grid = GridForm(screenHelp, _("SILO Configuration"), 1, 3)
grid.add(t, 0, 0)
grid.add(entry, 0, 1, padding = (0, 0, 0, 1))
grid.add(buttons, 0, 2, growx = 1)
@@ -97,7 +97,7 @@ class SiloWindow:
bb = ButtonBar (screen, ((_("OK"), "ok"), (_("Back"), "back")))
- g = GridForm (screen, _("SILO Configuration"), 1, 8)
+ g = GridFormHelp (screen, _("SILO Configuration"), "silowin", 1, 8)
g.add (Label (_("Where do you want to install the bootloader?")), 0, 0)
g.add (rc1, 0, 1)
@@ -140,7 +140,7 @@ class SiloImagesWindow:
subgrid.setField(bootLabel, 0, 1, anchorLeft = 1)
subgrid.setField(newLabel, 1, 1, padding = (1, 0, 0, 0), anchorLeft = 1)
- g = GridForm(screen, _("Edit Boot Label"), 1, 2)
+ g = GridFormHelp(screen, _("Edit Boot Label"), "bootlabel", 1, 2)
g.add(subgrid, 0, 0, padding = (0, 0, 0, 1))
g.add(buttons, 0, 1, growx = 1)
@@ -210,7 +210,7 @@ class SiloImagesWindow:
"and what label you want to use for each of them."))
title = _("SILO Configuration")
- g = GridForm(screen, title, 1, 4)
+ g = GridFormHelp(screen, title, "siloimages", 1, 4)
g.add(text, 0, 0, anchorLeft = 1)
g.add(listboxLabel, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1)
g.add(listbox, 0, 2, padding = (0, 0, 0, 1), anchorLeft = 1)
diff --git a/textw/timezone_text.py b/textw/timezone_text.py
index ea69a3902..a21e5344a 100644
--- a/textw/timezone_text.py
+++ b/textw/timezone_text.py
@@ -80,7 +80,8 @@ class TimezoneWindow:
self.c = Checkbox(_("Hardware clock set to GMT?"), isOn = asUtc)
self.c.setCallback(self.updateSysClock)
- self.g = GridForm(screen, _("Time Zone Selection"), 1, 5)
+ self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone",
+ 1, 5)
self.g.add(t, 0, 0)
self.g.add(self.label, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1)
self.g.add(self.c, 0, 2, padding = (0, 1, 0, 1), anchorLeft = 1)
diff --git a/textw/userauth_text.py b/textw/userauth_text.py
index d1ee8459f..57023c44c 100644
--- a/textw/userauth_text.py
+++ b/textw/userauth_text.py
@@ -6,7 +6,7 @@ import iutil
class RootPasswordWindow:
def __call__ (self, screen, todo):
- toplevel = GridForm (screen, _("Root Password"), 1, 3)
+ toplevel = GridFormHelp (screen, _("Root Password"), "rootpw", 1, 3)
toplevel.add (TextboxReflowed(37, _("Pick a root password. You must "
"type it twice to ensure you know "
@@ -79,7 +79,8 @@ class UsersWindow:
(_("Full Name"), fullname),
(_("Password"), pass1),
(_("Password (confirm)"), pass2) ],
- buttons = [ (_("OK"), "ok"), (cancelText, "cancel") ])
+ buttons = [ (_("OK"), "ok"), (cancelText, "cancel") ],
+ help = "edituser")
if rc == "cancel":
return INSTALL_BACK
@@ -158,7 +159,7 @@ class UsersWindow:
return INSTALL_OK
self.users[user["id"]] = user
- g = GridForm (screen, _("User Account Setup"), 1, 4)
+ g = GridFormHelp (screen, _("User Account Setup"), "addusers", 1, 4)
t = TextboxReflowed(60, _("What user account would you like to have "
"on the system? You should have at least one non-root account "
@@ -256,7 +257,8 @@ class AuthConfigWindow:
def __call__(self, screen, todo):
bb = ButtonBar (screen, ((_("OK"), "ok"), (_("Back"), "back")))
- toplevel = GridForm (screen, _("Authentication Configuration"), 1, 5)
+ toplevel = GridFormHelp (screen, _("Authentication Configuration"),
+ "authconfig", 1, 5)
self.shadow = Checkbox (_("Use Shadow Passwords"), todo.auth.useShadow)
toplevel.add (self.shadow, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
self.md5 = Checkbox (_("Enable MD5 Passwords"), todo.auth.useMD5)
diff --git a/translate.py b/translate.py
index a038aa3b3..9b74096e6 100644
--- a/translate.py
+++ b/translate.py
@@ -2,9 +2,14 @@ import gettext_rh
class i18n:
def __init__(self):
+ self.langs = []
self.cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
+
+ def getlangs(self):
+ return self.langs
def setlangs(self, langs):
+ self.langs = langs
gettext_rh.setlangs (langs)
self.cat = gettext_rh.Catalog ("anaconda", "/usr/share/locale")
generated by cgit (git 2.34.1) at 2024-11-10 14:43:31 +0000