diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-24 19:44:11 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-24 19:44:11 +0000 |
| commit | 9564df37ef6e28bb539fa7d3187b04415a54174c (patch) | |
| tree | 9654f9478d85675044de4e3b7b7236bbd0f7bc72 | |
| parent | daca35fe3340a29cc1f48702ac26e67d0fadceec (diff) | |
| download | anaconda-9564df37ef6e28bb539fa7d3187b04415a54174c.tar.gz anaconda-9564df37ef6e28bb539fa7d3187b04415a54174c.tar.xz anaconda-9564df37ef6e28bb539fa7d3187b04415a54174c.zip | |
language switching
| -rwxr-xr-x | anaconda | 2 | ||||
| -rwxr-xr-x | gui.py | 19 | ||||
| -rw-r--r-- | iw/language.py | 12 | ||||
| -rw-r--r-- | po/anaconda.pot | 819 | ||||
| -rw-r--r-- | po/ru.po | 2 | ||||
| -rw-r--r-- | todo.py | 6 | ||||
| -rwxr-xr-x | upd-instroot | 15 |
7 files changed, 463 insertions, 412 deletions
@@ -139,7 +139,7 @@ if (mode == 'g' and not os.environ.has_key('DISPLAY')): if (mode == 'g'): if not test and not localInstall: - for i in ( "imrc", "im_palette.pal" ): + for i in ( "imrc", "im_palette.pal", "gtk" ): os.symlink ("../mnt/source/RedHat/instimage/etc/" + i, "/etc/" + i) from gui import InstallInterface elif (mode == 't'): @@ -68,6 +68,7 @@ import rpm from thread import * from threading import * import time +from _gtk import gtk_set_locale class WaitWindow: def __init__(self, title, text): @@ -241,6 +242,7 @@ class InstallControlWindow (Thread): global cat newlangs = [lang] + if len(lang) > 2: newlangs.append(lang[:2]) gettext.setlangs (newlangs) @@ -248,8 +250,19 @@ class InstallControlWindow (Thread): for l in newlangs: if os.access ("/etc/gtk/gtkrc." + l, os.R_OK): rc_parse("/etc/gtk/gtkrc." + l) - print "loaded gtkrc." + l + + gtk_set_locale () self.window.reset_rc_styles () + # get the labels + for (button, text) in [ (self.nextButtonStock, _("Next")), + (self.prevButtonStock, _("Back")), + (self.showHelpButton, _("Show Help")), + (self.hideHelpButton, _("Hide Help")), + (self.finishButton, _("Finish")) ]: + label = button.children ()[0].children ()[0].children()[1] + label.set_text (text) + self.helpFrame.set_label (_("Online Help")) + self.installFrame.set_label (_("Language Selection")) def instantiateWindow (self, windowClass): ics = InstallControlState (self, self.ii, self.todo) @@ -392,7 +405,7 @@ class InstallControlWindow (Thread): if self.buildingWindows or ics != self.currentScreen.getICS (): return - self.installFrame.set_label (ics.getTitle ()) + self.installFrame.set_label (_(ics.getTitle ())) buttons = { "prev" : ics.getPrevButton (), "next" : ics.getNextButton () } @@ -403,7 +416,7 @@ class InstallControlWindow (Thread): elif button["pixmap"] == STOCK_BUTTON_NEXT and not button["label"]: buttons[name] = self.nextButtonStock else: - buttons[name] = GnomePixmapButton (GnomeStock (button["pixmap"]), button["label"]) + buttons[name] = GnomePixmapButton (GnomeStock (button["pixmap"]), _(button["label"])) if name == "prev": buttons[name].connect ("clicked", self.prevClicked) elif name == "next": buttons[name].connect ("clicked", self.nextClicked) buttons[name].show () diff --git a/iw/language.py b/iw/language.py index e9eec65c4..79202eefd 100644 --- a/iw/language.py +++ b/iw/language.py @@ -11,17 +11,25 @@ class LanguageWindow (InstallWindow): ics.setPrevEnabled (0) ics.setNextEnabled (1) ics.readHTML ("lang") + self.ics = ics self.icw = ics.getICW () self.question = (_("What language should be used during the " "installation process?")) self.languages = self.todo.language.available () self.running = 0 + self.lang = None + + def getNext (self): + if self.lang: + self.todo.language.set (self.lang) + self.icw.setLanguage (self.languages[self.lang]) + return None + def select_row (self, clist, row, col, event): if self.running: lang = clist.get_text (clist.selection[0], 0) - self.todo.language.set (lang) - self.icw.setLanguage (self.languages[lang]) + self.lang = lang def getScreen (self): self.running = 0 diff --git a/po/anaconda.pot b/po/anaconda.pot index 19d7523a6..0d11043cd 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 20:40-0400\n" +"POT-Creation-Date: 1999-09-24 14:40-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,209 +14,213 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../iw/language.py:10 ../text.py:46 ../text.py:866 +#: ../iw/language.py:10 ../text.py:49 ../text.py:891 msgid "Language Selection" msgstr "" -#: ../text.py:47 +#: ../text.py:50 msgid "What language would you like to use during the installation process?" msgstr "" -#: ../loader/cdrom.c:34 ../loader/devices.c:65 ../loader/devices.c:164 -#: ../loader/devices.c:175 ../loader/devices.c:178 ../loader/devices.c:210 +#: ../loader/cdrom.c:34 ../loader/devices.c:66 ../loader/devices.c:167 +#: ../loader/devices.c:178 ../loader/devices.c:183 ../loader/devices.c:218 #: ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107 #: ../loader/lang.c:247 ../loader/lang.c:503 ../loader/loader.c:242 #: ../loader/loader.c:458 ../loader/loader.c:468 ../loader/loader.c:615 #: ../loader/loader.c:670 ../loader/loader.c:715 ../loader/loader.c:848 #: ../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:49 ../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:21 ../textw/lilo.py:66 +#: ../loader/loader.c:1555 ../loader/net.c:162 ../loader/net.c:284 +#: ../loader/net.c:560 ../loader/urls.c:124 ../loader/urls.c:201 +#: ../loader/urls.c:206 ../loader/urls.c:322 ../text.py:52 ../text.py:103 +#: ../text.py:154 ../text.py:199 ../text.py:242 ../text.py:287 ../text.py:378 +#: ../text.py:398 ../text.py:429 ../text.py:478 ../text.py:500 ../text.py:565 +#: ../text.py:586 ../text.py:598 ../text.py:610 ../text.py:788 ../text.py:860 +#: ../text.py:864 ../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 +#: ../textw/partitioning.py:199 ../textw/silo.py:21 ../textw/silo.py:66 +#: ../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:79 ../textw/lilo.py:138 +#: ../iw/lilo.py:174 ../iw/silo.py:168 ../text.py:85 ../textw/lilo.py:79 +#: ../textw/lilo.py:138 ../textw/silo.py:79 ../textw/silo.py:136 msgid "Device" msgstr "" -#: ../text.py:83 +#: ../text.py:86 #, c-format msgid "What device is your mouse located on? %s %i" msgstr "" #. code to create dialog in gtk+ -#: ../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: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/fsedit.c:609 ../libfdisk/fsedit.c:616 ../libfdisk/fsedit.c:623 +#: ../libfdisk/fsedit.c:632 ../libfdisk/fsedit.c:644 ../libfdisk/fsedit.c:654 +#: ../libfdisk/fsedit.c:683 ../libfdisk/fsedit.c:699 ../libfdisk/fsedit.c:1053 +#: ../libfdisk/gnomefsedit.c:676 ../libfdisk/gnomefsedit.c:1030 +#: ../libfdisk/gnomefsedit.c:1056 ../libfdisk/gnomefsedit.c:1092 +#: ../libfdisk/gnomefsedit.c:1297 ../libfdisk/gnomefsedit.c:1391 +#: ../libfdisk/gnomefsedit.c:1409 ../libfdisk/gnomefsedit.c:1647 +#: ../libfdisk/gnomefsedit.c:1882 ../libfdisk/gnomefsedit.c:1890 +#: ../libfdisk/gnomefsedit.c:1904 ../libfdisk/gnomefsedit.c:1915 +#: ../libfdisk/gnomefsedit.c:1922 ../libfdisk/gnomefsedit.c:1937 +#: ../libfdisk/gnomefsedit.c:1946 ../libfdisk/gnomefsedit.c:2003 +#: ../libfdisk/gnomefsedit.c:2164 ../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:84 ../text.py:487 +#: ../libfdisk/newtfsedit.c:1545 ../text.py:87 ../text.py:512 #: ../textw/constants.py:10 ../textw/lilo.py:84 ../textw/lilo.py:97 -#: ../textw/lilo.py:147 +#: ../textw/lilo.py:147 ../textw/silo.py:84 ../textw/silo.py:97 +#: ../textw/silo.py:145 msgid "Ok" msgstr "" -#: ../gui.py:423 ../libfdisk/fsedit.c:955 ../libfdisk/newtfsedit.c:1297 -#: ../libfdisk/newtfsedit.c:1305 ../loader/cdrom.c:34 ../loader/devices.c:66 -#: ../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:22 +#: ../gui.py:259 ../gui.py:465 ../libfdisk/fsedit.c:960 +#: ../libfdisk/newtfsedit.c:1297 ../libfdisk/newtfsedit.c:1305 +#: ../loader/cdrom.c:34 ../loader/devices.c:67 ../loader/devices.c:168 +#: ../loader/devices.c:218 ../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:87 ../text.py:88 +#: ../text.py:103 ../text.py:126 ../text.py:154 ../text.py:157 ../text.py:199 +#: ../text.py:228 ../text.py:242 ../text.py:244 ../text.py:263 ../text.py:265 +#: ../text.py:287 ../text.py:289 ../text.py:378 ../text.py:429 ../text.py:431 +#: ../text.py:450 ../text.py:459 ../text.py:478 ../text.py:480 ../text.py:500 +#: ../text.py:503 ../text.py:512 ../text.py:565 ../text.py:566 ../text.py:788 +#: ../text.py:810 ../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 +#: ../textw/partitioning.py:64 ../textw/partitioning.py:199 +#: ../textw/silo.py:22 ../textw/silo.py:66 ../textw/silo.py:73 +#: ../textw/silo.py:146 ../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:893 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:192 msgid "Install GNOME Workstation" msgstr "" -#: ../text.py:171 +#: ../text.py:193 msgid "Install KDE Workstation" msgstr "" -#: ../text.py:172 +#: ../text.py:194 msgid "Install Server System" msgstr "" -#: ../text.py:173 +#: ../text.py:195 msgid "Install Custom System" msgstr "" -#: ../text.py:174 +#: ../text.py:196 msgid "Upgrade Existing Installation" msgstr "" -#: ../text.py:175 ../text.py:871 +#: ../text.py:197 ../text.py:896 msgid "Installation Type" msgstr "" -#: ../text.py:176 +#: ../text.py:198 msgid "What type of system would you like to install?" msgstr "" -#: ../libfdisk/newtfsedit.c:1545 ../loader/devices.c:175 -#: ../loader/devices.c:178 ../loader/loader.c:458 ../loader/loader.c:468 +#: ../libfdisk/newtfsedit.c:1545 ../loader/devices.c:178 +#: ../loader/devices.c:183 ../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/loader.c:853 ../loader/loader.c:1555 ../loader/urls.c:201 +#: ../loader/urls.c:206 ../text.py:225 ../text.py:606 msgid "Error" msgstr "" -#: ../text.py:202 +#: ../text.py:226 msgid "You don't have any Linux partitions. You can't upgrade this system!" msgstr "" -#: ../text.py:215 +#: ../text.py:239 msgid "System to Upgrade" msgstr "" -#: ../text.py:216 +#: ../text.py:240 msgid "What partition holds the root partition of your installation?" msgstr "" -#: ../text.py:231 +#: ../text.py:255 msgid "Customize Packages to Upgrade" msgstr "" -#: ../text.py:232 +#: ../text.py:256 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:957 -#: ../libfdisk/gnomefsedit.c:1081 ../libfdisk/gnomefsedit.c:2021 -#: ../libfdisk/gnomefsedit.c:2291 ../libfdisk/gnomefsedit.c:2344 +#: ../libfdisk/gnomefsedit.c:600 ../libfdisk/gnomefsedit.c:986 +#: ../libfdisk/gnomefsedit.c:1110 ../libfdisk/gnomefsedit.c:2056 +#: ../libfdisk/gnomefsedit.c:2326 ../libfdisk/gnomefsedit.c:2379 #: ../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:145 +#: ../libfdisk/newtfsedit.c:1586 ../loader/loader.c:579 ../loader/net.c:701 +#: ../text.py:263 ../text.py:450 ../text.py:453 ../textw/partitioning.py:162 msgid "Yes" msgstr "" -#: ../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/gnomefsedit.c:600 ../libfdisk/gnomefsedit.c:986 +#: ../libfdisk/gnomefsedit.c:1110 ../libfdisk/gnomefsedit.c:2056 +#: ../libfdisk/gnomefsedit.c:2326 ../libfdisk/gnomefsedit.c:2379 #: ../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:145 +#: ../libfdisk/newtfsedit.c:1586 ../loader/net.c:701 ../text.py:263 +#: ../text.py:268 ../text.py:450 ../text.py:456 ../textw/partitioning.py:162 msgid "No" msgstr "" -#: ../text.py:254 +#: ../text.py:278 msgid "Red Hat Linux" msgstr "" -#: ../text.py:255 +#: ../text.py:279 msgid "" "Welcome to Red Hat Linux!\n" "\n" @@ -228,107 +232,107 @@ msgid "" "purchase through our web site, http://www.redhat.com/." msgstr "" -#: ../text.py:325 +#: ../text.py:350 msgid "Use bootp/dhcp" msgstr "" -#: ../loader/net.c:234 ../text.py:330 +#: ../loader/net.c:234 ../text.py:355 msgid "IP address:" msgstr "" -#: ../loader/net.c:237 ../text.py:331 +#: ../loader/net.c:237 ../text.py:356 msgid "Netmask:" msgstr "" -#: ../loader/net.c:240 ../text.py:332 +#: ../loader/net.c:240 ../text.py:357 msgid "Default gateway (IP):" msgstr "" -#: ../loader/net.c:243 ../text.py:333 +#: ../loader/net.c:243 ../text.py:358 msgid "Primary nameserver:" msgstr "" -#: ../iw/network.py:11 ../text.py:355 +#: ../iw/network.py:11 ../text.py:380 msgid "Network Configuration" msgstr "" -#: ../text.py:371 +#: ../text.py:396 msgid "Invalid information" msgstr "" -#: ../text.py:372 +#: ../text.py:397 msgid "You must enter valid IP information to continue" msgstr "" -#: ../text.py:400 +#: ../text.py:425 msgid "Hostname Configuration" msgstr "" -#: ../text.py:401 +#: ../text.py:426 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:183 ../loader/net.c:460 ../loader/net.c:617 ../text.py:404 +#: ../iw/network.py:200 ../loader/net.c:458 ../loader/net.c:620 ../text.py:429 msgid "Hostname" msgstr "" -#: ../text.py:415 ../text.py:569 ../text.py:923 +#: ../text.py:440 ../text.py:594 msgid "Bootdisk" msgstr "" -#: ../text.py:416 +#: ../text.py:441 msgid "" -"A custom bootdisk provides a way of booting into your Linux system without " +"A custom boot disk provides a way of booting into your Linux system without " "depending on the normal bootloader. This is useful if you don't want to " "install lilo on your system, another operating system removes lilo, or lilo " -"doesn't work with your hardware configuration. A custom bootdisk can also be " -"used with the Red Hat rescue image, making it much easier to recover from " +"doesn't work with your hardware configuration. A custom boot disk can also " +"be used with the Red Hat rescue image, making it much easier to recover from " "severe system failures.\n" "\n" -"Would you like to create a bootdisk for your system?" +"Would you like to create a boot disk for your system?" msgstr "" -#: ../text.py:451 +#: ../text.py:476 msgid "X probe results" msgstr "" -#: ../text.py:464 ../text.py:483 +#: ../text.py:489 ../text.py:508 msgid "Unlisted Card" msgstr "" -#: ../text.py:472 +#: ../text.py:497 msgid "Video Card Selection" msgstr "" -#: ../text.py:473 +#: ../text.py:498 msgid "Which video card do you have?" msgstr "" -#: ../text.py:485 +#: ../text.py:510 msgid "X Server Selection" msgstr "" -#: ../text.py:485 +#: ../text.py:510 msgid "Choose a server" msgstr "" -#: ../text.py:536 +#: ../text.py:561 msgid "Installation to begin" msgstr "" -#: ../iw/confirm.py:19 ../text.py:537 +#: ../iw/confirm.py:19 ../text.py:562 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:578 msgid "Complete" msgstr "" -#: ../iw/congrats.py:17 ../text.py:554 +#: ../iw/congrats.py:17 ../text.py:579 msgid "" "Congratulations, installation is complete.\n" "\n" @@ -340,215 +344,221 @@ msgid "" "chapter of the Official Red Hat Linux User's Guide." msgstr "" -#: ../iw/bootdisk.py:41 ../text.py:570 +#: ../iw/bootdisk.py:50 ../text.py:595 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:21 +#: ../text.py:598 ../text.py:599 ../text.py:610 ../text.py:611 +#: ../textw/lilo.py:21 ../textw/silo.py:21 msgid "Skip" msgstr "" -#: ../iw/bootdisk.py:45 ../text.py:582 +#: ../iw/bootdisk.py:54 ../text.py:607 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:669 msgid "Package Installation" msgstr "" -#: ../text.py:646 +#: ../text.py:671 msgid "Name : " msgstr "" -#: ../text.py:647 +#: ../text.py:672 msgid "Size : " msgstr "" -#: ../text.py:648 +#: ../text.py:673 msgid "Summary: " msgstr "" -#: ../text.py:674 +#: ../text.py:699 msgid " Packages" msgstr "" -#: ../text.py:675 +#: ../text.py:700 msgid " Bytes" msgstr "" -#: ../text.py:676 +#: ../text.py:701 msgid " Time" msgstr "" -#: ../text.py:678 +#: ../text.py:703 msgid "Total :" msgstr "" -#: ../text.py:685 +#: ../text.py:710 msgid "Completed: " msgstr "" -#: ../text.py:695 +#: ../text.py:720 msgid "Remaining: " msgstr "" -#: ../text.py:765 +#: ../text.py:790 msgid "What time zone are you located in?" msgstr "" -#: ../text.py:773 +#: ../text.py:798 msgid "Hardware clock set to GMT?" msgstr "" -#: ../iw/timezone.py:29 ../text.py:775 +#: ../iw/timezone.py:29 ../text.py:800 msgid "Time Zone Selection" msgstr "" -#: ../text.py:839 ../text.py:840 +#: ../text.py:864 ../text.py:865 msgid "Debug" msgstr "" -#: ../text.py:852 +#: ../text.py:877 msgid "Red Hat Linux (C) 1999 Red Hat, Inc." msgstr "" -#: ../text.py:854 +#: ../text.py:879 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "" -#: ../iw/welcome.py:10 ../text.py:870 +#: ../iw/welcome.py:11 ../text.py:895 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 ../iw/silo.py:92 ../iw/silo.py:191 +#: ../text.py:901 ../text.py:907 msgid "Partition" msgstr "" -#: ../text.py:878 +#: ../text.py:903 msgid "Manually Partition" msgstr "" -#: ../text.py:880 +#: ../text.py:905 msgid "Automatic Partition" msgstr "" -#: ../text.py:884 +#: ../text.py:909 msgid "Swap" msgstr "" -#: ../text.py:886 +#: ../text.py:911 msgid "Filesystem Formatting" msgstr "" -#: ../text.py:888 ../text.py:890 ../text.py:892 ../textw/lilo.py:24 +#: ../text.py:913 ../text.py:915 ../text.py:917 ../textw/lilo.py:24 #: ../textw/lilo.py:63 ../textw/lilo.py:155 msgid "LILO Configuration" msgstr "" -#: ../text.py:894 +#: ../text.py:919 msgid "Hostname Setup" msgstr "" -#: ../text.py:896 +#: ../text.py:921 msgid "Network Setup" msgstr "" -#: ../iw/mouse.py:55 ../text.py:898 ../text.py:900 +#: ../iw/mouse.py:55 ../text.py:923 ../text.py:925 msgid "Mouse Configuration" msgstr "" -#: ../text.py:902 +#: ../text.py:927 msgid "Time Zone Setup" msgstr "" -#: ../text.py:904 ../textw/userauth.py:8 +#: ../text.py:929 ../textw/userauth.py:8 msgid "Root Password" msgstr "" -#: ../text.py:906 ../textw/userauth.py:148 +#: ../text.py:931 ../textw/userauth.py:148 msgid "User Account Setup" msgstr "" -#: ../text.py:908 +#: ../text.py:933 msgid "Authentication" msgstr "" -#: ../text.py:910 +#: ../text.py:935 msgid "Package Groups" msgstr "" -#: ../text.py:912 ../text.py:933 +#: ../text.py:937 ../text.py:973 msgid "Individual Packages" msgstr "" -#: ../text.py:914 ../textw/packages.py:114 +#: ../text.py:939 ../textw/packages.py:114 msgid "Package Dependencies" msgstr "" -#: ../iw/xconfig.py:89 ../text.py:916 ../text.py:924 +#: ../iw/xconfig.py:107 ../text.py:941 ../text.py:949 msgid "X Configuration" msgstr "" -#: ../text.py:918 +#: ../text.py:943 ../text.py:948 msgid "Boot Disk" msgstr "" -#: ../text.py:920 +#: ../text.py:945 msgid "Installation Begins" msgstr "" -#: ../text.py:922 +#: ../text.py:947 msgid "Install System" msgstr "" -#: ../text.py:926 +#: ../text.py:951 msgid "Installation Complete" msgstr "" -#: ../text.py:931 +#: ../text.py:960 ../text.py:963 ../text.py:966 ../textw/silo.py:24 +#: ../textw/silo.py:62 ../textw/silo.py:153 +msgid "SILO Configuration" +msgstr "" + +#: ../text.py:971 msgid "Examine System" msgstr "" -#: ../text.py:932 +#: ../text.py:972 msgid "Customize Upgrade" msgstr "" -#: ../text.py:934 +#: ../text.py:974 msgid "Upgrade System" msgstr "" -#: ../text.py:935 +#: ../text.py:975 msgid "Upgrade Complete" msgstr "" -#: ../gui.py:417 -msgid "Red Hat Linux Installer" +#: ../gui.py:258 ../gui.py:466 +msgid "Next" msgstr "" -#: ../gui.py:424 -msgid "Next" +#: ../gui.py:459 +msgid "Red Hat Linux Installer" msgstr "" -#: ../gui.py:426 +#: ../gui.py:468 msgid "Finish" msgstr "" -#: ../gui.py:427 +#: ../gui.py:469 msgid "Hide Help" msgstr "" -#: ../gui.py:428 +#: ../gui.py:470 msgid "Show Help" msgstr "" -#: ../gui.py:450 +#: ../gui.py:492 msgid "Online Help" msgstr "" @@ -587,7 +597,8 @@ msgstr "" #: ../iw/account.py:206 ../libfdisk/newtfsedit.c:1296 #: ../libfdisk/newtfsedit.c:1304 ../textw/lilo.py:147 ../textw/lilo.py:168 -#: ../textw/partitioning.py:61 ../textw/userauth.py:172 +#: ../textw/partitioning.py:63 ../textw/silo.py:145 ../textw/silo.py:167 +#: ../textw/userauth.py:172 msgid "Edit" msgstr "" @@ -632,7 +643,7 @@ msgstr "" msgid "Bootdisk Creation" msgstr "" -#: ../iw/bootdisk.py:52 +#: ../iw/bootdisk.py:61 msgid "Skip boot disk creation" msgstr "" @@ -656,7 +667,7 @@ msgstr "" msgid "Unresolved Dependencies" msgstr "" -#: ../iw/dependencies.py:30 ../iw/progress.py:117 ../textw/packages.py:121 +#: ../iw/dependencies.py:30 ../iw/progress.py:121 ../textw/packages.py:121 msgid "Package" msgstr "" @@ -678,7 +689,7 @@ msgid "" " You can't upgrade this sytem!" msgstr "" -#: ../iw/examine.py:52 +#: ../iw/examine.py:59 msgid "Customize packages to be upgraded" msgstr "" @@ -686,7 +697,7 @@ msgstr "" msgid "fdisk" msgstr "" -#: ../iw/fdisk.py:63 +#: ../iw/fdisk.py:88 msgid "Select drive to run fdisk on" msgstr "" @@ -698,36 +709,36 @@ msgstr "" msgid "Check for bad blocks while formatting" msgstr "" -#: ../iw/installpath.py:36 +#: ../iw/installpath.py:38 msgid "GNOME Workstation" msgstr "" -#: ../iw/installpath.py:38 +#: ../iw/installpath.py:40 msgid "KDE Workstation" msgstr "" -#: ../iw/installpath.py:40 ../libfdisk/gnomefsedit.c:2197 -#: ../libfdisk/gnomefsedit.c:2217 +#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2232 +#: ../libfdisk/gnomefsedit.c:2252 msgid "Server" msgstr "" -#: ../iw/installpath.py:41 +#: ../iw/installpath.py:43 msgid "Custom" msgstr "" -#: ../iw/installpath.py:79 +#: ../iw/installpath.py:89 msgid "Install Type" msgstr "" -#: ../iw/installpath.py:147 +#: ../iw/installpath.py:158 msgid "Install" msgstr "" -#: ../iw/installpath.py:149 +#: ../iw/installpath.py:160 msgid "Upgrade" msgstr "" -#: ../iw/installpath.py:189 +#: ../iw/installpath.py:213 msgid "Use fdisk" msgstr "" @@ -751,7 +762,7 @@ msgstr "" msgid "Test your selection here:" msgstr "" -#: ../iw/language.py:14 ../loader/lang.c:245 +#: ../iw/language.py:15 ../loader/lang.c:245 msgid "What language should be used during the installation process?" msgstr "" @@ -759,7 +770,7 @@ msgstr "" msgid "Lilo Configuration" msgstr "" -#: ../iw/lilo.py:99 ../iw/lilo.py:198 +#: ../iw/lilo.py:99 ../iw/lilo.py:198 ../iw/silo.py:97 ../iw/silo.py:192 msgid "Type" msgstr "" @@ -767,7 +778,7 @@ msgstr "" msgid "Install LILO boot record on:" msgstr "" -#: ../iw/lilo.py:133 +#: ../iw/lilo.py:133 ../iw/silo.py:134 msgid "Master Boot Record (MBR)" msgstr "" @@ -779,11 +790,11 @@ msgstr "" msgid "Use linear mode (needed for some SCSI drives)" msgstr "" -#: ../iw/lilo.py:144 +#: ../iw/lilo.py:144 ../iw/silo.py:138 msgid "Kernel parameters" msgstr "" -#: ../iw/lilo.py:159 +#: ../iw/lilo.py:159 ../iw/silo.py:153 msgid "Create boot disk" msgstr "" @@ -791,16 +802,19 @@ msgstr "" msgid "Do not install LILO" msgstr "" -#: ../iw/lilo.py:174 ../textw/lilo.py:138 +#: ../iw/lilo.py:174 ../iw/silo.py:168 ../textw/lilo.py:138 +#: ../textw/silo.py:136 msgid "Default" msgstr "" -#: ../iw/lilo.py:174 ../textw/lilo.py:138 +#: ../iw/lilo.py:174 ../iw/silo.py:168 ../textw/lilo.py:138 +#: ../textw/silo.py:136 msgid "Partition type" msgstr "" -#: ../iw/lilo.py:174 ../iw/lilo.py:209 ../textw/lilo.py:80 -#: ../textw/lilo.py:138 +#: ../iw/lilo.py:174 ../iw/lilo.py:209 ../iw/silo.py:168 ../iw/silo.py:203 +#: ../textw/lilo.py:80 ../textw/lilo.py:138 ../textw/silo.py:80 +#: ../textw/silo.py:136 msgid "Boot label" msgstr "" @@ -808,43 +822,43 @@ msgstr "" msgid "Emulate 3 Buttons" msgstr "" -#: ../iw/network.py:132 +#: ../iw/network.py:141 msgid "Configure using DHCP" msgstr "" -#: ../iw/network.py:138 +#: ../iw/network.py:148 msgid "Activate on boot" msgstr "" -#: ../iw/network.py:147 +#: ../iw/network.py:156 msgid "IP Address" msgstr "" -#: ../iw/network.py:147 ../loader/net.c:615 +#: ../iw/network.py:157 ../loader/net.c:618 msgid "Netmask" msgstr "" -#: ../iw/network.py:147 ../loader/loader.c:227 +#: ../iw/network.py:158 ../loader/loader.c:227 msgid "Network" msgstr "" -#: ../iw/network.py:147 +#: ../iw/network.py:159 msgid "Broadcast" msgstr "" -#: ../iw/network.py:184 +#: ../iw/network.py:201 msgid "Gateway" msgstr "" -#: ../iw/network.py:184 +#: ../iw/network.py:201 msgid "Primary DNS" msgstr "" -#: ../iw/network.py:184 +#: ../iw/network.py:201 msgid "Secondary DNS" msgstr "" -#: ../iw/network.py:184 +#: ../iw/network.py:201 msgid "Ternary DNS" msgstr "" @@ -852,31 +866,31 @@ msgstr "" msgid "Individual Package Selection" msgstr "" -#: ../iw/package.py:178 +#: ../iw/package.py:176 msgid "Up" msgstr "" -#: ../iw/package.py:324 +#: ../iw/package.py:322 msgid "Name: " msgstr "" -#: ../iw/package.py:329 +#: ../iw/package.py:327 msgid "Package Details" msgstr "" -#: ../iw/package.py:335 +#: ../iw/package.py:333 msgid "Size: " msgstr "" -#: ../iw/package.py:341 +#: ../iw/package.py:339 msgid "Select Package For Installation" msgstr "" -#: ../iw/package.py:377 ../textw/packages.py:22 ../textw/packages.py:87 +#: ../iw/package.py:374 ../textw/packages.py:22 ../textw/packages.py:87 msgid "Package Group Selection" msgstr "" -#: ../iw/package.py:444 ../textw/packages.py:18 +#: ../iw/package.py:452 ../textw/packages.py:18 msgid "Select individual packages" msgstr "" @@ -884,51 +898,62 @@ msgstr "" msgid "Installing Packages" msgstr "" -#: ../iw/progress.py:118 ../iw/progress.py:153 +#: ../iw/progress.py:122 ../iw/progress.py:157 msgid "Size" msgstr "" -#: ../iw/progress.py:119 +#: ../iw/progress.py:123 msgid "Summary" msgstr "" -#: ../iw/progress.py:153 +#: ../iw/progress.py:157 msgid "Status" msgstr "" -#: ../iw/progress.py:153 +#: ../iw/progress.py:157 msgid "Packages" msgstr "" -#: ../iw/progress.py:153 +#: ../iw/progress.py:157 msgid "Time" msgstr "" -#: ../iw/progress.py:158 +#: ../iw/progress.py:162 msgid "Total" msgstr "" -#: ../iw/progress.py:159 +#: ../iw/progress.py:163 msgid "Completed" msgstr "" -#: ../iw/progress.py:160 +#: ../iw/progress.py:164 msgid "Remaining" msgstr "" -#: ../iw/rootpartition.py:14 +#: ../iw/rootpartition.py:16 msgid "Confirm Partitioning Selection" msgstr "" -#: ../iw/rootpartition.py:29 ../textw/partitioning.py:24 +#: ../iw/rootpartition.py:32 ../textw/partitioning.py:24 msgid "Disk Druid" msgstr "" -#: ../iw/rootpartition.py:82 ../textw/partitioning.py:107 +#: ../iw/rootpartition.py:43 ../textw/partitioning.py:157 +msgid "Low Memory" +msgstr "" + +#: ../iw/rootpartition.py:44 ../textw/partitioning.py:158 +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 "" + +#: ../iw/rootpartition.py:136 ../textw/partitioning.py:123 msgid "Automatic Partitioning" msgstr "" -#: ../iw/rootpartition.py:121 ../textw/partitioning.py:108 +#: ../iw/rootpartition.py:184 ../textw/partitioning.py:124 #, c-format msgid "" "%s\n" @@ -938,34 +963,50 @@ msgid "" "installation." msgstr "" -#: ../iw/rootpartition.py:133 +#: ../iw/rootpartition.py:196 msgid "Remove data" msgstr "" -#: ../iw/rootpartition.py:136 ../textw/partitioning.py:112 +#: ../iw/rootpartition.py:199 ../textw/partitioning.py:128 msgid "Manually partition" msgstr "" -#: ../iw/timezone.py:114 +#: ../iw/silo.py:18 +msgid "Silo Configuration" +msgstr "" + +#: ../iw/silo.py:126 +msgid "Install SILO boot record on:" +msgstr "" + +#: ../iw/silo.py:132 +msgid "First sector of boot partition (recommended)" +msgstr "" + +#: ../iw/silo.py:157 +msgid "Do not install SILO" +msgstr "" + +#: ../iw/timezone.py:130 msgid "View:" msgstr "" -#: ../iw/timezone.py:152 +#: ../iw/timezone.py:138 ../iw/timezone.py:141 +msgid "System clock uses UTC" +msgstr "" + +#: ../iw/timezone.py:188 msgid "Use Daylight Saving Time" msgstr "" -#: ../iw/timezone.py:159 +#: ../iw/timezone.py:201 msgid "Location" msgstr "" -#: ../iw/timezone.py:160 +#: ../iw/timezone.py:202 msgid "UTC Offset" msgstr "" -#: ../iw/timezone.py:164 -msgid "System clock uses UTC" -msgstr "" - #: ../iw/xconfig.py:9 msgid "Video Card" msgstr "" @@ -990,42 +1031,42 @@ msgstr "" msgid "Test failed" msgstr "" -#: ../iw/xconfig.py:22 ../iw/xconfig.py:191 +#: ../iw/xconfig.py:22 ../iw/xconfig.py:209 msgid "Customize X Configuration" msgstr "" -#: ../iw/xconfig.py:61 +#: ../iw/xconfig.py:79 msgid "Bits per Pixel" msgstr "" -#: ../iw/xconfig.py:71 ../iw/xconfig.py:187 +#: ../iw/xconfig.py:89 ../iw/xconfig.py:205 msgid "Test this configuration" msgstr "" -#: ../iw/xconfig.py:142 +#: ../iw/xconfig.py:160 msgid "" "In most cases your video hardware can be probed to automatically determine " "the best settings for your display." msgstr "" -#: ../iw/xconfig.py:150 +#: ../iw/xconfig.py:168 msgid "Autoprobe results:" msgstr "" -#: ../iw/xconfig.py:164 +#: ../iw/xconfig.py:182 msgid "" "Your monitor could not be autodetected. Please choose it from the list below:" msgstr "" -#: ../iw/xconfig.py:194 +#: ../iw/xconfig.py:212 msgid "Use Graphical Login" msgstr "" -#: ../iw/xconfig.py:196 +#: ../iw/xconfig.py:214 msgid "Skip X Configuration" msgstr "" -#: ../textw/lilo.py:13 +#: ../textw/lilo.py:13 ../textw/silo.py:14 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 " @@ -1033,26 +1074,28 @@ msgid "" "blank." msgstr "" -#: ../textw/lilo.py:64 +#: ../textw/lilo.py:64 ../textw/silo.py:64 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../textw/lilo.py:84 ../textw/lilo.py:105 +#: ../textw/lilo.py:84 ../textw/lilo.py:105 ../textw/silo.py:84 +#: ../textw/silo.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:84 -#: ../textw/lilo.py:102 ../textw/userauth.py:62 +#: ../libfdisk/gnomefsedit.c:676 ../libfdisk/gnomefsedit.c:1647 +#: ../libfdisk/gnomefsedit.c:2164 ../libfdisk/newtfsedit.c:450 +#: ../libfdisk/newtfsedit.c:1501 ../loader/devices.c:168 ../textw/lilo.py:84 +#: ../textw/lilo.py:102 ../textw/silo.py:84 ../textw/silo.py:102 +#: ../textw/userauth.py:62 msgid "Cancel" msgstr "" -#: ../textw/lilo.py:92 +#: ../textw/lilo.py:92 ../textw/silo.py:92 msgid "Edit Boot Label" msgstr "" -#: ../textw/lilo.py:150 +#: ../textw/lilo.py:150 ../textw/silo.py:148 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 " @@ -1066,7 +1109,7 @@ msgid "" "installed." msgstr "" -#: ../textw/partitioning.py:16 ../textw/partitioning.py:55 +#: ../textw/partitioning.py:16 ../textw/partitioning.py:57 msgid "Disk Setup" msgstr "" @@ -1080,33 +1123,22 @@ msgid "" "Which tool would you like to use?" msgstr "" -#: ../textw/partitioning.py:56 +#: ../textw/partitioning.py:58 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:61 +#: ../loader/loader.c:290 ../loader/loader.c:315 ../textw/partitioning.py:63 msgid "Done" msgstr "" -#: ../textw/partitioning.py:112 ../textw/partitioning.py:113 +#: ../textw/partitioning.py:128 ../textw/partitioning.py:129 msgid "Continue" msgstr "" -#: ../textw/partitioning.py:140 -msgid "Low Memory" -msgstr "" - -#: ../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:160 +#: ../textw/partitioning.py:177 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 " @@ -1114,11 +1146,11 @@ msgid "" "previous install." msgstr "" -#: ../textw/partitioning.py:180 +#: ../textw/partitioning.py:197 msgid "Check for bad blocks during format" msgstr "" -#: ../textw/partitioning.py:184 +#: ../textw/partitioning.py:201 msgid "Choose Partitions to Format" msgstr "" @@ -1227,17 +1259,17 @@ msgstr "" msgid "Request server via broadcast" 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:609 ../libfdisk/fsedit.c:616 ../libfdisk/fsedit.c:623 +#: ../libfdisk/fsedit.c:632 ../libfdisk/fsedit.c:644 ../libfdisk/fsedit.c:654 msgid "Bad Mount Point" msgstr "" -#: ../libfdisk/fsedit.c:606 +#: ../libfdisk/fsedit.c:610 #, c-format msgid "The %s directory must be on the root filesystem." msgstr "" -#: ../libfdisk/fsedit.c:613 +#: ../libfdisk/fsedit.c:617 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1245,7 +1277,7 @@ msgid "" "Mount points must begin with a leading /." msgstr "" -#: ../libfdisk/fsedit.c:620 +#: ../libfdisk/fsedit.c:624 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1253,7 +1285,7 @@ msgid "" "Mount points may not end with a /." msgstr "" -#: ../libfdisk/fsedit.c:629 +#: ../libfdisk/fsedit.c:633 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1261,7 +1293,7 @@ msgid "" "Mount points may only printable characters." msgstr "" -#: ../libfdisk/fsedit.c:641 +#: ../libfdisk/fsedit.c:645 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1269,7 +1301,7 @@ msgid "" "System partitions must be on Linux Native partitions." msgstr "" -#: ../libfdisk/fsedit.c:651 +#: ../libfdisk/fsedit.c:655 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1277,28 +1309,28 @@ msgid "" "/usr must be on a Linux Native partition or an NFS volume." msgstr "" -#: ../libfdisk/fsedit.c:679 +#: ../libfdisk/fsedit.c:683 msgid "Too Many Drives" msgstr "" -#: ../libfdisk/fsedit.c:680 +#: ../libfdisk/fsedit.c:684 msgid "" "You have more drives than this program supports. Please use the standard " "fdisk program to setup your drives and please notify Red Hat Software that " "you saw this message." msgstr "" -#: ../libfdisk/fsedit.c:695 +#: ../libfdisk/fsedit.c:699 msgid "No Drives Found" msgstr "" -#: ../libfdisk/fsedit.c:696 +#: ../libfdisk/fsedit.c:700 msgid "" "An error has occurred - no valid devices were found on which to create new " "filesystems. Please check your hardware for the cause of this problem." msgstr "" -#: ../libfdisk/fsedit.c:950 +#: ../libfdisk/fsedit.c:955 #, c-format msgid "" "A disk with a corrupt Sun disklabel has been found while reading block " @@ -1306,158 +1338,158 @@ msgid "" "device." msgstr "" -#: ../libfdisk/fsedit.c:954 +#: ../libfdisk/fsedit.c:959 msgid "Corrupt Sun disklabel" msgstr "" -#: ../libfdisk/fsedit.c:955 ../libfdisk/fsedit.c:1011 -#: ../libfdisk/fsedit.c:1036 +#: ../libfdisk/fsedit.c:960 ../libfdisk/fsedit.c:1016 +#: ../libfdisk/fsedit.c:1041 msgid "Skip Drive" msgstr "" -#: ../libfdisk/fsedit.c:964 ../libfdisk/fsedit.c:1032 +#: ../libfdisk/fsedit.c:969 ../libfdisk/fsedit.c:1037 #, c-format msgid "" "An error occurred reading the partition table for the block device %s. The " "error was" msgstr "" -#: ../libfdisk/fsedit.c:1005 +#: ../libfdisk/fsedit.c:1010 #, c-format msgid "" "The partition table on device %s is corrupted. To create new partitions it " "must be initialized, causing the loss of ALL DATA on this drive." msgstr "" -#: ../libfdisk/fsedit.c:1010 +#: ../libfdisk/fsedit.c:1015 msgid "Bad Partition Table" msgstr "" -#: ../libfdisk/fsedit.c:1011 +#: ../libfdisk/fsedit.c:1016 msgid "Initialize" msgstr "" -#: ../libfdisk/fsedit.c:1036 ../loader/net.c:329 +#: ../libfdisk/fsedit.c:1041 ../loader/net.c:329 msgid "Retry" msgstr "" -#: ../libfdisk/fsedit.c:1048 +#: ../libfdisk/fsedit.c:1053 msgid "BSD Disklabel" msgstr "" -#: ../libfdisk/fsedit.c:1048 +#: ../libfdisk/fsedit.c:1053 msgid "" "A disk with a BSD disklabel has been found. The Red Hat installation only " "supports BSD Disklabels in read-only mode, so you must use a custom install " "and fdisk (instead of Disk Druid) for machines with BSD Disklabels." msgstr "" -#: ../libfdisk/fsedit.c:1078 +#: ../libfdisk/fsedit.c:1083 #, c-format msgid "System error %d" msgstr "" -#: ../libfdisk/fsedit.c:1087 ../libfdisk/fsedit.c:1089 +#: ../libfdisk/fsedit.c:1092 ../libfdisk/fsedit.c:1094 msgid "Fdisk Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:517 ../libfdisk/gnomefsedit.c:686 +#: ../libfdisk/gnomefsedit.c:518 ../libfdisk/gnomefsedit.c:715 msgid "<Swap Partition>" msgstr "" -#: ../libfdisk/gnomefsedit.c:525 ../libfdisk/gnomefsedit.c:688 +#: ../libfdisk/gnomefsedit.c:526 ../libfdisk/gnomefsedit.c:717 msgid "<RAID Partition>" msgstr "" -#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/newtfsedit.c:697 +#: ../libfdisk/gnomefsedit.c:600 ../libfdisk/newtfsedit.c:697 msgid "Delete Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:581 ../libfdisk/newtfsedit.c:698 +#: ../libfdisk/gnomefsedit.c:601 ../libfdisk/newtfsedit.c:698 msgid "Are you sure you want to delete this partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:639 ../libfdisk/gnomefsedit.c:645 -#: ../libfdisk/gnomefsedit.c:649 ../libfdisk/gnomefsedit.c:651 +#: ../libfdisk/gnomefsedit.c:660 ../libfdisk/gnomefsedit.c:666 +#: ../libfdisk/gnomefsedit.c:670 ../libfdisk/gnomefsedit.c:672 #: ../libfdisk/newtfsedit.c:263 ../libfdisk/newtfsedit.c:269 #: ../libfdisk/newtfsedit.c:273 ../libfdisk/newtfsedit.c:275 msgid "Edit Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:666 ../libfdisk/gnomefsedit.c:1629 +#: ../libfdisk/gnomefsedit.c:687 ../libfdisk/gnomefsedit.c:1656 msgid "Mount Point:" msgstr "" -#: ../libfdisk/gnomefsedit.c:701 +#: ../libfdisk/gnomefsedit.c:730 msgid "Size (Megs):" msgstr "" -#: ../libfdisk/gnomefsedit.c:732 +#: ../libfdisk/gnomefsedit.c:761 msgid "Grow to fill disk?" msgstr "" -#: ../libfdisk/gnomefsedit.c:751 ../libfdisk/newtfsedit.c:335 +#: ../libfdisk/gnomefsedit.c:780 ../libfdisk/newtfsedit.c:335 msgid "Allocation Status:" msgstr "" -#: ../libfdisk/gnomefsedit.c:755 ../libfdisk/newtfsedit.c:337 +#: ../libfdisk/gnomefsedit.c:784 ../libfdisk/newtfsedit.c:337 msgid "Successful" msgstr "" -#: ../libfdisk/gnomefsedit.c:758 ../libfdisk/newtfsedit.c:339 +#: ../libfdisk/gnomefsedit.c:787 ../libfdisk/newtfsedit.c:339 msgid "Failed" msgstr "" -#: ../libfdisk/gnomefsedit.c:770 ../libfdisk/newtfsedit.c:344 +#: ../libfdisk/gnomefsedit.c:799 ../libfdisk/newtfsedit.c:344 msgid "Failure Reason:" msgstr "" -#: ../libfdisk/gnomefsedit.c:784 ../libfdisk/gnomefsedit.c:1655 +#: ../libfdisk/gnomefsedit.c:813 ../libfdisk/gnomefsedit.c:1690 msgid "Partition Type:" msgstr "" -#: ../libfdisk/gnomefsedit.c:851 +#: ../libfdisk/gnomefsedit.c:880 msgid "Allowable Drives:" msgstr "" -#: ../libfdisk/gnomefsedit.c:957 ../libfdisk/gnomefsedit.c:1847 +#: ../libfdisk/gnomefsedit.c:986 ../libfdisk/gnomefsedit.c:1882 #: ../libfdisk/newtfsedit.c:486 msgid "No Mount Point" msgstr "" -#: ../libfdisk/gnomefsedit.c:958 ../libfdisk/newtfsedit.c:487 +#: ../libfdisk/gnomefsedit.c:987 ../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:1001 ../libfdisk/gnomefsedit.c:1855 +#: ../libfdisk/gnomefsedit.c:1030 ../libfdisk/gnomefsedit.c:1890 #: ../libfdisk/newtfsedit.c:527 msgid "Mount Point Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1002 ../libfdisk/newtfsedit.c:528 +#: ../libfdisk/gnomefsedit.c:1031 ../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:1027 ../libfdisk/newtfsedit.c:545 +#: ../libfdisk/gnomefsedit.c:1056 ../libfdisk/newtfsedit.c:545 msgid "Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1028 ../libfdisk/newtfsedit.c:546 +#: ../libfdisk/gnomefsedit.c:1057 ../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:1063 ../libfdisk/gnomefsedit.c:1968 +#: ../libfdisk/gnomefsedit.c:1092 ../libfdisk/gnomefsedit.c:2003 #: ../libfdisk/newtfsedit.c:581 msgid "Swap Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1064 ../libfdisk/gnomefsedit.c:1969 +#: ../libfdisk/gnomefsedit.c:1093 ../libfdisk/gnomefsedit.c:2004 #: ../libfdisk/newtfsedit.c:582 #, c-format msgid "" @@ -1465,22 +1497,22 @@ msgid "" "swap partition is %ld Megabytes." msgstr "" -#: ../libfdisk/gnomefsedit.c:1080 ../libfdisk/gnomefsedit.c:1087 +#: ../libfdisk/gnomefsedit.c:1109 ../libfdisk/gnomefsedit.c:1116 msgid "No RAID Drive Constraint" msgstr "" -#: ../libfdisk/gnomefsedit.c:1082 +#: ../libfdisk/gnomefsedit.c:1111 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:1088 +#: ../libfdisk/gnomefsedit.c:1117 msgid "Close" msgstr "" -#: ../libfdisk/gnomefsedit.c:1089 +#: ../libfdisk/gnomefsedit.c:1118 msgid "" "You have configured a RAID partition without constraining the partition to a " "single drive. Please select one drive to constrain this partition to." @@ -1488,11 +1520,11 @@ msgstr "" #. XXXXX - for now destroy the raid entry since it #. now contains unallocated partitions! -#: ../libfdisk/gnomefsedit.c:1268 +#: ../libfdisk/gnomefsedit.c:1297 msgid "RAID Entry Incomplete" msgstr "" -#: ../libfdisk/gnomefsedit.c:1269 +#: ../libfdisk/gnomefsedit.c:1298 #, c-format msgid "" "The raid device /dev/%s now contains partitions which are unallocated. The " @@ -1501,12 +1533,12 @@ msgid "" msgstr "" #. build list of why they all failed -#: ../libfdisk/gnomefsedit.c:1362 ../libfdisk/gnomefsedit.c:1381 +#: ../libfdisk/gnomefsedit.c:1391 ../libfdisk/gnomefsedit.c:1410 #: ../libfdisk/newtfsedit.c:84 ../libfdisk/newtfsedit.c:1482 msgid "Unallocated Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1366 ../libfdisk/gnomefsedit.c:1376 +#: ../libfdisk/gnomefsedit.c:1395 ../libfdisk/gnomefsedit.c:1405 #: ../libfdisk/newtfsedit.c:88 msgid "" "There are currently unallocated partition(s) present in the list of " @@ -1514,80 +1546,80 @@ msgid "" "with the reason they were not allocated." msgstr "" -#: ../libfdisk/gnomefsedit.c:1641 +#: ../libfdisk/gnomefsedit.c:1676 msgid "<Swap Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:1699 +#: ../libfdisk/gnomefsedit.c:1734 msgid "RAID Device: /dev/" msgstr "" -#: ../libfdisk/gnomefsedit.c:1722 +#: ../libfdisk/gnomefsedit.c:1757 msgid "RAID Type:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1759 +#: ../libfdisk/gnomefsedit.c:1794 msgid "Partitions For RAID Array:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1848 +#: ../libfdisk/gnomefsedit.c:1883 msgid "You have not selected a mount point. A mount point is required." msgstr "" -#: ../libfdisk/gnomefsedit.c:1856 +#: ../libfdisk/gnomefsedit.c:1891 msgid "" "The mount point requested is already in use. Please select a valid mount " "point." msgstr "" -#: ../libfdisk/gnomefsedit.c:1869 +#: ../libfdisk/gnomefsedit.c:1904 msgid "Booting From RAID Warning" msgstr "" -#: ../libfdisk/gnomefsedit.c:1870 +#: ../libfdisk/gnomefsedit.c:1905 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:1880 +#: ../libfdisk/gnomefsedit.c:1915 msgid "No RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:1881 +#: ../libfdisk/gnomefsedit.c:1916 msgid "You need to selected a RAID device." msgstr "" -#: ../libfdisk/gnomefsedit.c:1887 +#: ../libfdisk/gnomefsedit.c:1922 msgid "Used Raid Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:1888 +#: ../libfdisk/gnomefsedit.c:1923 #, c-format msgid "" "The raid device \"/dev/%s\" is already configured as a raid device. Please " "select another." msgstr "" -#: ../libfdisk/gnomefsedit.c:1901 +#: ../libfdisk/gnomefsedit.c:1936 msgid "Not Enough Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1903 +#: ../libfdisk/gnomefsedit.c:1938 msgid "" "You have not configured enough partitions for the RAID type you have " "selected." msgstr "" -#: ../libfdisk/gnomefsedit.c:1910 +#: ../libfdisk/gnomefsedit.c:1945 msgid "Illegal /boot RAID Type" msgstr "" -#: ../libfdisk/gnomefsedit.c:1912 +#: ../libfdisk/gnomefsedit.c:1947 msgid "Boot partitions (/boot) are only allowed on RAID-1." msgstr "" -#: ../libfdisk/gnomefsedit.c:2013 +#: ../libfdisk/gnomefsedit.c:2048 #, c-format msgid "" "The partition %s is a pre-existing partition in the set of partitions for " @@ -1595,115 +1627,102 @@ msgid "" "possible to boot from this partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2020 +#: ../libfdisk/gnomefsedit.c:2055 msgid "Use Pre-existing Partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2129 +#: ../libfdisk/gnomefsedit.c:2164 msgid "Auto-Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:2136 +#: ../libfdisk/gnomefsedit.c:2171 msgid "Using Existing Disk Space" msgstr "" -#: ../libfdisk/gnomefsedit.c:2155 +#: ../libfdisk/gnomefsedit.c:2190 msgid "Remove Linux partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:2166 +#: ../libfdisk/gnomefsedit.c:2201 msgid "Use existing free space" msgstr "" #. workstation or server? -#: ../libfdisk/gnomefsedit.c:2178 +#: ../libfdisk/gnomefsedit.c:2213 msgid "Intended Use" msgstr "" -#: ../libfdisk/gnomefsedit.c:2217 +#: ../libfdisk/gnomefsedit.c:2252 msgid "Workstation" msgstr "" -#: ../libfdisk/gnomefsedit.c:2291 +#: ../libfdisk/gnomefsedit.c:2326 msgid "Delete RAID Device?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2292 +#: ../libfdisk/gnomefsedit.c:2327 msgid "Are you sure you want to remove this RAID device?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2343 ../libfdisk/newtfsedit.c:1585 +#: ../libfdisk/gnomefsedit.c:2378 ../libfdisk/newtfsedit.c:1585 msgid "Reset Partition Table" msgstr "" -#: ../libfdisk/gnomefsedit.c:2345 ../libfdisk/newtfsedit.c:1587 +#: ../libfdisk/gnomefsedit.c:2380 ../libfdisk/newtfsedit.c:1587 msgid "Reset partition table to original contents? " msgstr "" -#: ../libfdisk/gnomefsedit.c:2381 ../libfdisk/gnomefsedit.c:2432 +#: ../libfdisk/gnomefsedit.c:2416 ../libfdisk/gnomefsedit.c:2467 msgid "<Swap>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2383 +#: ../libfdisk/gnomefsedit.c:2418 msgid "<RAID>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2385 +#: ../libfdisk/gnomefsedit.c:2420 msgid "<not set>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2942 +#: ../libfdisk/gnomefsedit.c:3084 msgid "Unallocated Partitions Exist..." msgstr "" -#: ../libfdisk/gnomefsedit.c:2953 +#: ../libfdisk/gnomefsedit.c:3090 ../libfdisk/gnomefsedit.c:3104 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: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: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:3068 +#: ../libfdisk/gnomefsedit.c:3178 msgid "Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:3112 +#: ../libfdisk/gnomefsedit.c:3222 msgid "_Add..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3124 +#: ../libfdisk/gnomefsedit.c:3234 msgid "_Edit..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3125 +#: ../libfdisk/gnomefsedit.c:3235 msgid "_Delete" msgstr "" -#: ../libfdisk/gnomefsedit.c:3126 +#: ../libfdisk/gnomefsedit.c:3236 msgid "_Reset" msgstr "" -#: ../libfdisk/gnomefsedit.c:3155 +#: ../libfdisk/gnomefsedit.c:3265 msgid "_Make RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:3164 +#: ../libfdisk/gnomefsedit.c:3274 msgid "Auto Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:3177 +#: ../libfdisk/gnomefsedit.c:3287 msgid "Drive Summary" msgstr "" @@ -1773,51 +1792,51 @@ msgstr "" msgid "Initializing CDROM..." msgstr "" -#: ../loader/devices.c:50 +#: ../loader/devices.c:51 msgid "Miscellaneous" msgstr "" -#: ../loader/devices.c:59 +#: ../loader/devices.c:60 msgid "" "This module can take parameters which affects its operation. If you don't " "know what parameters to supply, just skip this screen by pressing the \"OK\" " "button now." msgstr "" -#: ../loader/devices.c:64 +#: ../loader/devices.c:65 msgid "Module Parameters" msgstr "" -#: ../loader/devices.c:164 ../loader/devices.c:234 ../loader/loader.c:240 +#: ../loader/devices.c:167 ../loader/devices.c:242 ../loader/loader.c:240 #: ../loader/loader.c:299 ../loader/loader.c:315 msgid "Devices" msgstr "" -#: ../loader/devices.c:166 +#: ../loader/devices.c:169 msgid "Insert your driver disk and press \"OK\" to continue." msgstr "" -#: ../loader/devices.c:175 +#: ../loader/devices.c:179 msgid "Failed to mount floppy disk." msgstr "" -#: ../loader/devices.c:179 +#: ../loader/devices.c:184 msgid "" "The floppy disk you inserted is not a valid driver disk for this release of " "Red Hat Linux." msgstr "" -#: ../loader/devices.c:198 +#: ../loader/devices.c:206 msgid "" "Which driver should I try?. If the driver you need does not appear in this " "list, and you have a separate driver disk, please press F2." msgstr "" -#: ../loader/devices.c:203 +#: ../loader/devices.c:211 msgid "Which driver should I try?" msgstr "" -#: ../loader/devices.c:211 +#: ../loader/devices.c:219 msgid "Specify module parameters" msgstr "" @@ -1975,15 +1994,15 @@ msgstr "" msgid "What type of media contains the packages to be installed?" msgstr "" -#: ../loader/loader.c:1491 +#: ../loader/loader.c:1556 msgid "Cannot find ks.cfg on boot floppy." msgstr "" -#: ../loader/loader.c:1619 +#: ../loader/loader.c:1681 msgid "PC Card" msgstr "" -#: ../loader/loader.c:1619 +#: ../loader/loader.c:1681 msgid "Initializing PC Card Devices..." msgstr "" @@ -2030,67 +2049,67 @@ msgstr "" msgid "You must enter both a valid IP address and a netmask." msgstr "" -#: ../loader/net.c:338 ../loader/net.c:569 +#: ../loader/net.c:338 ../loader/net.c:571 msgid "Dynamic IP" msgstr "" -#: ../loader/net.c:339 ../loader/net.c:570 +#: ../loader/net.c:339 ../loader/net.c:572 msgid "Sending request for IP information..." msgstr "" -#: ../loader/net.c:461 +#: ../loader/net.c:459 msgid "Determining host name and domain..." msgstr "" -#: ../loader/net.c:559 +#: ../loader/net.c:560 msgid "kickstart" msgstr "" -#: ../loader/net.c:560 +#: ../loader/net.c:561 #, c-format msgid "bad argument to kickstart network command %s: %s" msgstr "" -#: ../loader/net.c:607 +#: ../loader/net.c:610 msgid "Boot protocol to use" msgstr "" -#: ../loader/net.c:609 +#: ../loader/net.c:612 msgid "Network gateway" msgstr "" -#: ../loader/net.c:611 +#: ../loader/net.c:614 msgid "IP address" msgstr "" -#: ../loader/net.c:613 +#: ../loader/net.c:616 msgid "Nameserver" msgstr "" -#: ../loader/net.c:620 +#: ../loader/net.c:623 msgid "Domain name" msgstr "" -#: ../loader/net.c:623 +#: ../loader/net.c:626 msgid "Network device" msgstr "" -#: ../loader/net.c:695 +#: ../loader/net.c:698 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "" -#: ../loader/net.c:696 +#: ../loader/net.c:699 #, c-format msgid "netconfig %s (C) 1999 Red Hat, Inc." msgstr "" -#: ../loader/net.c:698 +#: ../loader/net.c:701 msgid "Network configuration" msgstr "" -#: ../loader/net.c:699 +#: ../loader/net.c:702 msgid "Would you like to set up networking?" msgstr "" @@ -567,7 +567,7 @@ msgstr "Инсталляторr Red Hat Linux" #: ../gui.py:424 msgid "Next" -msgstr "" +msgstr "Следующий" #: ../gui.py:426 msgid "Finish" @@ -173,7 +173,8 @@ class Language (SimpleConfigFile): "Romanian" : "ro_RO" , "Slovak" : "sk_SK" , "Spanish" : "es_MX" , - "Russian" : "ru_SU" , +# "Russian" : "ru_SU" , + "Russian" : "ru_RU.KOI8-R" , "Ukrainian" : "uk_UA" , } @@ -193,8 +194,11 @@ class Language (SimpleConfigFile): def set (self, lang): self.lang = self.langs[lang] self.info["LANG"] = self.langs[lang] + os.environ["LANG"] = self.langs[lang] self.info["LINGUAS"] = self.langs[lang] + os.environ["LINGUAS"] = self.langs[lang] self.info["LC_ALL"] = self.langs[lang] + os.environ["LC_ALL"] = self.langs[lang] def get (self): return self.lang diff --git a/upd-instroot b/upd-instroot index b40bf44c2..a8e627ab3 100755 --- a/upd-instroot +++ b/upd-instroot @@ -39,9 +39,10 @@ echo "DESTGR is $DESTGR" PACKAGES="glibc-2 ldconfig setup e2fsprogs-1 XFree86-libs XFree86-SVGA XFree86-S3 XFree86-S3V XFree86-Mach32 XFree86-Mach64 - XFree86-FBDev XFree86-75dpi-fonts XFree86-100dpi-fonts XFree86-I128 - XFree86-3DLabs XFree86-VGA16 XFree86-Sun - XFree86-3. xpm-3 glib- gtk+- + XFree86-FBDev XFree86-I128 XFree86-3DLabs XFree86-VGA16 + XFree86-Sun XFree86-75dpi-fonts XFree86-100dpi-fonts + XFree86-100dpi-fonts XFree86-ISO8859-2-75dpi-fonts + XFree86-cyrillic-fonts XFree86-3. xpm-3 glib- gtk+- gnome-libs python-1 newt imlib-1 libpng libtiff libjpeg- libtermcap-2 zlib rpm rpm-devel ash- bash- pygtk- pygnome- util-linux procps esound-0 audiofile-0 kernel-pcmcia-cs @@ -144,6 +145,12 @@ usr/X11R6/lib/X11/fonts/misc/9x* usr/X11R6/lib/X11/fonts/misc/fonts* usr/X11R6/lib/X11/fonts/misc/cursor* usr/X11R6/lib/X11/fonts/misc/olcursor* +usr/X11R6/lib/X11/fonts/cyrillic/koi* +usr/X11R6/lib/X11/fonts/cyrillic/fonts* +usr/X11R6/lib/X11/fonts/ISO8859-2/75dpi/cour* +usr/X11R6/lib/X11/fonts/ISO8859-2/75dpi/helv* +usr/X11R6/lib/X11/fonts/ISO8859-2/75dpi/tim* +usr/X11R6/lib/X11/fonts/ISO8859-2/75dpi/fonts* usr/X11R6/lib/X11/locale/* usr/X11R6/lib/X11/xkb/* usr/X11R6/lib/X11/rgb* @@ -151,7 +158,7 @@ usr/X11R6/lib/X11/XKeysymDB usr/X11R6/lib/libXpm* usr/lib/libglib* usr/lib/libthread* -etc/gtk/gtkrc +etc/gtk/gtkrc* usr/lib/libgtk* usr/lib/libgdk* usr/lib/libart* |