summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2008-12-01 15:21:38 -0500
committerJeremy Katz <katzj@redhat.com>2008-12-01 16:25:03 -0500
commitaadef79bf0349cebad99e6157110ab4a754a4bdf (patch)
tree832558eaa8e627a5cf4f53ff09b1ba116768ad66
parent1b16420aa7199b7848c198820beef009c0838974 (diff)
downloadanaconda-aadef79bf0349cebad99e6157110ab4a754a4bdf.tar.gz
anaconda-aadef79bf0349cebad99e6157110ab4a754a4bdf.tar.xz
anaconda-aadef79bf0349cebad99e6157110ab4a754a4bdf.zip
Make text for autopartitioning types clearer (#441350)
We used "default" a lot in the text. Change based on notting's suggestion and make the intro text a little clearer to match
-rw-r--r--iw/autopart_type.py8
-rw-r--r--textw/partition_text.py12
-rw-r--r--ui/autopart.glade2
3 files changed, 9 insertions, 13 deletions
diff --git a/iw/autopart_type.py b/iw/autopart_type.py
index 33efa5f97..f166eabe8 100644
--- a/iw/autopart_type.py
+++ b/iw/autopart_type.py
@@ -415,10 +415,10 @@ class PartitionTypeWindow(InstallWindow):
store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_INT)
self.combo.set_model(store)
- opts = ((_("Remove all partitions on selected drives and create default layout"), CLEARPART_TYPE_ALL),
- (_("Remove Linux partitions on selected drives and create default layout"), CLEARPART_TYPE_LINUX),
- (_("Resize existing partition and create default layout in free space"), -2),
- (_("Use free space on selected drives and create default layout"), CLEARPART_TYPE_NONE),
+ opts = ((_("Use entire drive"), CLEARPART_TYPE_ALL),
+ (_("Replace existing Linux system"), CLEARPART_TYPE_LINUX),
+ (_("Shrink current system"), -2),
+ (_("Use free space"), CLEARPART_TYPE_NONE),
(_("Create custom layout"), -1))
for (txt, val) in opts:
iter = store.append(None)
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 83638d081..1944ee17f 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -1508,16 +1508,12 @@ class PartitionTypeWindow:
while 1:
g = GridFormHelp(screen, _("Partitioning Type"), "autopart", 1, 6)
- txt = TextboxReflowed(65, _("Installation requires partitioning "
- "of your hard drive. The default "
- "layout is reasonable for most "
- "users. You can either choose "
- "to use this or create your own."))
+ txt = TextboxReflowed(65, _("Installation requires partitioning of your hard drive. The default layout is suitable for most users. Select what space to use and which drives to use as the install target. You can also choose to create your own custom layout."))
g.add(txt, 0, 0, (0, 0, 0, 0))
- opts = ((_("Remove all partitions on selected drives and create default layout"), CLEARPART_TYPE_ALL),
- (_("Remove Linux partitions on selected drives and create default layout"), CLEARPART_TYPE_LINUX),
- (_("Use free space on selected drives and create default layout"), CLEARPART_TYPE_NONE),
+ opts = ((_("Use entire drive"), CLEARPART_TYPE_ALL),
+ (_("Replace existing Linux system"), CLEARPART_TYPE_LINUX),
+ (_("Use free space"), CLEARPART_TYPE_NONE),
(_("Create custom layout"), -1))
typebox = Listbox(height = len(opts), scroll = 0)
for (txt, val) in opts:
diff --git a/ui/autopart.glade b/ui/autopart.glade
index 9378cb65a..199c3591d 100644
--- a/ui/autopart.glade
+++ b/ui/autopart.glade
@@ -30,7 +30,7 @@
<child>
<widget class="GtkLabel" id="mainlabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Installation requires partitioning of your hard drive. By default, a partitioning layout is chosen which is reasonable for most users. You can either choose to use this or create your own.</property>
+ <property name="label" translatable="yes">Installation requires partitioning of your hard drive. The default layout is suitable for most users. Select what space to use and which drives to use as the install target. You can also choose to create your own custom layout.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>