diff options
author | Matt Wilson <msw@redhat.com> | 1999-11-08 17:06:46 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 1999-11-08 17:06:46 +0000 |
commit | 968d11fb9a72363cc31c4574258e92044828a910 (patch) | |
tree | 6d009f92df2eda75b9df14929bcc7ae09574a91f | |
parent | bf929e8312526dcaf1942e5f3e3e4a69d53f98e3 (diff) | |
download | anaconda-968d11fb9a72363cc31c4574258e92044828a910.tar.gz anaconda-968d11fb9a72363cc31c4574258e92044828a910.tar.xz anaconda-968d11fb9a72363cc31c4574258e92044828a910.zip |
changes for sparc
-rw-r--r-- | iw/installpath.py | 4 | ||||
-rw-r--r-- | po/anaconda.pot | 395 | ||||
-rw-r--r-- | text.py | 8 |
3 files changed, 204 insertions, 203 deletions
diff --git a/iw/installpath.py b/iw/installpath.py index 0109c900a..2f2caed67 100644 --- a/iw/installpath.py +++ b/iw/installpath.py @@ -45,15 +45,17 @@ class InstallPathWindow (InstallWindow): def __init__ (self, ics): if iutil.getArch() == 'sparc': BootloaderWindow = SiloWindow + BootloaderSkipname = "silo" else: BootloaderWindow = LiloWindow + BootloaderSkipname = "lilo" self.installSteps = [ ( AutoPartitionWindow, "partition" ), FDiskWindow, ( PartitionWindow, "partition" ), ( FormatWindow, "format" ), - ( BootloaderWindow, "lilo" ), + ( BootloaderWindow, BootloaderSkipname ), ( NetworkWindow, "network" ), ( TimezoneWindow, "timezone" ), ( AccountWindow, "accounts" ), diff --git a/po/anaconda.pot b/po/anaconda.pot index e98daa327..0a45314c4 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-10-22 15:21-0400\n" +"POT-Creation-Date: 1999-11-08 11:03-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,8 +28,8 @@ msgstr "" #: ../text.py:205 ../text.py:234 ../text.py:248 ../text.py:250 ../text.py:269 #: ../text.py:271 ../text.py:293 ../text.py:295 ../text.py:384 ../text.py:435 #: ../text.py:437 ../text.py:446 ../text.py:464 ../text.py:477 ../text.py:496 -#: ../text.py:498 ../text.py:523 ../text.py:526 ../text.py:535 ../text.py:593 -#: ../text.py:594 ../text.py:816 ../text.py:838 ../textw/constants.py:10 +#: ../text.py:498 ../text.py:528 ../text.py:531 ../text.py:540 ../text.py:598 +#: ../text.py:599 ../text.py:821 ../text.py:843 ../textw/constants.py:10 #: ../textw/lilo.py:27 ../textw/lilo.py:77 ../textw/lilo.py:84 #: ../textw/lilo.py:159 ../textw/packages.py:20 ../textw/packages.py:85 #: ../textw/packages.py:136 ../textw/packages.py:145 @@ -56,7 +56,7 @@ msgstr "" msgid "Online Help" msgstr "" -#: ../gui.py:271 ../iw/language.py:10 ../text.py:49 ../text.py:925 +#: ../gui.py:271 ../iw/language.py:10 ../text.py:49 ../text.py:930 msgid "Language Selection" msgstr "" @@ -78,12 +78,12 @@ msgstr "" msgid "Red Hat Linux Install Shell on %s" msgstr "" -#: ../installclass.py:248 +#: ../installclass.py:247 msgid "" "You are about to erase any preexisting Linux installations on your system." msgstr "" -#: ../installclass.py:288 +#: ../installclass.py:286 msgid "" "You are about to erase ALL DATA on your hard drive to make room for your " "Linux installation." @@ -105,9 +105,9 @@ msgstr "" #: ../loader/net.c:557 ../loader/urls.c:124 ../loader/urls.c:201 #: ../loader/urls.c:206 ../loader/urls.c:323 ../text.py:52 ../text.py:107 #: ../text.py:160 ../text.py:205 ../text.py:248 ../text.py:293 ../text.py:384 -#: ../text.py:404 ../text.py:435 ../text.py:496 ../text.py:523 ../text.py:593 -#: ../text.py:614 ../text.py:626 ../text.py:638 ../text.py:816 ../text.py:888 -#: ../text.py:892 ../text.py:1051 ../textw/lilo.py:26 ../textw/lilo.py:77 +#: ../text.py:404 ../text.py:435 ../text.py:496 ../text.py:528 ../text.py:598 +#: ../text.py:619 ../text.py:631 ../text.py:643 ../text.py:821 ../text.py:893 +#: ../text.py:897 ../text.py:1052 ../textw/lilo.py:26 ../textw/lilo.py:77 #: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 #: ../textw/partitioning.py:202 ../textw/silo.py:21 ../textw/silo.py:77 #: ../textw/userauth.py:29 ../textw/userauth.py:43 ../textw/userauth.py:48 @@ -146,20 +146,20 @@ msgstr "" #: ../libfdisk/fsedit.c:615 ../libfdisk/fsedit.c:622 ../libfdisk/fsedit.c:629 #: ../libfdisk/fsedit.c:638 ../libfdisk/fsedit.c:650 ../libfdisk/fsedit.c:660 #: ../libfdisk/fsedit.c:689 ../libfdisk/fsedit.c:705 ../libfdisk/fsedit.c:1063 -#: ../libfdisk/gnomefsedit.c:676 ../libfdisk/gnomefsedit.c:1045 -#: ../libfdisk/gnomefsedit.c:1071 ../libfdisk/gnomefsedit.c:1089 -#: ../libfdisk/gnomefsedit.c:1294 ../libfdisk/gnomefsedit.c:1388 -#: ../libfdisk/gnomefsedit.c:1406 ../libfdisk/gnomefsedit.c:1644 -#: ../libfdisk/gnomefsedit.c:1879 ../libfdisk/gnomefsedit.c:1887 -#: ../libfdisk/gnomefsedit.c:1901 ../libfdisk/gnomefsedit.c:1912 -#: ../libfdisk/gnomefsedit.c:1919 ../libfdisk/gnomefsedit.c:1934 -#: ../libfdisk/gnomefsedit.c:1943 ../libfdisk/gnomefsedit.c:1982 -#: ../libfdisk/gnomefsedit.c:2143 ../libfdisk/newtfsedit.c:113 +#: ../libfdisk/gnomefsedit.c:679 ../libfdisk/gnomefsedit.c:1049 +#: ../libfdisk/gnomefsedit.c:1075 ../libfdisk/gnomefsedit.c:1093 +#: ../libfdisk/gnomefsedit.c:1298 ../libfdisk/gnomefsedit.c:1392 +#: ../libfdisk/gnomefsedit.c:1410 ../libfdisk/gnomefsedit.c:1648 +#: ../libfdisk/gnomefsedit.c:1883 ../libfdisk/gnomefsedit.c:1891 +#: ../libfdisk/gnomefsedit.c:1905 ../libfdisk/gnomefsedit.c:1916 +#: ../libfdisk/gnomefsedit.c:1923 ../libfdisk/gnomefsedit.c:1938 +#: ../libfdisk/gnomefsedit.c:1947 ../libfdisk/gnomefsedit.c:1986 +#: ../libfdisk/gnomefsedit.c:2147 ../libfdisk/newtfsedit.c:113 #: ../libfdisk/newtfsedit.c:461 ../libfdisk/newtfsedit.c:539 #: ../libfdisk/newtfsedit.c:557 ../libfdisk/newtfsedit.c:575 #: ../libfdisk/newtfsedit.c:1291 ../libfdisk/newtfsedit.c:1299 #: ../libfdisk/newtfsedit.c:1424 ../libfdisk/newtfsedit.c:1445 -#: ../libfdisk/newtfsedit.c:1539 ../text.py:87 ../text.py:535 +#: ../libfdisk/newtfsedit.c:1539 ../text.py:87 ../text.py:540 #: ../textw/constants.py:10 ../textw/lilo.py:95 ../textw/lilo.py:108 #: ../textw/lilo.py:158 ../textw/silo.py:114 ../textw/silo.py:127 #: ../textw/silo.py:175 @@ -178,7 +178,7 @@ msgstr "" msgid "Mouse Selection" msgstr "" -#: ../text.py:158 ../text.py:927 +#: ../text.py:158 ../text.py:932 msgid "Keyboard Selection" msgstr "" @@ -206,7 +206,7 @@ msgstr "" msgid "Upgrade Existing Installation" msgstr "" -#: ../text.py:203 ../text.py:930 +#: ../text.py:203 ../text.py:935 msgid "Installation Type" msgstr "" @@ -219,7 +219,7 @@ msgstr "" #: ../loader/loader.c:693 ../loader/loader.c:738 ../loader/loader.c:876 #: ../loader/loader.c:881 ../loader/loader.c:1614 ../loader/loader.c:1660 #: ../loader/loader.c:1729 ../loader/urls.c:201 ../loader/urls.c:206 -#: ../text.py:231 ../text.py:634 ../todo.py:364 ../todo.py:504 ../todo.py:1073 +#: ../text.py:231 ../text.py:639 ../todo.py:364 ../todo.py:504 ../todo.py:1074 #: ../todo.py:1394 msgid "Error" msgstr "" @@ -247,9 +247,9 @@ msgid "" "like to customize the set of packages that will be upgraded?" msgstr "" -#: ../libfdisk/gnomefsedit.c:601 ../libfdisk/gnomefsedit.c:1001 -#: ../libfdisk/gnomefsedit.c:1107 ../libfdisk/gnomefsedit.c:2035 -#: ../libfdisk/gnomefsedit.c:2305 ../libfdisk/gnomefsedit.c:2358 +#: ../libfdisk/gnomefsedit.c:604 ../libfdisk/gnomefsedit.c:1005 +#: ../libfdisk/gnomefsedit.c:1111 ../libfdisk/gnomefsedit.c:2039 +#: ../libfdisk/gnomefsedit.c:2309 ../libfdisk/gnomefsedit.c:2362 #: ../libfdisk/newtfsedit.c:498 ../libfdisk/newtfsedit.c:691 #: ../libfdisk/newtfsedit.c:1477 ../libfdisk/newtfsedit.c:1495 #: ../libfdisk/newtfsedit.c:1580 ../loader/loader.c:599 ../loader/net.c:703 @@ -258,9 +258,9 @@ msgstr "" msgid "Yes" msgstr "" -#: ../libfdisk/gnomefsedit.c:601 ../libfdisk/gnomefsedit.c:1001 -#: ../libfdisk/gnomefsedit.c:1107 ../libfdisk/gnomefsedit.c:2035 -#: ../libfdisk/gnomefsedit.c:2305 ../libfdisk/gnomefsedit.c:2358 +#: ../libfdisk/gnomefsedit.c:604 ../libfdisk/gnomefsedit.c:1005 +#: ../libfdisk/gnomefsedit.c:1111 ../libfdisk/gnomefsedit.c:2039 +#: ../libfdisk/gnomefsedit.c:2309 ../libfdisk/gnomefsedit.c:2362 #: ../libfdisk/newtfsedit.c:498 ../libfdisk/newtfsedit.c:691 #: ../libfdisk/newtfsedit.c:1477 ../libfdisk/newtfsedit.c:1495 #: ../libfdisk/newtfsedit.c:1580 ../loader/net.c:703 ../text.py:269 @@ -350,7 +350,7 @@ msgid "" "\n" msgstr "" -#: ../text.py:469 ../text.py:622 +#: ../text.py:469 ../text.py:627 msgid "Bootdisk" msgstr "" @@ -358,41 +358,41 @@ msgstr "" msgid "X probe results" msgstr "" -#: ../text.py:512 ../text.py:531 +#: ../text.py:517 ../text.py:536 msgid "Unlisted Card" msgstr "" -#: ../text.py:520 +#: ../text.py:525 msgid "Video Card Selection" msgstr "" -#: ../text.py:521 +#: ../text.py:526 msgid "Which video card do you have?" msgstr "" -#: ../text.py:533 +#: ../text.py:538 msgid "X Server Selection" msgstr "" -#: ../text.py:533 +#: ../text.py:538 msgid "Choose a server" msgstr "" -#: ../text.py:589 +#: ../text.py:594 msgid "Installation to begin" msgstr "" -#: ../iw/confirm.py:30 ../text.py:590 +#: ../iw/confirm.py:30 ../text.py:595 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:606 +#: ../text.py:611 msgid "Complete" msgstr "" -#: ../iw/congrats.py:31 ../text.py:607 +#: ../iw/congrats.py:31 ../text.py:612 msgid "" "Congratulations, installation is complete.\n" "\n" @@ -404,206 +404,203 @@ msgid "" "chapter of the Official Red Hat Linux User's Guide." msgstr "" -#: ../iw/bootdisk.py:50 ../text.py:623 +#: ../iw/bootdisk.py:50 ../text.py:628 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:626 ../text.py:627 ../text.py:638 ../text.py:639 +#: ../text.py:631 ../text.py:632 ../text.py:643 ../text.py:644 #: ../textw/lilo.py:26 ../textw/silo.py:21 msgid "Skip" msgstr "" -#: ../iw/bootdisk.py:54 ../text.py:635 +#: ../iw/bootdisk.py:54 ../text.py:640 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:697 +#: ../text.py:702 msgid "Package Installation" msgstr "" -#: ../text.py:699 +#: ../text.py:704 msgid "Name : " msgstr "" -#: ../text.py:700 +#: ../text.py:705 msgid "Size : " msgstr "" -#: ../text.py:701 +#: ../text.py:706 msgid "Summary: " msgstr "" -#: ../text.py:727 +#: ../text.py:732 msgid " Packages" msgstr "" -#: ../text.py:728 +#: ../text.py:733 msgid " Bytes" msgstr "" -#: ../text.py:729 +#: ../text.py:734 msgid " Time" msgstr "" -#: ../text.py:731 +#: ../text.py:736 msgid "Total :" msgstr "" -#: ../text.py:738 +#: ../text.py:743 msgid "Completed: " msgstr "" -#: ../text.py:748 +#: ../text.py:753 msgid "Remaining: " msgstr "" -#: ../text.py:818 +#: ../text.py:823 msgid "What time zone are you located in?" msgstr "" -#: ../text.py:826 +#: ../text.py:831 msgid "Hardware clock set to GMT?" msgstr "" -#: ../iw/timezone.py:30 ../text.py:828 +#: ../iw/timezone.py:30 ../text.py:833 msgid "Time Zone Selection" msgstr "" -#: ../text.py:892 ../text.py:893 +#: ../text.py:897 ../text.py:898 msgid "Debug" msgstr "" -#: ../text.py:905 +#: ../text.py:910 msgid "Red Hat Linux (C) 1999 Red Hat, Inc." msgstr "" -#: ../text.py:907 +#: ../text.py:912 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "" -#: ../iw/welcome.py:10 ../text.py:929 +#: ../iw/welcome.py:10 ../text.py:934 msgid "Welcome" msgstr "" +#: ../text.py:943 ../textw/silo.py:24 ../textw/silo.py:79 ../textw/silo.py:183 +msgid "SILO Configuration" +msgstr "" + +#: ../text.py:948 ../textw/lilo.py:29 ../textw/lilo.py:74 ../textw/lilo.py:167 +msgid "LILO Configuration" +msgstr "" + #: ../iw/lilo.py:97 ../iw/lilo.py:202 ../iw/silo.py:124 ../iw/silo.py:265 -#: ../text.py:935 ../text.py:941 +#: ../text.py:951 ../text.py:957 msgid "Partition" msgstr "" -#: ../text.py:937 +#: ../text.py:953 msgid "Manually Partition" msgstr "" -#: ../text.py:939 +#: ../text.py:955 msgid "Automatic Partition" msgstr "" -#: ../text.py:943 +#: ../text.py:959 msgid "Swap" msgstr "" -#: ../text.py:945 +#: ../text.py:961 msgid "Filesystem Formatting" msgstr "" -#: ../text.py:947 ../text.py:949 ../text.py:951 ../text.py:1006 -#: ../text.py:1008 ../text.py:1010 ../textw/lilo.py:29 ../textw/lilo.py:74 -#: ../textw/lilo.py:167 -msgid "LILO Configuration" -msgstr "" - -#: ../text.py:953 +#: ../text.py:969 msgid "Hostname Setup" msgstr "" -#: ../text.py:955 +#: ../text.py:971 msgid "Network Setup" msgstr "" -#: ../iw/mouse.py:55 ../text.py:957 ../text.py:959 +#: ../iw/mouse.py:55 ../text.py:973 ../text.py:975 msgid "Mouse Configuration" msgstr "" -#: ../text.py:961 +#: ../text.py:977 msgid "Time Zone Setup" msgstr "" -#: ../text.py:963 ../textw/userauth.py:8 +#: ../text.py:979 ../textw/userauth.py:8 msgid "Root Password" msgstr "" -#: ../text.py:965 ../textw/userauth.py:148 +#: ../text.py:981 ../textw/userauth.py:148 msgid "User Account Setup" msgstr "" -#: ../text.py:967 +#: ../text.py:983 msgid "Authentication" msgstr "" -#: ../text.py:969 +#: ../text.py:985 msgid "Package Groups" msgstr "" -#: ../text.py:971 ../text.py:1013 +#: ../text.py:987 ../text.py:1014 msgid "Individual Packages" msgstr "" -#: ../text.py:973 ../textw/packages.py:114 +#: ../text.py:989 ../textw/packages.py:114 msgid "Package Dependencies" msgstr "" -#: ../iw/xconfig.py:113 ../text.py:975 ../text.py:983 +#: ../iw/xconfig.py:120 ../text.py:991 ../text.py:999 msgid "X Configuration" msgstr "" -#: ../text.py:977 ../text.py:982 ../text.py:1014 ../text.py:1017 +#: ../text.py:993 ../text.py:998 ../text.py:1015 ../text.py:1018 msgid "Boot Disk" msgstr "" -#: ../text.py:979 +#: ../text.py:995 msgid "Installation Begins" msgstr "" -#: ../text.py:981 +#: ../text.py:997 msgid "Install System" msgstr "" -#: ../text.py:985 +#: ../text.py:1001 msgid "Installation Complete" msgstr "" -#: ../text.py:994 ../text.py:997 ../text.py:1000 ../textw/silo.py:24 -#: ../textw/silo.py:79 ../textw/silo.py:183 -msgid "SILO Configuration" -msgstr "" - -#: ../text.py:1005 +#: ../text.py:1006 msgid "Examine System" msgstr "" -#: ../text.py:1012 +#: ../text.py:1013 msgid "Customize Upgrade" msgstr "" -#: ../text.py:1016 +#: ../text.py:1017 msgid "Upgrade System" msgstr "" -#: ../text.py:1018 +#: ../text.py:1019 msgid "Upgrade Complete" msgstr "" -#: ../text.py:1048 +#: ../text.py:1049 msgid "Cancelled" msgstr "" -#: ../text.py:1049 +#: ../text.py:1050 msgid "I can't go to the previous step from here. You will have to try again." msgstr "" @@ -617,7 +614,7 @@ msgstr "" msgid "Error mounting %s: %s" msgstr "" -#: ../todo.py:524 ../todo.py:721 +#: ../todo.py:524 ../todo.py:722 msgid "Creating" msgstr "" @@ -634,40 +631,40 @@ msgstr "" msgid "Formatting %s filesystem..." msgstr "" -#: ../todo.py:721 +#: ../todo.py:722 msgid "Creating boot disk..." msgstr "" -#: ../todo.py:866 +#: ../todo.py:867 msgid "Reading" msgstr "" -#: ../todo.py:867 +#: ../todo.py:868 msgid "Reading package information..." msgstr "" -#: ../todo.py:1030 ../todo.py:1040 +#: ../todo.py:1031 ../todo.py:1041 msgid "no suggestion" msgstr "" -#: ../todo.py:1046 +#: ../todo.py:1047 msgid "Searching" msgstr "" -#: ../todo.py:1047 +#: ../todo.py:1048 msgid "Searching for Red Hat Linux installations..." msgstr "" -#: ../todo.py:1074 +#: ../todo.py:1075 #, c-format msgid "Error mounting ext2 filesystem on %s: %s" msgstr "" -#: ../todo.py:1093 +#: ../todo.py:1094 msgid "Finding" msgstr "" -#: ../todo.py:1094 +#: ../todo.py:1095 msgid "Finding packages to upgrade..." msgstr "" @@ -915,8 +912,8 @@ msgstr "" msgid "KDE Workstation" msgstr "" -#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2211 -#: ../libfdisk/gnomefsedit.c:2231 +#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2215 +#: ../libfdisk/gnomefsedit.c:2235 msgid "Server" msgstr "" @@ -924,19 +921,19 @@ msgstr "" msgid "Custom" msgstr "" -#: ../iw/installpath.py:91 +#: ../iw/installpath.py:90 msgid "Install Type" msgstr "" -#: ../iw/installpath.py:160 +#: ../iw/installpath.py:159 msgid "Install" msgstr "" -#: ../iw/installpath.py:162 +#: ../iw/installpath.py:161 msgid "Upgrade" msgstr "" -#: ../iw/installpath.py:216 +#: ../iw/installpath.py:215 msgid "Use fdisk" msgstr "" @@ -1068,27 +1065,27 @@ msgstr "" msgid "Up" msgstr "" -#: ../iw/package.py:322 +#: ../iw/package.py:324 msgid "Name: " msgstr "" -#: ../iw/package.py:327 +#: ../iw/package.py:329 msgid "Package Details" msgstr "" -#: ../iw/package.py:333 +#: ../iw/package.py:335 msgid "Size: " msgstr "" -#: ../iw/package.py:339 +#: ../iw/package.py:341 msgid "Select Package For Installation" msgstr "" -#: ../iw/package.py:374 ../textw/packages.py:22 ../textw/packages.py:87 +#: ../iw/package.py:376 ../textw/packages.py:22 ../textw/packages.py:87 msgid "Package Group Selection" msgstr "" -#: ../iw/package.py:452 ../textw/packages.py:18 +#: ../iw/package.py:454 ../textw/packages.py:18 msgid "Select individual packages" msgstr "" @@ -1221,38 +1218,38 @@ msgstr "" msgid "Test failed" msgstr "" -#: ../iw/xconfig.py:23 ../iw/xconfig.py:233 +#: ../iw/xconfig.py:23 ../iw/xconfig.py:241 msgid "Customize X Configuration" msgstr "" -#: ../iw/xconfig.py:80 +#: ../iw/xconfig.py:87 msgid "Bits per Pixel" msgstr "" -#: ../iw/xconfig.py:90 ../iw/xconfig.py:229 +#: ../iw/xconfig.py:97 ../iw/xconfig.py:237 msgid "Test this configuration" msgstr "" -#: ../iw/xconfig.py:177 +#: ../iw/xconfig.py:184 msgid "" "In most cases your video hardware can be probed to automatically determine " "the best settings for your display." msgstr "" -#: ../iw/xconfig.py:185 +#: ../iw/xconfig.py:192 msgid "Autoprobe results:" msgstr "" -#: ../iw/xconfig.py:199 +#: ../iw/xconfig.py:207 msgid "" "Your monitor could not be autodetected. Please choose it from the list below:" msgstr "" -#: ../iw/xconfig.py:236 +#: ../iw/xconfig.py:244 msgid "Use Graphical Login" msgstr "" -#: ../iw/xconfig.py:238 +#: ../iw/xconfig.py:246 msgid "Skip X Configuration" msgstr "" @@ -1273,8 +1270,8 @@ msgstr "" msgid "Clear" msgstr "" -#: ../libfdisk/gnomefsedit.c:676 ../libfdisk/gnomefsedit.c:1644 -#: ../libfdisk/gnomefsedit.c:2143 ../libfdisk/newtfsedit.c:462 +#: ../libfdisk/gnomefsedit.c:679 ../libfdisk/gnomefsedit.c:1648 +#: ../libfdisk/gnomefsedit.c:2147 ../libfdisk/newtfsedit.c:462 #: ../libfdisk/newtfsedit.c:1495 ../loader/devices.c:168 #: ../loader/loader.c:1721 ../textw/lilo.py:95 ../textw/lilo.py:113 #: ../textw/silo.py:114 ../textw/silo.py:132 ../textw/userauth.py:62 @@ -1578,103 +1575,103 @@ msgstr "" msgid "Fdisk Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:519 ../libfdisk/gnomefsedit.c:715 +#: ../libfdisk/gnomefsedit.c:522 ../libfdisk/gnomefsedit.c:718 msgid "<Swap Partition>" msgstr "" -#: ../libfdisk/gnomefsedit.c:527 ../libfdisk/gnomefsedit.c:717 +#: ../libfdisk/gnomefsedit.c:530 ../libfdisk/gnomefsedit.c:720 msgid "<RAID Partition>" msgstr "" -#: ../libfdisk/gnomefsedit.c:601 ../libfdisk/newtfsedit.c:691 +#: ../libfdisk/gnomefsedit.c:604 ../libfdisk/newtfsedit.c:691 msgid "Delete Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:602 ../libfdisk/newtfsedit.c:692 +#: ../libfdisk/gnomefsedit.c:605 ../libfdisk/newtfsedit.c:692 msgid "Are you sure you want to delete this partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:660 ../libfdisk/gnomefsedit.c:666 -#: ../libfdisk/gnomefsedit.c:670 ../libfdisk/gnomefsedit.c:672 +#: ../libfdisk/gnomefsedit.c:663 ../libfdisk/gnomefsedit.c:669 +#: ../libfdisk/gnomefsedit.c:673 ../libfdisk/gnomefsedit.c:675 #: ../libfdisk/newtfsedit.c:259 ../libfdisk/newtfsedit.c:265 #: ../libfdisk/newtfsedit.c:269 ../libfdisk/newtfsedit.c:271 msgid "Edit Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:687 ../libfdisk/gnomefsedit.c:1653 +#: ../libfdisk/gnomefsedit.c:690 ../libfdisk/gnomefsedit.c:1657 msgid "Mount Point:" msgstr "" -#: ../libfdisk/gnomefsedit.c:730 +#: ../libfdisk/gnomefsedit.c:733 msgid "Size (Megs):" msgstr "" -#: ../libfdisk/gnomefsedit.c:761 +#: ../libfdisk/gnomefsedit.c:764 msgid "Grow to fill disk?" msgstr "" -#: ../libfdisk/gnomefsedit.c:780 ../libfdisk/newtfsedit.c:331 +#: ../libfdisk/gnomefsedit.c:783 ../libfdisk/newtfsedit.c:331 msgid "Allocation Status:" msgstr "" -#: ../libfdisk/gnomefsedit.c:784 ../libfdisk/newtfsedit.c:333 +#: ../libfdisk/gnomefsedit.c:787 ../libfdisk/newtfsedit.c:333 msgid "Successful" msgstr "" -#: ../libfdisk/gnomefsedit.c:787 ../libfdisk/newtfsedit.c:335 +#: ../libfdisk/gnomefsedit.c:790 ../libfdisk/newtfsedit.c:335 msgid "Failed" msgstr "" -#: ../libfdisk/gnomefsedit.c:799 ../libfdisk/newtfsedit.c:340 +#: ../libfdisk/gnomefsedit.c:802 ../libfdisk/newtfsedit.c:340 msgid "Failure Reason:" msgstr "" -#: ../libfdisk/gnomefsedit.c:813 ../libfdisk/gnomefsedit.c:1687 +#: ../libfdisk/gnomefsedit.c:816 ../libfdisk/gnomefsedit.c:1691 msgid "Partition Type:" msgstr "" -#: ../libfdisk/gnomefsedit.c:895 +#: ../libfdisk/gnomefsedit.c:899 msgid "Allowable Drives:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1001 ../libfdisk/gnomefsedit.c:1879 +#: ../libfdisk/gnomefsedit.c:1005 ../libfdisk/gnomefsedit.c:1883 #: ../libfdisk/newtfsedit.c:498 msgid "No Mount Point" msgstr "" -#: ../libfdisk/gnomefsedit.c:1002 ../libfdisk/newtfsedit.c:499 +#: ../libfdisk/gnomefsedit.c:1006 ../libfdisk/newtfsedit.c:499 msgid "" "You have not selected a mount point for this partition. Are you sure you " "want to do this?" msgstr "" -#: ../libfdisk/gnomefsedit.c:1045 ../libfdisk/gnomefsedit.c:1887 +#: ../libfdisk/gnomefsedit.c:1049 ../libfdisk/gnomefsedit.c:1891 #: ../libfdisk/newtfsedit.c:539 msgid "Mount Point Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1046 ../libfdisk/newtfsedit.c:540 +#: ../libfdisk/gnomefsedit.c:1050 ../libfdisk/newtfsedit.c:540 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:1071 ../libfdisk/newtfsedit.c:557 +#: ../libfdisk/gnomefsedit.c:1075 ../libfdisk/newtfsedit.c:557 msgid "Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1072 ../libfdisk/newtfsedit.c:558 +#: ../libfdisk/gnomefsedit.c:1076 ../libfdisk/newtfsedit.c:558 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:1089 ../libfdisk/gnomefsedit.c:1982 +#: ../libfdisk/gnomefsedit.c:1093 ../libfdisk/gnomefsedit.c:1986 #: ../libfdisk/newtfsedit.c:575 msgid "Swap Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1090 ../libfdisk/gnomefsedit.c:1983 +#: ../libfdisk/gnomefsedit.c:1094 ../libfdisk/gnomefsedit.c:1987 #: ../libfdisk/newtfsedit.c:576 #, c-format msgid "" @@ -1682,22 +1679,22 @@ msgid "" "swap partition is %ld Megabytes." msgstr "" -#: ../libfdisk/gnomefsedit.c:1106 ../libfdisk/gnomefsedit.c:1113 +#: ../libfdisk/gnomefsedit.c:1110 ../libfdisk/gnomefsedit.c:1117 msgid "No RAID Drive Constraint" msgstr "" -#: ../libfdisk/gnomefsedit.c:1108 +#: ../libfdisk/gnomefsedit.c:1112 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:1114 +#: ../libfdisk/gnomefsedit.c:1118 msgid "Close" msgstr "" -#: ../libfdisk/gnomefsedit.c:1115 +#: ../libfdisk/gnomefsedit.c:1119 msgid "" "You have configured a RAID partition without constraining the partition to a " "single drive. Please select one drive to constrain this partition to." @@ -1705,11 +1702,11 @@ msgstr "" #. XXXXX - for now destroy the raid entry since it #. now contains unallocated partitions! -#: ../libfdisk/gnomefsedit.c:1294 +#: ../libfdisk/gnomefsedit.c:1298 msgid "RAID Entry Incomplete" msgstr "" -#: ../libfdisk/gnomefsedit.c:1295 +#: ../libfdisk/gnomefsedit.c:1299 #, c-format msgid "" "The raid device /dev/%s now contains partitions which are unallocated. The " @@ -1718,12 +1715,12 @@ msgid "" msgstr "" #. build list of why they all failed -#: ../libfdisk/gnomefsedit.c:1388 ../libfdisk/gnomefsedit.c:1407 +#: ../libfdisk/gnomefsedit.c:1392 ../libfdisk/gnomefsedit.c:1411 #: ../libfdisk/newtfsedit.c:81 ../libfdisk/newtfsedit.c:1476 msgid "Unallocated Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1392 ../libfdisk/gnomefsedit.c:1402 +#: ../libfdisk/gnomefsedit.c:1396 ../libfdisk/gnomefsedit.c:1406 #: ../libfdisk/newtfsedit.c:85 msgid "" "There are currently unallocated partition(s) present in the list of " @@ -1731,80 +1728,80 @@ msgid "" "with the reason they were not allocated." msgstr "" -#: ../libfdisk/gnomefsedit.c:1673 +#: ../libfdisk/gnomefsedit.c:1677 msgid "<Swap Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:1731 +#: ../libfdisk/gnomefsedit.c:1735 msgid "RAID Device: /dev/" msgstr "" -#: ../libfdisk/gnomefsedit.c:1754 +#: ../libfdisk/gnomefsedit.c:1758 msgid "RAID Type:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1791 +#: ../libfdisk/gnomefsedit.c:1795 msgid "Partitions For RAID Array:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1880 +#: ../libfdisk/gnomefsedit.c:1884 msgid "You have not selected a mount point. A mount point is required." msgstr "" -#: ../libfdisk/gnomefsedit.c:1888 +#: ../libfdisk/gnomefsedit.c:1892 msgid "" "The mount point requested is already in use. Please select a valid mount " "point." msgstr "" -#: ../libfdisk/gnomefsedit.c:1901 +#: ../libfdisk/gnomefsedit.c:1905 msgid "Booting From RAID Warning" msgstr "" -#: ../libfdisk/gnomefsedit.c:1902 +#: ../libfdisk/gnomefsedit.c:1906 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:1912 +#: ../libfdisk/gnomefsedit.c:1916 msgid "No RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:1913 +#: ../libfdisk/gnomefsedit.c:1917 msgid "You need to selected a RAID device." msgstr "" -#: ../libfdisk/gnomefsedit.c:1919 +#: ../libfdisk/gnomefsedit.c:1923 msgid "Used Raid Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:1920 +#: ../libfdisk/gnomefsedit.c:1924 #, c-format msgid "" "The raid device \"/dev/%s\" is already configured as a raid device. Please " "select another." msgstr "" -#: ../libfdisk/gnomefsedit.c:1933 +#: ../libfdisk/gnomefsedit.c:1937 msgid "Not Enough Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1935 +#: ../libfdisk/gnomefsedit.c:1939 msgid "" "You have not configured enough partitions for the RAID type you have " "selected." msgstr "" -#: ../libfdisk/gnomefsedit.c:1942 +#: ../libfdisk/gnomefsedit.c:1946 msgid "Illegal /boot RAID Type" msgstr "" -#: ../libfdisk/gnomefsedit.c:1944 +#: ../libfdisk/gnomefsedit.c:1948 msgid "Boot partitions (/boot) are only allowed on RAID-1." msgstr "" -#: ../libfdisk/gnomefsedit.c:2027 +#: ../libfdisk/gnomefsedit.c:2031 #, c-format msgid "" "The partition %s is a pre-existing partition in the set of partitions for " @@ -1812,102 +1809,102 @@ msgid "" "possible to boot from this partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2034 +#: ../libfdisk/gnomefsedit.c:2038 msgid "Use Pre-existing Partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2143 +#: ../libfdisk/gnomefsedit.c:2147 msgid "Auto-Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:2150 +#: ../libfdisk/gnomefsedit.c:2154 msgid "Using Existing Disk Space" msgstr "" -#: ../libfdisk/gnomefsedit.c:2169 +#: ../libfdisk/gnomefsedit.c:2173 msgid "Remove Linux partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:2180 +#: ../libfdisk/gnomefsedit.c:2184 msgid "Use existing free space" msgstr "" #. workstation or server? -#: ../libfdisk/gnomefsedit.c:2192 +#: ../libfdisk/gnomefsedit.c:2196 msgid "Intended Use" msgstr "" -#: ../libfdisk/gnomefsedit.c:2231 +#: ../libfdisk/gnomefsedit.c:2235 msgid "Workstation" msgstr "" -#: ../libfdisk/gnomefsedit.c:2305 +#: ../libfdisk/gnomefsedit.c:2309 msgid "Delete RAID Device?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2306 +#: ../libfdisk/gnomefsedit.c:2310 msgid "Are you sure you want to remove this RAID device?" msgstr "" -#: ../libfdisk/gnomefsedit.c:2357 ../libfdisk/newtfsedit.c:1579 +#: ../libfdisk/gnomefsedit.c:2361 ../libfdisk/newtfsedit.c:1579 msgid "Reset Partition Table" msgstr "" -#: ../libfdisk/gnomefsedit.c:2359 ../libfdisk/newtfsedit.c:1581 +#: ../libfdisk/gnomefsedit.c:2363 ../libfdisk/newtfsedit.c:1581 msgid "Reset partition table to original contents? " msgstr "" -#: ../libfdisk/gnomefsedit.c:2395 ../libfdisk/gnomefsedit.c:2446 +#: ../libfdisk/gnomefsedit.c:2399 ../libfdisk/gnomefsedit.c:2450 msgid "<Swap>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2397 +#: ../libfdisk/gnomefsedit.c:2401 msgid "<RAID>" msgstr "" -#: ../libfdisk/gnomefsedit.c:2399 +#: ../libfdisk/gnomefsedit.c:2403 msgid "<not set>" msgstr "" -#: ../libfdisk/gnomefsedit.c:3063 +#: ../libfdisk/gnomefsedit.c:3067 msgid "Unallocated Partitions Exist..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3069 ../libfdisk/gnomefsedit.c:3083 +#: ../libfdisk/gnomefsedit.c:3073 ../libfdisk/gnomefsedit.c:3087 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:3157 +#: ../libfdisk/gnomefsedit.c:3161 msgid "Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:3201 +#: ../libfdisk/gnomefsedit.c:3205 msgid "_Add..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3213 +#: ../libfdisk/gnomefsedit.c:3217 msgid "_Edit..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3214 +#: ../libfdisk/gnomefsedit.c:3218 msgid "_Delete" msgstr "" -#: ../libfdisk/gnomefsedit.c:3215 +#: ../libfdisk/gnomefsedit.c:3219 msgid "_Reset" msgstr "" -#: ../libfdisk/gnomefsedit.c:3244 +#: ../libfdisk/gnomefsedit.c:3248 msgid "_Make RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:3253 +#: ../libfdisk/gnomefsedit.c:3257 msgid "Auto Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:3266 +#: ../libfdisk/gnomefsedit.c:3270 msgid "Drive Summary" msgstr "" @@ -941,11 +941,13 @@ class InstallInterface: BootloaderWindow = SiloWindow BootloaderImagesWindow = SiloImagesWindow BootloaderConfiguration = _("SILO Configuration") + BootloaderSkipName = "silo" else: BootloaderAppendWindow = LiloAppendWindow BootloaderWindow = LiloWindow BootloaderImagesWindow = LiloImagesWindow BootloaderConfiguration = _("LILO Configuration") + BootloaderSkipName = "lilo" self.installSteps = [ [_("Partition"), PartitionMethod, @@ -961,11 +963,11 @@ class InstallInterface: [_("Filesystem Formatting"), FormatWindow, (self.screen, todo), "format" ], [BootloaderConfiguration, BootloaderAppendWindow, - (self.screen, todo), "lilo"], + (self.screen, todo), BootloaderSkipName ], [BootloaderConfiguration, BootloaderWindow, - (self.screen, todo), "lilo"], + (self.screen, todo), BootloaderSkipName ], [BootloaderConfiguration, BootloaderImagesWindow, - (self.screen, todo), "lilo"], + (self.screen, todo), BootloaderSkipName ], [_("Hostname Setup"), HostnameWindow, (self.screen, todo), "network"], [_("Network Setup"), NetworkWindow, (self.screen, todo), |