summaryrefslogtreecommitdiffstats
path: root/installclasses
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-08-14 02:00:12 +0000
committerJeremy Katz <katzj@redhat.com>2003-08-14 02:00:12 +0000
commitc540e134193f9759873ced09b0156c6219983101 (patch)
treeb36013fe219e6c3d8762bf2a0a32b538ac5c0373 /installclasses
parent3f01dfc8e9d6b8bf25b79b1cbda94ca0ff4ada09 (diff)
downloadanaconda-c540e134193f9759873ced09b0156c6219983101.tar.gz
anaconda-c540e134193f9759873ced09b0156c6219983101.tar.xz
anaconda-c540e134193f9759873ced09b0156c6219983101.zip
merge from taroon-branch. all kinds of miscellaneous bugfixes, including
* firewall update * iSeries PReP size * ppc mediacheck * tzdata stuff * cmdline mode * pkg defaults screen
Diffstat (limited to 'installclasses')
-rw-r--r--installclasses/personal_desktop.py11
-rw-r--r--installclasses/workstation.py13
2 files changed, 22 insertions, 2 deletions
diff --git a/installclasses/personal_desktop.py b/installclasses/personal_desktop.py
index caba6b4d8..8ea525c0d 100644
--- a/installclasses/personal_desktop.py
+++ b/installclasses/personal_desktop.py
@@ -1,5 +1,5 @@
from installclass import BaseInstallClass
-from rhpl.translate import N_
+from rhpl.translate import N_, _
from constants import *
import os
import iutil
@@ -14,6 +14,15 @@ class InstallClass(BaseInstallClass):
"installation type to install a graphical desktop "
"environment and create a system ideal for home "
"or desktop use.")
+
+ pkgstext = _("\tDesktop shell (GNOME)\n"
+ "\tOffice suite (OpenOffice)\n"
+ "\tWeb browser (Mozilla) \n"
+ "\tEmail (Evolution)\n"
+ "\tInstant messaging\n"
+ "\tSound and video applications\n"
+ "\tGames\n")
+
showLoginChoice = 0
sortPriority = 1
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index 89560e751..1724ef0de 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -1,5 +1,5 @@
import personal_desktop
-from rhpl.translate import N_
+from rhpl.translate import N_, _
import os
class InstallClass(personal_desktop.InstallClass):
@@ -11,6 +11,17 @@ class InstallClass(personal_desktop.InstallClass):
"environment with tools for software "
"development and system administration. ")
+ pkgstext = _("\tDesktop shell (GNOME)\n"
+ "\tOffice suite (OpenOffice)\n"
+ "\tWeb browser (Mozilla) \n"
+ "\tEmail (Evolution)\n"
+ "\tInstant messaging\n"
+ "\tSound and video applications\n"
+ "\tGames\n"
+ "\tSoftware Development Tools\n"
+ "\tAdministration Tools\n")
+
+
sortPriority = 2
showLoginChoice = 0