diff options
| -rw-r--r-- | comps.py | 48 | ||||
| -rw-r--r-- | gettext.py | 26 | ||||
| -rw-r--r-- | iw/network.py | 4 | ||||
| -rw-r--r-- | loader/lang.c | 2 | ||||
| -rw-r--r-- | po/anaconda.pot | 416 | ||||
| -rw-r--r-- | text.py | 24 | ||||
| -rw-r--r-- | todo.py | 40 |
7 files changed, 308 insertions, 252 deletions
@@ -6,7 +6,6 @@ import iutil import urllib class Package: - def __getitem__(self, item): return self.h[item] @@ -19,7 +18,6 @@ class Package: self.selected = 0 class HeaderList: - def selected(self): l = [] keys = self.packages.keys() @@ -84,16 +82,32 @@ class Component: def addRequires(self, component): self.requires = component + def conditionalSelect (self, key): + for pkg in self.conditional[key]: + pkg.selected = 1 + + def conditionalUnselect (self, key): + for pkg in self.conditional[key]: + pkg.selected = 0 + def select(self, recurse = 1): self.selected = 1 for pkg in self.items.keys (): self.items[pkg].selected = 1 - conds = self.conditional.keys () - if conds: - for condition in conds: - if condition.selected: - for pkg in self.conditional[condition]: - pkg.selected = 1 + # turn on any conditional packages + for (condition, pkgs) in self.conditional.items (): + if condition.selected: + for pkg in pkgs: + pkg.selected = 1 + + # components that have conditional packages keyed on this + # component AND are currently selected have those conditional + # packages turned turned on when this component is turned on. + if self.dependents: + for dep in self.dependents: + if dep.selected: + dep.conditionalSelect (self) + if recurse: for n in self.includes: if n.requires: @@ -111,13 +125,19 @@ class Component: self.selected = 0 for n in self.items.keys (): self.items[n].selected = 0 + # always turn off conditional packages, regardless # if the condition is met or not. - conds = self.conditional.keys () - if conds: - for condition in conds: - for pkg in self.conditional[condition]: - pkg.selected = 0 + for (condition, pkgs) in self.conditional.items (): + for pkg in pkgs: + pkg.selected = 0 + + # now we must turn off conditional packages in components that + # are keyed on this package + if self.dependents: + for dep in self.dependents: + dep.conditionalUnselect (self) + if recurse: for n in self.includes: n.unselect(recurse) @@ -128,6 +148,7 @@ class Component: self.selected = selected self.items = {} self.conditional = {} + self.dependents = [] self.requires = None self.includes = [] @@ -199,6 +220,7 @@ class ComponentSet: comp = Component(l, default == '1', hidden) elif (l == "}"): if conditional: + conditional.dependents.append (comp) conditional = None else: self.comps.append(comp) diff --git a/gettext.py b/gettext.py index d37e580aa..dcef90349 100644 --- a/gettext.py +++ b/gettext.py @@ -42,14 +42,38 @@ import os, string prefix = '/usr/local' localedir = prefix + '/share/locale' +def _expandLang(str): + langs = [str] + # remove charset ... + if '.' in str: + langs.append(string.split(str, '.')[0]) + # also add 2 character language code ... + if len(str) > 2: + langs.append(str[:2]) + return langs + lang = [] for env in 'LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG': if os.environ.has_key(env): lang = string.split(os.environ[env], ':') + lang = map(_expandLang, lang) + lang = reduce(lambda a, b: a + b, lang) break if 'C' not in lang: lang.append('C') +# remove duplicates +i = 0 +while i < len(lang): + j = i + 1 + while j < len(lang): + if lang[i] == lang[j]: + del lang[j] + else: + j = j + 1 + i = i + 1 +del i, j + if os.environ.has_key('PY_XGETTEXT'): xgettext = os.environ['PY_XGETTEXT'] else: @@ -302,5 +326,3 @@ def setlangs(newlang): if __name__ == '__main__': test() - - diff --git a/iw/network.py b/iw/network.py index 6bcf293ba..3c2eba844 100644 --- a/iw/network.py +++ b/iw/network.py @@ -129,7 +129,6 @@ class NetworkWindow (InstallWindow): devbox = GtkVBox () align = GtkAlignment () DHCPcb = GtkCheckButton (_("Configure using DHCP")) - DHCPcb.set_active (devs[i].get ("bootproto") == "dhcp") align.add (DHCPcb) devbox.pack_start (align, FALSE) @@ -179,6 +178,9 @@ class NetworkWindow (InstallWindow): options[3].connect ("focus_out_event", self.focusOutBC, devs[i]) devbox.pack_start (ipTable, FALSE, FALSE, 5) + + DHCPcb.set_active (devs[i].get ("bootproto") == "dhcp") + notebook.append_page (devbox, GtkLabel (i)) box.pack_start (notebook, FALSE) diff --git a/loader/lang.c b/loader/lang.c index 26e4e8617..78b940483 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -246,7 +246,7 @@ int chooseLanguage(char ** lang, int flags) { "during the installation process?"), 40, 5, 5, 8, langs, &choice, _("OK"), NULL); - *lang = languages[choice].key; + *lang = languages[choice].lc_all; if (choice == english) { /* stick with the default (English) */ diff --git a/po/anaconda.pot b/po/anaconda.pot index 77b673c65..2a910a6a6 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-19 11:17-0400\n" +"POT-Creation-Date: 1999-09-20 11:31-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:39 ../text.py:856 +#: ../iw/language.py:10 ../text.py:43 ../text.py:866 msgid "Language Selection" msgstr "" -#: ../text.py:40 +#: ../text.py:44 msgid "What language would you like to use during the installation process?" msgstr "" @@ -31,11 +31,11 @@ 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:42 ../text.py:90 -#: ../text.py:141 ../text.py:167 ../text.py:208 ../text.py:253 ../text.py:343 -#: ../text.py:363 ../text.py:394 ../text.py:443 ../text.py:465 ../text.py:530 -#: ../text.py:551 ../text.py:563 ../text.py:575 ../text.py:753 ../text.py:825 -#: ../text.py:829 ../textw/lilo.py:20 ../textw/lilo.py:65 +#: ../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 @@ -44,27 +44,27 @@ msgstr "" msgid "OK" msgstr "" -#: ../text.py:54 +#: ../text.py:64 msgid "/dev/ttyS0 (COM1 under DOS)" msgstr "" -#: ../text.py:55 +#: ../text.py:65 msgid "/dev/ttyS1 (COM2 under DOS)" msgstr "" -#: ../text.py:56 +#: ../text.py:66 msgid "/dev/ttyS2 (COM3 under DOS)" msgstr "" -#: ../text.py:57 +#: ../text.py:67 msgid "/dev/ttyS3 (COM4 under DOS)" msgstr "" -#: ../iw/lilo.py:174 ../text.py:72 ../textw/lilo.py:78 ../textw/lilo.py:137 +#: ../iw/lilo.py:174 ../text.py:82 ../textw/lilo.py:78 ../textw/lilo.py:137 msgid "Device" msgstr "" -#: ../text.py:73 +#: ../text.py:83 #, c-format msgid "What device is your mouse located on? %s %i" msgstr "" @@ -73,20 +73,20 @@ msgstr "" #: ../libfdisk/fsedit.c:605 ../libfdisk/fsedit.c:612 ../libfdisk/fsedit.c:619 #: ../libfdisk/fsedit.c:628 ../libfdisk/fsedit.c:640 ../libfdisk/fsedit.c:650 #: ../libfdisk/fsedit.c:679 ../libfdisk/fsedit.c:695 ../libfdisk/fsedit.c:1048 -#: ../libfdisk/gnomefsedit.c:655 ../libfdisk/gnomefsedit.c:1000 -#: ../libfdisk/gnomefsedit.c:1026 ../libfdisk/gnomefsedit.c:1062 -#: ../libfdisk/gnomefsedit.c:1267 ../libfdisk/gnomefsedit.c:1361 -#: ../libfdisk/gnomefsedit.c:1379 ../libfdisk/gnomefsedit.c:1619 -#: ../libfdisk/gnomefsedit.c:1846 ../libfdisk/gnomefsedit.c:1854 -#: ../libfdisk/gnomefsedit.c:1868 ../libfdisk/gnomefsedit.c:1879 -#: ../libfdisk/gnomefsedit.c:1886 ../libfdisk/gnomefsedit.c:1901 -#: ../libfdisk/gnomefsedit.c:1910 ../libfdisk/gnomefsedit.c:1967 -#: ../libfdisk/gnomefsedit.c:2128 ../libfdisk/newtfsedit.c:116 +#: ../libfdisk/gnomefsedit.c:655 ../libfdisk/gnomefsedit.c:1001 +#: ../libfdisk/gnomefsedit.c:1027 ../libfdisk/gnomefsedit.c:1063 +#: ../libfdisk/gnomefsedit.c:1268 ../libfdisk/gnomefsedit.c:1362 +#: ../libfdisk/gnomefsedit.c:1380 ../libfdisk/gnomefsedit.c:1620 +#: ../libfdisk/gnomefsedit.c:1847 ../libfdisk/gnomefsedit.c:1855 +#: ../libfdisk/gnomefsedit.c:1869 ../libfdisk/gnomefsedit.c:1880 +#: ../libfdisk/gnomefsedit.c:1887 ../libfdisk/gnomefsedit.c:1902 +#: ../libfdisk/gnomefsedit.c:1911 ../libfdisk/gnomefsedit.c:1968 +#: ../libfdisk/gnomefsedit.c:2129 ../libfdisk/newtfsedit.c:116 #: ../libfdisk/newtfsedit.c:449 ../libfdisk/newtfsedit.c:527 #: ../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:74 ../text.py:477 +#: ../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 msgid "Ok" @@ -97,13 +97,13 @@ 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:74 -#: ../text.py:75 ../text.py:90 ../text.py:113 ../text.py:141 ../text.py:144 -#: ../text.py:167 ../text.py:194 ../text.py:208 ../text.py:210 ../text.py:229 -#: ../text.py:231 ../text.py:253 ../text.py:255 ../text.py:343 ../text.py:394 -#: ../text.py:396 ../text.py:415 ../text.py:424 ../text.py:443 ../text.py:445 -#: ../text.py:465 ../text.py:468 ../text.py:477 ../text.py:530 ../text.py:531 -#: ../text.py:753 ../text.py:775 ../textw/constants.py:10 ../textw/lilo.py:21 +#: ../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 @@ -113,51 +113,51 @@ msgstr "" msgid "Back" msgstr "" -#: ../text.py:92 +#: ../text.py:102 msgid "Which model mouse is attached to this computer?" msgstr "" -#: ../text.py:101 +#: ../text.py:111 msgid "Emulate 3 Buttons?" msgstr "" -#: ../text.py:103 +#: ../text.py:113 msgid "Mouse Selection" msgstr "" -#: ../text.py:139 ../text.py:858 +#: ../text.py:149 ../text.py:868 msgid "Keyboard Selection" msgstr "" -#: ../text.py:140 +#: ../text.py:150 msgid "Which model keyboard is attached to this computer?" msgstr "" -#: ../text.py:160 +#: ../text.py:170 msgid "Install GNOME Workstation" msgstr "" -#: ../text.py:161 +#: ../text.py:171 msgid "Install KDE Workstation" msgstr "" -#: ../text.py:162 +#: ../text.py:172 msgid "Install Server System" msgstr "" -#: ../text.py:163 +#: ../text.py:173 msgid "Install Custom System" msgstr "" -#: ../text.py:164 +#: ../text.py:174 msgid "Upgrade Existing Installation" msgstr "" -#: ../text.py:165 ../text.py:861 +#: ../text.py:175 ../text.py:871 msgid "Installation Type" msgstr "" -#: ../text.py:166 +#: ../text.py:176 msgid "What type of system would you like to install?" msgstr "" @@ -165,58 +165,58 @@ 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:191 ../text.py:571 +#: ../loader/urls.c:206 ../text.py:201 ../text.py:581 msgid "Error" msgstr "" -#: ../text.py:192 +#: ../text.py:202 msgid "You don't have any Linux partitions. You can't upgrade this system!" msgstr "" -#: ../text.py:205 +#: ../text.py:215 msgid "System to Upgrade" msgstr "" -#: ../text.py:206 +#: ../text.py:216 msgid "What partition holds the root partition of your installation?" msgstr "" -#: ../text.py:221 +#: ../text.py:231 msgid "Customize Packages to Upgrade" msgstr "" -#: ../text.py:222 +#: ../text.py:232 msgid "" "The packages you have installed, and any other packages which are needed to " "satisfy their dependencies, have been selected for installation. Would you " "like to customize the set of packages that will be upgraded?" msgstr "" -#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:956 -#: ../libfdisk/gnomefsedit.c:1080 ../libfdisk/gnomefsedit.c:2020 -#: ../libfdisk/gnomefsedit.c:2290 ../libfdisk/gnomefsedit.c:2343 +#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:957 +#: ../libfdisk/gnomefsedit.c:1081 ../libfdisk/gnomefsedit.c:2021 +#: ../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/loader.c:579 ../loader/net.c:698 -#: ../text.py:229 ../text.py:415 ../text.py:418 ../textw/partitioning.py:147 +#: ../text.py:239 ../text.py:425 ../text.py:428 ../textw/partitioning.py:147 msgid "Yes" msgstr "" -#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:956 -#: ../libfdisk/gnomefsedit.c:1080 ../libfdisk/gnomefsedit.c:2020 -#: ../libfdisk/gnomefsedit.c:2290 ../libfdisk/gnomefsedit.c:2343 +#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:957 +#: ../libfdisk/gnomefsedit.c:1081 ../libfdisk/gnomefsedit.c:2021 +#: ../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:229 -#: ../text.py:234 ../text.py:415 ../text.py:421 ../textw/partitioning.py:147 +#: ../libfdisk/newtfsedit.c:1586 ../loader/net.c:698 ../text.py:239 +#: ../text.py:244 ../text.py:425 ../text.py:431 ../textw/partitioning.py:147 msgid "No" msgstr "" -#: ../text.py:244 +#: ../text.py:254 msgid "Red Hat Linux" msgstr "" -#: ../text.py:245 +#: ../text.py:255 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:315 +#: ../text.py:325 msgid "Use bootp/dhcp" msgstr "" -#: ../loader/net.c:234 ../text.py:320 +#: ../loader/net.c:234 ../text.py:330 msgid "IP address:" msgstr "" -#: ../loader/net.c:237 ../text.py:321 +#: ../loader/net.c:237 ../text.py:331 msgid "Netmask:" msgstr "" -#: ../loader/net.c:240 ../text.py:322 +#: ../loader/net.c:240 ../text.py:332 msgid "Default gateway (IP):" msgstr "" -#: ../loader/net.c:243 ../text.py:323 +#: ../loader/net.c:243 ../text.py:333 msgid "Primary nameserver:" msgstr "" -#: ../text.py:345 +#: ../text.py:355 msgid "Network Configuration" msgstr "" -#: ../text.py:361 +#: ../text.py:371 msgid "Invalid information" msgstr "" -#: ../text.py:362 +#: ../text.py:372 msgid "You must enter valid IP information to continue" msgstr "" -#: ../text.py:390 +#: ../text.py:400 msgid "Hostname Configuration" msgstr "" -#: ../text.py:391 +#: ../text.py:401 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:187 ../loader/net.c:460 ../loader/net.c:617 ../text.py:394 +#: ../iw/network.py:189 ../loader/net.c:460 ../loader/net.c:617 ../text.py:404 msgid "Hostname" msgstr "" -#: ../text.py:405 ../text.py:559 ../text.py:913 +#: ../text.py:415 ../text.py:569 ../text.py:923 msgid "Bootdisk" msgstr "" -#: ../text.py:406 +#: ../text.py:416 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:441 +#: ../text.py:451 msgid "X probe results" msgstr "" -#: ../text.py:454 ../text.py:473 +#: ../text.py:464 ../text.py:483 msgid "Unlisted Card" msgstr "" -#: ../text.py:462 +#: ../text.py:472 msgid "Video Card Selection" msgstr "" -#: ../text.py:463 +#: ../text.py:473 msgid "Which video card do you have?" msgstr "" -#: ../text.py:475 +#: ../text.py:485 msgid "X Server Selection" msgstr "" -#: ../text.py:475 +#: ../text.py:485 msgid "Choose a server" msgstr "" -#: ../text.py:526 +#: ../text.py:536 msgid "Installation to begin" msgstr "" -#: ../iw/confirm.py:18 ../text.py:527 +#: ../iw/confirm.py:19 ../text.py:537 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:543 +#: ../text.py:553 msgid "Complete" msgstr "" -#: ../iw/congrats.py:17 ../text.py:544 +#: ../iw/congrats.py:17 ../text.py:554 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:560 +#: ../iw/bootdisk.py:41 ../text.py:570 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:563 ../text.py:564 ../text.py:575 ../text.py:576 +#: ../text.py:573 ../text.py:574 ../text.py:585 ../text.py:586 #: ../textw/lilo.py:20 msgid "Skip" msgstr "" -#: ../iw/bootdisk.py:45 ../text.py:572 +#: ../iw/bootdisk.py:45 ../text.py:582 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:634 +#: ../text.py:644 msgid "Package Installation" msgstr "" -#: ../text.py:636 +#: ../text.py:646 msgid "Name : " msgstr "" -#: ../text.py:637 +#: ../text.py:647 msgid "Size : " msgstr "" -#: ../text.py:638 +#: ../text.py:648 msgid "Summary: " msgstr "" -#: ../text.py:664 +#: ../text.py:674 msgid " Packages" msgstr "" -#: ../text.py:665 +#: ../text.py:675 msgid " Bytes" msgstr "" -#: ../text.py:666 +#: ../text.py:676 msgid " Time" msgstr "" -#: ../text.py:668 +#: ../text.py:678 msgid "Total :" msgstr "" -#: ../text.py:675 +#: ../text.py:685 msgid "Completed: " msgstr "" -#: ../text.py:685 +#: ../text.py:695 msgid "Remaining: " msgstr "" -#: ../text.py:755 +#: ../text.py:765 msgid "What time zone are you located in?" msgstr "" -#: ../text.py:763 +#: ../text.py:773 msgid "Hardware clock set to GMT?" msgstr "" -#: ../iw/timezone.py:29 ../text.py:765 +#: ../iw/timezone.py:29 ../text.py:775 msgid "Time Zone Selection" msgstr "" -#: ../text.py:829 ../text.py:830 +#: ../text.py:839 ../text.py:840 msgid "Debug" msgstr "" -#: ../text.py:842 +#: ../text.py:852 msgid "Red Hat Linux (C) 1999 Red Hat, Inc." msgstr "" -#: ../text.py:844 +#: ../text.py:854 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "" -#: ../text.py:860 +#: ../text.py:870 msgid "Welcome" msgstr "" -#: ../iw/lilo.py:94 ../iw/lilo.py:197 ../text.py:866 ../text.py:872 +#: ../iw/lilo.py:94 ../iw/lilo.py:197 ../text.py:876 ../text.py:882 msgid "Partition" msgstr "" -#: ../text.py:868 +#: ../text.py:878 msgid "Manually Partition" msgstr "" -#: ../text.py:870 +#: ../text.py:880 msgid "Automatic Partition" msgstr "" -#: ../text.py:874 +#: ../text.py:884 msgid "Swap" msgstr "" -#: ../text.py:876 +#: ../text.py:886 msgid "Filesystem Formatting" msgstr "" -#: ../text.py:878 ../text.py:880 ../text.py:882 ../textw/lilo.py:23 +#: ../text.py:888 ../text.py:890 ../text.py:892 ../textw/lilo.py:23 #: ../textw/lilo.py:62 ../textw/lilo.py:154 msgid "LILO Configuration" msgstr "" -#: ../text.py:884 +#: ../text.py:894 msgid "Hostname Setup" msgstr "" -#: ../text.py:886 +#: ../text.py:896 msgid "Network Setup" msgstr "" -#: ../text.py:888 ../text.py:890 +#: ../text.py:898 ../text.py:900 msgid "Mouse Configuration" msgstr "" -#: ../text.py:892 +#: ../text.py:902 msgid "Time Zone Setup" msgstr "" -#: ../text.py:894 ../textw/userauth.py:10 +#: ../text.py:904 ../textw/userauth.py:10 msgid "Root Password" msgstr "" -#: ../text.py:896 ../textw/userauth.py:150 +#: ../text.py:906 ../textw/userauth.py:150 msgid "User Account Setup" msgstr "" -#: ../text.py:898 +#: ../text.py:908 msgid "Authentication" msgstr "" -#: ../text.py:900 +#: ../text.py:910 msgid "Package Groups" msgstr "" -#: ../text.py:902 ../text.py:923 +#: ../text.py:912 ../text.py:933 msgid "Individual Packages" msgstr "" -#: ../text.py:904 ../textw/packages.py:116 +#: ../text.py:914 ../textw/packages.py:116 msgid "Package Dependencies" msgstr "" -#: ../iw/xconfig.py:89 ../text.py:906 ../text.py:914 +#: ../iw/xconfig.py:89 ../text.py:916 ../text.py:924 msgid "X Configuration" msgstr "" -#: ../text.py:908 +#: ../text.py:918 msgid "Boot Disk" msgstr "" -#: ../text.py:910 +#: ../text.py:920 msgid "Installation Begins" msgstr "" -#: ../text.py:912 +#: ../text.py:922 msgid "Install System" msgstr "" -#: ../text.py:916 +#: ../text.py:926 msgid "Installation Complete" msgstr "" -#: ../text.py:921 +#: ../text.py:931 msgid "Examine System" msgstr "" -#: ../text.py:922 +#: ../text.py:932 msgid "Customize Upgrade" msgstr "" -#: ../text.py:924 +#: ../text.py:934 msgid "Upgrade System" msgstr "" -#: ../text.py:925 +#: ../text.py:935 msgid "Upgrade Complete" msgstr "" @@ -632,11 +632,11 @@ msgstr "" msgid "Skip boot disk creation" msgstr "" -#: ../iw/confirm.py:10 +#: ../iw/confirm.py:11 msgid "About to Install" msgstr "" -#: ../iw/confirm.py:15 +#: ../iw/confirm.py:16 msgid "Click next to begin installation of Red Hat Linux." msgstr "" @@ -702,8 +702,8 @@ msgstr "" msgid "KDE Workstation" msgstr "" -#: ../iw/installpath.py:40 ../libfdisk/gnomefsedit.c:2196 -#: ../libfdisk/gnomefsedit.c:2216 +#: ../iw/installpath.py:40 ../libfdisk/gnomefsedit.c:2197 +#: ../libfdisk/gnomefsedit.c:2217 msgid "Server" msgstr "" @@ -731,19 +731,19 @@ msgstr "" msgid "Keyboard Configuration" msgstr "" -#: ../iw/keyboard.py:45 +#: ../iw/keyboard.py:48 msgid "Model" msgstr "" -#: ../iw/keyboard.py:62 +#: ../iw/keyboard.py:66 msgid "Layout" msgstr "" -#: ../iw/keyboard.py:79 +#: ../iw/keyboard.py:84 msgid "Variant" msgstr "" -#: ../iw/keyboard.py:95 +#: ../iw/keyboard.py:100 msgid "Test your selection here:" msgstr "" @@ -804,39 +804,39 @@ msgstr "" msgid "Configure using DHCP" msgstr "" -#: ../iw/network.py:138 +#: ../iw/network.py:137 msgid "Activate on boot" msgstr "" -#: ../iw/network.py:147 +#: ../iw/network.py:146 msgid "IP Address" msgstr "" -#: ../iw/network.py:147 ../loader/net.c:615 +#: ../iw/network.py:146 ../loader/net.c:615 msgid "Netmask" msgstr "" -#: ../iw/network.py:147 ../loader/loader.c:227 +#: ../iw/network.py:146 ../loader/loader.c:227 msgid "Network" msgstr "" -#: ../iw/network.py:147 +#: ../iw/network.py:146 msgid "Broadcast" msgstr "" -#: ../iw/network.py:188 +#: ../iw/network.py:190 msgid "Gateway" msgstr "" -#: ../iw/network.py:188 +#: ../iw/network.py:190 msgid "Primary DNS" msgstr "" -#: ../iw/network.py:188 +#: ../iw/network.py:190 msgid "Secondary DNS" msgstr "" -#: ../iw/network.py:188 +#: ../iw/network.py:190 msgid "Ternary DNS" msgstr "" @@ -1033,8 +1033,8 @@ msgstr "" msgid "Clear" msgstr "" -#: ../libfdisk/gnomefsedit.c:655 ../libfdisk/gnomefsedit.c:1619 -#: ../libfdisk/gnomefsedit.c:2128 ../libfdisk/newtfsedit.c:450 +#: ../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 msgid "Cancel" @@ -1376,7 +1376,7 @@ msgstr "" msgid "Edit Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:666 ../libfdisk/gnomefsedit.c:1628 +#: ../libfdisk/gnomefsedit.c:666 ../libfdisk/gnomefsedit.c:1629 msgid "Mount Point:" msgstr "" @@ -1404,7 +1404,7 @@ msgstr "" msgid "Failure Reason:" msgstr "" -#: ../libfdisk/gnomefsedit.c:784 ../libfdisk/gnomefsedit.c:1654 +#: ../libfdisk/gnomefsedit.c:784 ../libfdisk/gnomefsedit.c:1655 msgid "Partition Type:" msgstr "" @@ -1412,44 +1412,44 @@ msgstr "" msgid "Allowable Drives:" msgstr "" -#: ../libfdisk/gnomefsedit.c:956 ../libfdisk/gnomefsedit.c:1846 +#: ../libfdisk/gnomefsedit.c:957 ../libfdisk/gnomefsedit.c:1847 #: ../libfdisk/newtfsedit.c:486 msgid "No Mount Point" msgstr "" -#: ../libfdisk/gnomefsedit.c:957 ../libfdisk/newtfsedit.c:487 +#: ../libfdisk/gnomefsedit.c:958 ../libfdisk/newtfsedit.c:487 msgid "" "You have not selected a mount point for this partition. Are you sure you " "want to do this?" msgstr "" -#: ../libfdisk/gnomefsedit.c:1000 ../libfdisk/gnomefsedit.c:1854 +#: ../libfdisk/gnomefsedit.c:1001 ../libfdisk/gnomefsedit.c:1855 #: ../libfdisk/newtfsedit.c:527 msgid "Mount Point Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1001 ../libfdisk/newtfsedit.c:528 +#: ../libfdisk/gnomefsedit.c:1002 ../libfdisk/newtfsedit.c:528 msgid "" "The mount point requested is either an illegal path or is already in use. " "Please select a valid mount point." msgstr "" -#: ../libfdisk/gnomefsedit.c:1026 ../libfdisk/newtfsedit.c:545 +#: ../libfdisk/gnomefsedit.c:1027 ../libfdisk/newtfsedit.c:545 msgid "Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1027 ../libfdisk/newtfsedit.c:546 +#: ../libfdisk/gnomefsedit.c:1028 ../libfdisk/newtfsedit.c:546 msgid "" "The size requested is illegal. Make sure the size is greater and zero (0), " "and is specified int decimal (base 10) format." msgstr "" -#: ../libfdisk/gnomefsedit.c:1062 ../libfdisk/gnomefsedit.c:1967 +#: ../libfdisk/gnomefsedit.c:1063 ../libfdisk/gnomefsedit.c:1968 #: ../libfdisk/newtfsedit.c:581 msgid "Swap Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1063 ../libfdisk/gnomefsedit.c:1968 +#: ../libfdisk/gnomefsedit.c:1064 ../libfdisk/gnomefsedit.c:1969 #: ../libfdisk/newtfsedit.c:582 #, c-format msgid "" @@ -1457,22 +1457,22 @@ msgid "" "swap partition is %ld Megabytes." msgstr "" -#: ../libfdisk/gnomefsedit.c:1079 ../libfdisk/gnomefsedit.c:1086 +#: ../libfdisk/gnomefsedit.c:1080 ../libfdisk/gnomefsedit.c:1087 msgid "No RAID Drive Constraint" msgstr "" -#: ../libfdisk/gnomefsedit.c:1081 +#: ../libfdisk/gnomefsedit.c:1082 msgid "" "You have configured a RAID partition without constraining the partition to a " "single drive.\n" " Are you sure you want to do this?" msgstr "" -#: ../libfdisk/gnomefsedit.c:1087 +#: ../libfdisk/gnomefsedit.c:1088 msgid "Close" msgstr "" -#: ../libfdisk/gnomefsedit.c:1088 +#: ../libfdisk/gnomefsedit.c:1089 msgid "" "You have configured a RAID partition without constraining the partition to a " "single drive. Please select one drive to constrain this partition to." @@ -1480,11 +1480,11 @@ msgstr "" #. XXXXX - for now destroy the raid entry since it #. now contains unallocated partitions! -#: ../libfdisk/gnomefsedit.c:1267 +#: ../libfdisk/gnomefsedit.c:1268 msgid "RAID Entry Incomplete" msgstr "" -#: ../libfdisk/gnomefsedit.c:1268 +#: ../libfdisk/gnomefsedit.c:1269 #, c-format msgid "" "The raid device /dev/%s now contains partitions which are unallocated. The " @@ -1493,12 +1493,12 @@ msgid "" msgstr "" #. build list of why they all failed -#: ../libfdisk/gnomefsedit.c:1361 ../libfdisk/gnomefsedit.c:1380 +#: ../libfdisk/gnomefsedit.c:1362 ../libfdisk/gnomefsedit.c:1381 #: ../libfdisk/newtfsedit.c:84 ../libfdisk/newtfsedit.c:1482 msgid "Unallocated Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1365 ../libfdisk/gnomefsedit.c:1375 +#: ../libfdisk/gnomefsedit.c:1366 ../libfdisk/gnomefsedit.c:1376 #: ../libfdisk/newtfsedit.c:88 msgid "" "There are currently unallocated partition(s) present in the list of " @@ -1506,80 +1506,80 @@ msgid "" "with the reason they were not allocated." msgstr "" -#: ../libfdisk/gnomefsedit.c:1640 +#: ../libfdisk/gnomefsedit.c:1641 msgid "<Swap Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:1698 +#: ../libfdisk/gnomefsedit.c:1699 msgid "RAID Device: /dev/" msgstr "" -#: ../libfdisk/gnomefsedit.c:1721 +#: ../libfdisk/gnomefsedit.c:1722 msgid "RAID Type:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1758 +#: ../libfdisk/gnomefsedit.c:1759 msgid "Partitions For RAID Array:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1847 +#: ../libfdisk/gnomefsedit.c:1848 msgid "You have not selected a mount point. A mount point is required." msgstr "" -#: ../libfdisk/gnomefsedit.c:1855 +#: ../libfdisk/gnomefsedit.c:1856 msgid "" "The mount point requested is already in use. Please select a valid mount " "point." msgstr "" -#: ../libfdisk/gnomefsedit.c:1868 +#: ../libfdisk/gnomefsedit.c:1869 msgid "Booting From RAID Warning" msgstr "" -#: ../libfdisk/gnomefsedit.c:1869 +#: ../libfdisk/gnomefsedit.c:1870 msgid "" "You have made this raid device mount as a booting partition. Please make " "sure all the component partitions are bootable." msgstr "" -#: ../libfdisk/gnomefsedit.c:1879 +#: ../libfdisk/gnomefsedit.c:1880 msgid "No RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:1880 +#: ../libfdisk/gnomefsedit.c:1881 msgid "You need to selected a RAID device." msgstr "" -#: ../libfdisk/gnomefsedit.c:1886 +#: ../libfdisk/gnomefsedit.c:1887 msgid "Used Raid Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:1887 +#: ../libfdisk/gnomefsedit.c:1888 #, c-format msgid "" "The raid device \"/dev/%s\" is already configured as a raid device. Please " "select another." msgstr "" -#: ../libfdisk/gnomefsedit.c:1900 +#: ../libfdisk/gnomefsedit.c:1901 msgid "Not Enough Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1902 +#: ../libfdisk/gnomefsedit.c:1903 msgid "" "You have not configured enough partitions for the RAID type you have " "selected." msgstr "" -#: ../libfdisk/gnomefsedit.c:1909 +#: ../libfdisk/gnomefsedit.c:1910 msgid "Illegal /boot RAID Type" msgstr "" -#: ../libfdisk/gnomefsedit.c:1911 +#: ../libfdisk/gnomefsedit.c:1912 msgid "Boot partitions (/boot) are only allowed on RAID-1." msgstr "" -#: ../libfdisk/gnomefsedit.c:2012 +#: ../libfdisk/gnomefsedit.c:2013 #, c-format msgid "" "The partition %s is a pre-existing partition in the set of partitions for " @@ -1587,115 +1587,115 @@ msgid "" "possible to boot from this partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2019 +#: ../libfdisk/gnomefsedit.c:2020 msgid "Use Pre-existing Partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2128 +#: ../libfdisk/gnomefsedit.c:2129 msgid "Auto-Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:2135 +#: ../libfdisk/gnomefsedit.c:2136 msgid "Using Existing Disk Space" msgstr "" -#: ../libfdisk/gnomefsedit.c:2154 +#: ../libfdisk/gnomefsedit.c:2155 msgid "Remove Linux partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:2165 +#: ../libfdisk/gnomefsedit.c:2166 msgid "Use existing free space" msgstr "" #. workstation or server? -#: ../libfdisk/gnomefsedit.c:2177 +#: ../libfdisk/gnomefsedit.c:2178 msgid "Intended Use" msgstr "" -#: ../libfdisk/gnomefsedit.c:2216 +#: ../libfdisk/gnomefsedit.c:2217 msgid "Workstation" msgstr "" -#: ../libfdisk/gnomefsedit.c:2290 +#: ../libfdisk/gnomefsedit.c:2291 msgid "Delete RAID Device?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2291 +#: ../libfdisk/gnomefsedit.c:2292 msgid "Are you sure you want to remove this RAID device?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2342 ../libfdisk/newtfsedit.c:1585 +#: ../libfdisk/gnomefsedit.c:2343 ../libfdisk/newtfsedit.c:1585 msgid "Reset Partition Table" msgstr "" -#: ../libfdisk/gnomefsedit.c:2344 ../libfdisk/newtfsedit.c:1587 +#: ../libfdisk/gnomefsedit.c:2345 ../libfdisk/newtfsedit.c:1587 msgid "Reset partition table to original contents? " msgstr "" -#: ../libfdisk/gnomefsedit.c:2380 ../libfdisk/gnomefsedit.c:2431 +#: ../libfdisk/gnomefsedit.c:2381 ../libfdisk/gnomefsedit.c:2432 msgid "<Swap>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2382 +#: ../libfdisk/gnomefsedit.c:2383 msgid "<RAID>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2384 +#: ../libfdisk/gnomefsedit.c:2385 msgid "<not set>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2941 +#: ../libfdisk/gnomefsedit.c:2942 msgid "Unallocated Partitions Exist..." msgstr "" -#: ../libfdisk/gnomefsedit.c:2952 +#: ../libfdisk/gnomefsedit.c:2953 msgid "" "You must assign a root (/) partition to a Linux native partition (ext2) or a " "RAID partition for the install to proceed." msgstr "" -#: ../libfdisk/gnomefsedit.c:2966 ../libfdisk/gnomefsedit.c:2979 +#: ../libfdisk/gnomefsedit.c:2967 ../libfdisk/gnomefsedit.c:2980 msgid "" "You must assign a boot (/boot) partition to a Linux native partition (ext2) " "or a RAID-1 partition for the install to proceed." msgstr "" -#: ../libfdisk/gnomefsedit.c:2994 +#: ../libfdisk/gnomefsedit.c:2995 msgid "" "Because you have assigned the root partition (/) to a RAID device, you must " "also assign a boot (/boot) partition to a Linux native partition (ext2) or a " "RAID-1 partition for the install to proceed." msgstr "" -#: ../libfdisk/gnomefsedit.c:3067 +#: ../libfdisk/gnomefsedit.c:3068 msgid "Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:3111 +#: ../libfdisk/gnomefsedit.c:3112 msgid "_Add..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3123 +#: ../libfdisk/gnomefsedit.c:3124 msgid "_Edit..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3124 +#: ../libfdisk/gnomefsedit.c:3125 msgid "_Delete" msgstr "" -#: ../libfdisk/gnomefsedit.c:3125 +#: ../libfdisk/gnomefsedit.c:3126 msgid "_Reset" msgstr "" -#: ../libfdisk/gnomefsedit.c:3154 +#: ../libfdisk/gnomefsedit.c:3155 msgid "_Make RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:3163 +#: ../libfdisk/gnomefsedit.c:3164 msgid "Auto Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:3176 +#: ../libfdisk/gnomefsedit.c:3177 msgid "Drive Summary" msgstr "" @@ -32,21 +32,31 @@ class LanguageWindow: def __call__(self, screen, todo): languages = todo.language.available () descriptions = languages.keys () - locales = languages.values () - default = locales.index (todo.language.get ()) - + descriptions.sort () + current = todo.language.get () + for lang in descriptions: + if languages[lang] == current: + default = descriptions.index (lang) + + height = screen.height - 16 (button, choice) = \ ListboxChoiceWindow(screen, _("Language Selection"), _("What language would you like to use during the " "installation process?"), descriptions, - buttons = [_("OK")], width = 30, default = default) + buttons = [_("OK")], width = 30, default = default, scroll = 1, + height = height) + choice = descriptions[choice] + lang = languages [choice] + newlangs = [lang] + if len(lang) > 2: + newlangs.append(lang[:2]) langs = gettext.getlangs () - langs = [languages [languages.keys()[choice]]] + langs + langs = newlangs + langs gettext.setlangs (langs) global cat, _ - cat = gettext.Catalog ("anaconda-text", "/usr/share/locale") + cat = gettext.Catalog ("anaconda", "/usr/share/locale") _ = cat.gettext - todo.language.set (languages.keys()[choice]) + todo.language.set (choice) return INSTALL_OK class MouseDeviceWindow: @@ -161,27 +161,27 @@ class Language (SimpleConfigFile): self.info = {} self.lang = None self.langs = { - "Czech" : "cs", - "English" : "en", - "French": "fr", - "German": "de", - "Hungarian": "hu", - "Icelandic": "is", - "Indonesian": "id", - "Italian": "it", - "Norwegian": "no", - "Polish": "pl", - "Romanian": "ro", - "Slovak": "sk", - "Spanish": "es", - "Russian": "ru", - "Ukrainian": "uk", - "German" : "de", + "Czech" : "cs_CZ" , + "English" : "en_US" , + "French" : "fr_FR" , + "German" : "de_DE" , + "Hungarian" : "hu_HU" , + "Icelandic" : "is_IS" , + "Indonesian" : "id_ID" , + "Italian" : "it_IT" , + "Norwegian" : "no_NO" , + "Polish" : "pl_PL" , + "Romanian" : "ro_RO" , + "Slovak" : "sk_SK" , + "Spanish" : "es_MX" , + "Russian" : "ru_SU" , + "Ukrainian" : "uk_UA" , } - self.abbrevMap = { # kickstart needs this - "en": "English", - "de": "German" - } + + # kickstart needs this + self.abbrevMap = {} + for (key, value) in self.langs.items (): + self.abbrevMap[value] = key def available (self): return self.langs |