summaryrefslogtreecommitdiffstats
path: root/textw/complete_text.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-04-24 15:46:31 +0000
committerJeremy Katz <katzj@redhat.com>2003-04-24 15:46:31 +0000
commit0a562126d84c59a113231ae7ab38984f92d62153 (patch)
tree5e87b9094f4ebdc328979e3a0640dee5f1fc40cb /textw/complete_text.py
parentdd200d781bd9012f562399c2ee69c23fe60d86b9 (diff)
downloadanaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.gz
anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.xz
anaconda-0a562126d84c59a113231ae7ab38984f92d62153.zip
another taroon merge. tagged before as before-taroon-merge, after as
after-taroon-merge this one adds s390 fixes, basic i/p series platform support, support for multiple kernels and one second stage, cmdline kickstart mode (nice for s390), some warning cleanups.
Diffstat (limited to 'textw/complete_text.py')
-rw-r--r--textw/complete_text.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/textw/complete_text.py b/textw/complete_text.py
index c30441efc..f0ac5dc19 100644
--- a/textw/complete_text.py
+++ b/textw/complete_text.py
@@ -24,19 +24,20 @@ class FinishedWindow:
screen.pushHelpLine (string.center(_("<Enter> to reboot"),
screen.width))
- if iutil.getArch() != "ia64":
- bootstr = _("If you created a boot disk to use to boot your "
- "%s system, insert it before you "
- "press <Enter> to reboot.\n\n") % (productName,)
+ if iutil.getArch() == "i386":
+ bootstr = _("If you created a boot diskette during this "
+ "installation as your primary means of "
+ "booting %s, insert it before "
+ "rebooting your newly installed system.\n\n") % (productName,)
else:
bootstr = ""
if iutil.getArch() == "s390":
- floppystr = ""
+ floppystr = _("Press <Enter> to reboot your system.\n\n")
else:
- floppystr = _("Remove any floppy diskettes you used during the "
- "installation process and press <Enter> to reboot "
- "your system."
+ floppystr = _("Remove any installation media (diskettes or "
+ "CD-ROMs) used during the installation process "
+ "and press <Enter> to reboot your system."
"\n\n")