diff options
33 files changed, 185 insertions, 175 deletions
diff --git a/autopart.py b/autopart.py index 79a6075df..4b05d5dee 100644 --- a/autopart.py +++ b/autopart.py @@ -952,7 +952,7 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch): intf.messageWindow(_("Requested Partition Does Not Exist"), _("Unable to locate partition %s to use " "for %s.\n\n" - "Press OK to reboot your system.") + "Press 'OK' to reboot your system.") % (request.device, request.mountpoint)) sys.exit(0) @@ -980,11 +980,11 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch): for req in partitions.requests: errors = req.sanityCheckRequest(partitions) if errors: - intf.messageWindow(_("Partition Request Sanity Check Errors"), + intf.messageWindow(_("Automatic Partitioning Errors"), _("The following errors occurred with your " "partitioning:\n\n%s\n\n" - "Press OK to reboot your system.") % - (errors)) + "Press 'OK' to reboot your system.") % + (errors,)) try: doPartitioning(diskset, partitions, doRefresh = 0) @@ -992,7 +992,7 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch): if not isKickstart: intf.messageWindow(_("Warnings During Automatic Partitioning"), _("Following warnings occurred during automatic " - "partitioning:\n\n%s") % (msg.value)) + "partitioning:\n\n%s") % (msg.value,)) else: log("WARNING: %s" % (msg.value)) except PartitioningError, msg: @@ -1003,7 +1003,7 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch): extra = "" dispatch.skipStep("partition", skip = 0) else: - extra = _("\n\nPress OK to reboot your system.") + extra = _("\n\nPress 'OK' to reboot your system.") intf.messageWindow(_("Error Partitioning"), _("Could not allocate requested partitions: \n\n" "%s.%s") % (msg.value, extra)) @@ -1019,17 +1019,17 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch): log("WARNING: %s" % (warning)) if errors: errortxt = string.join(errors, '\n') - intf.messageWindow(_("Partition Request Sanity Check Errors"), + intf.messageWindow(_("Automatic Partitioning Errors"), _("The following errors occurred with your " "partitioning:\n\n%s\n\n" - "This can happen when there is not enough " - "space on your disk drive(s) for autopartitioning " - "to succeed. You may need to manually " - "partition your drives to complete the install.\n\n" - "Press OK to continue.") % (errortxt)) + "This can happen if there is not enough " + "space on your hard drive(s) for the " + "installation. " + "You can choose a different automatic " + "partitioning option, or click 'Back' " + "to select manual partitioning.\n\n" + "Press 'OK' to continue.") % (errortxt)) return DISPATCH_BACK -# "Press OK to reboot your system.") % (errortxt)) -# sys.exit(0) def autoCreatePartitionRequests(autoreq): """Return a list of requests created with a shorthand notation. @@ -1103,21 +1103,19 @@ def queryAutoPartitionOK(intf, diskset, partitions): # XXX hack but these are common strings to TUI and GUI -PARTMETHOD_TYPE_DESCR_TEXT = N_("Automatic Partitioning sets up your " - "partitioning based on your installation type. " +PARTMETHOD_TYPE_DESCR_TEXT = N_("Automatic Partitioning sets partitions " + "based on the selected installation type. " "You also " - "can customize the resulting partitions " - "to meet your needs.\n\n" + "can customize the partitions once they " + "have been created.\n\n" "The manual disk partitioning tool, Disk Druid, " "allows you " - "to set up your partitions in an interactive " - "environment. You can set the filesystem " - "types, mount points, size and more in this " - "easy to use, powerful interface.\n\n" - "fdisk is the traditional, text-based " - "partitioning tool offered by Red Hat. " - "Although it is not as easy to use, there are " - "cases where fdisk is preferred.") + "to create partitions in an interactive " + "environment. You can set the file system " + "types, mount points, partition sizes, and more.\n\n" + "The partitioning tool, fdisk, is a text-based " + "utility only recommended for advanced users " + "who need to perform specialized tasks.") AUTOPART_DISK_CHOICE_DESCR_TEXT = N_("Before automatic partitioning can be " "set up by the installation program, you " @@ -1128,13 +1126,11 @@ CLEARPART_TYPE_ALL_DESCR_TEXT = N_("Remove all partitions on this system") CLEARPART_TYPE_LINUX_DESCR_TEXT = N_("Remove all Linux Partitions on this system") CLEARPART_TYPE_NONE_DESCR_TEXT = N_("Keep all partitions and use existing free space") -CLEARPART_TYPE_ALL_WARNING_MSG = N_("WARNING!!\tWARNING!!\n\n" - "You have selected to remove " +CLEARPART_TYPE_ALL_WARNING_MSG = N_("You have selected to remove " "all partitions (ALL DATA) on the " "following drives:%s\nAre you sure you " "want to do this?") -CLEARPART_TYPE_LINUX_WARNING_MSG = N_("WARNING!!\tWARNING!!\n\n" - "You have selected to " +CLEARPART_TYPE_LINUX_WARNING_MSG = N_("You have selected to " "remove all Linux partitions " "(and ALL DATA on them) on the " "following drives:%s\n" @@ -554,7 +554,7 @@ class ext2FileSystem(extFileSystem): rc = message(_("Error"), _("An error occurred migrating %s to ext3. It is " "possible to continue without migrating this " - "filesystem if desired.\n\n" + "file system if desired.\n\n" "Would you like to continue without migrating %s?") % (devicePath, devicePath), type = "yesno") if rc == 0: @@ -1846,7 +1846,7 @@ def readFstab (path): device = makeDevice(labelToDevice[label]) else: log ("Warning: fstab file has LABEL=%s, but this label " - "could not be found on any filesystem", label) + "could not be found on any file system", label) # bad luck, skip this entry. continue elif fields[2] == "swap" and not fields[0].startswith('/dev/'): @@ -1963,7 +1963,7 @@ def allocateLoopback(file): def ext2FormatFilesystem(argList, messageFile, windowCreator, mntpoint): if windowCreator: w = windowCreator(_("Formatting"), - _("Formatting %s filesystem...") % (mntpoint,), 100) + _("Formatting %s file system...") % (mntpoint,), 100) else: w = None diff --git a/installclass.py b/installclass.py index fd1f54155..4a4bec73c 100644 --- a/installclass.py +++ b/installclass.py @@ -52,7 +52,7 @@ class BaseInstallClass: # by default, place this under the "install" category; it gets it's # own toplevel category otherwise - parentClass = ( _("Install"), "install.png" ) + parentClass = ( _("Install on System"), "install.png" ) # we can use a different install data class installDataClass = InstallData diff --git a/iw/account_gui.py b/iw/account_gui.py index ec0d20bbd..07ac9b629 100644 --- a/iw/account_gui.py +++ b/iw/account_gui.py @@ -225,7 +225,7 @@ class AccountWindow (InstallWindow): userAddFrame.add(vbox) userWin.vbox.pack_start(userAddFrame) - label = gui.MnemonicLabel (_("User _Name:")) + label = gui.MnemonicLabel (_("Enter a user _name:")) a = gtk.Alignment(0.0, 0.5, 0, 1) a.add(label) userTable.attach(a, 0, 1, 0, 1, gtk.FILL) @@ -233,7 +233,7 @@ class AccountWindow (InstallWindow): label.set_mnemonic_widget(self.accountName) userTable.attach(self.accountName, 1, 2, 0, 1, gtk.EXPAND, gtk.EXPAND) - label = gui.MnemonicLabel (_("_Password:")) + label = gui.MnemonicLabel (_("Enter a user _password:")) a = gtk.Alignment(0.0, 0.5, 0, 1) a.add(label) userTable.attach(a, 0, 1, 1, 2, gtk.FILL) @@ -342,8 +342,8 @@ class AccountWindow (InstallWindow): a.set (0.0, 0.0, 0.0, 0.0) hbox.pack_start (a, gtk.FALSE) - label = gtk.Label (_("Enter the password for the root user " - "(administrator) of this system.")) + label = gtk.Label (_("Enter the root (administrator) password " + "for the system.")) label.set_line_wrap(gtk.TRUE) label.set_size_request(350, -1) @@ -443,12 +443,9 @@ class AccountWindow (InstallWindow): a = gtk.Alignment (0.0, 0.5) label = gui.WrappingLabel( - _("Additional accounts can be created for other " - "users of this system. Such accounts could be for " - "a personal login account, or for other " - "non-administrative users who need to use this " - "system. Use the <Add> button to enter additional " - "user accounts.")) + _("It is recommended that you create a personal account " + "for normal (non-administrative) use. Accounts can also " + "be created for additional users.")) label.set_line_wrap(gtk.TRUE) a.add(label) hbox.pack_start(a, gtk.FALSE) diff --git a/iw/blpasswidget.py b/iw/blpasswidget.py index fa64664bf..d62790957 100644 --- a/iw/blpasswidget.py +++ b/iw/blpasswidget.py @@ -34,12 +34,12 @@ class BootloaderPasswordWidget: vbox = gtk.VBox(gtk.FALSE, 5) - label = gui.WrappingLabel(_("A boot loader password prevents users from passing arbitrary options to the kernel. For highest security, we recommend setting a password, but this is not necessary for more casual users.")) + label = gui.WrappingLabel(_("A boot loader password prevents users from changing options passed to the kernel. For greater system security, it is recommended that you set a password.")) label.set_alignment(0.0, 0.5) vbox.pack_start(label, gtk.FALSE) # password widgets + callback - self.usePassCb = gtk.CheckButton(_("_Use a Boot Loader Password")) + self.usePassCb = gtk.CheckButton(_("_Use a boot loader password")) self.passButton = gtk.Button("No password") if usePass: self.usePassCb.set_active(gtk.TRUE) @@ -102,11 +102,7 @@ class BootloaderPasswordWidget: dialog.set_position(gtk.WIN_POS_CENTER) gui.addFrame(dialog) - label = gui.WrappingLabel(_("A boot loader password prevents users " - "from passing arbitrary options to the " - "kernel. For highest security, we " - "recommend setting a password, but this " - "is not necessary for more casual users.")) + label = gui.WrappingLabel(_("Enter a boot loader password and then confirm it.")) label.set_alignment(0.0, 0.0) dialog.vbox.pack_start(label) diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py index 091f099f0..538942424 100644 --- a/iw/bootdisk_gui.py +++ b/iw/bootdisk_gui.py @@ -51,12 +51,13 @@ class BootdiskWindow (InstallWindow): label = None - text = _("The boot disk allows you to boot your %s " + text = _("The boot diskette allows you to boot your %s " "system from a floppy diskette. A boot disk " "allows you to boot your system if your " - "bootloader configuration stops working.\n\nIt is " - "highly recommended you create a boot disk.\n\n" - "Would you like to create a boot disk?") % (productName,) + "bootloader configuration stops working, if you " + "chose not to install a boot loader, or if your " + "third-party boot loader does not support Linux.\n\nIt is " + "highly recommended you create a boot disk.\n") % (productName,) label = gtk.Label (text) diff --git a/iw/bootloader_advanced_gui.py b/iw/bootloader_advanced_gui.py index 8ffd6bb2e..e5ebb7d8a 100644 --- a/iw/bootloader_advanced_gui.py +++ b/iw/bootloader_advanced_gui.py @@ -69,20 +69,28 @@ class AdvancedBootloaderWindow(InstallWindow): self.options_vbox = gtk.VBox(gtk.FALSE, 5) self.options_vbox.set_border_width(5) - self.forceLBA = gtk.CheckButton(_("_Force LBA32 (Not normally required)")) + self.forceLBA = gtk.CheckButton(_("_Force LBA32 (not normally required)")) self.options_vbox.pack_start(self.forceLBA, gtk.FALSE) self.forceLBA.set_active(self.bl.forceLBA32) + label = gui.WrappingLabel(_("If you wish to add default options to the " + "boot command, enter them into " + "the 'General kernel parameters' field.")) + label.set_alignment(0.0, 0.0) + self.options_vbox.pack_start(label, gtk.FALSE) + label = gui.MnemonicLabel(_("_General kernel parameters")) self.appendEntry = gtk.Entry() label.set_mnemonic_widget(self.appendEntry) args = self.bl.args.get() if args: self.appendEntry.set_text(args) - box = gtk.HBox(gtk.FALSE, 5) + box = gtk.HBox(gtk.FALSE, 0) box.pack_start(label) box.pack_start(self.appendEntry) - self.options_vbox.pack_start(box, gtk.FALSE) + al = gtk.Alignment(0.0, 0.0) + al.add(box) + self.options_vbox.pack_start(al, gtk.FALSE) def getScreen(self, dispatch, bl, fsset, diskset): diff --git a/iw/bootlocwidget.py b/iw/bootlocwidget.py index 77248efa6..30a6a234d 100644 --- a/iw/bootlocwidget.py +++ b/iw/bootlocwidget.py @@ -94,14 +94,15 @@ class BootloaderLocationWidget: dialog.set_modal(gtk.TRUE) dialog.set_position(gtk.WIN_POS_CENTER) - label = gui.WrappingLabel(_("Please arrange your drives in the order " - "in which they are handled by your " - "BIOS. This is usually only useful if " - "you have multiple SCSI adaptors or both " - "SCSI and IDE and wish to boot from the " - "SCSI device.\n\n" - "This does change where we think the " - "master boot record is.")) + label = gui.WrappingLabel(_("Arrange the drives to be in the same " + "order as used by the BIOS. Changing " + "the drive order may be useful if you " + "have multiple SCSI adapters or both SCSI " + "and IDE adapters and want to boot from " + "the SCSI device.\n\n" + "Changing the drive order will change " + "where the installation program " + "locates the Master Boot Record (MBR).")) label.set_alignment(0.0, 0.0) dialog.vbox.pack_start(label, padding = 25) diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py index f536e4116..9016aee63 100644 --- a/iw/confirm_gui.py +++ b/iw/confirm_gui.py @@ -58,12 +58,11 @@ class InstallConfirmWindow (ConfirmWindow): def getScreen(self): return ConfirmWindow.getScreen(self, _("Click next to begin installation of %s.") % (productName,), - _("A complete log of your installation will be in " - "%s after rebooting your system. You " - "may want to keep this file for later reference. " - "A kickstart file representing the choices you have made " - "will be in %s.") % ("/root/install.log", - "/root/anaconda-ks.cfg")) + _("A complete log of the installation can be found in " + "the %s file after rebooting your system.\n\n" + "A kickstart file containing the installation options " + "selected can be found in the %s file after rebooting the " + "system") % ("/root/install.log", "/root/anaconda-ks.cfg")) class UpgradeConfirmWindow (ConfirmWindow): windowTitle = N_("About to Upgrade") @@ -72,8 +71,6 @@ class UpgradeConfirmWindow (ConfirmWindow): def getScreen(self): return ConfirmWindow.getScreen(self, _("Click next to begin upgrade of %s.") % (productName,), - _("A complete log of your upgrade will be in " - "after rebooting your system. You " - "may want to keep this file for later " - "reference.") % ("/root/upgrade.log",)) + _("A complete log of the upgrade can be found in " + "the %s file after rebooting your system.") % ("/root/upgrade.log",)) diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 9d6d2c5c9..486b82471 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -34,44 +34,48 @@ class CongratulationWindow (InstallWindow): def getScreen (self): self.ics.setHelpEnabled (gtk.FALSE) - hbox = gtk.HBox (gtk.TRUE, 5) + hbox = gtk.HBox (gtk.FALSE, 5) pix = self.ics.readPixmap ("done.png") if pix: a = gtk.Alignment () a.add (pix) a.set (0.5, 0.5, 1.0, 1.0) + a.set_size_request(200, -1) hbox.pack_start (a, gtk.FALSE) 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,) + bootstr = _("If you created a boot diskette to boot the " + "system, insert it before rebooting.\n\n") else: bootstr = "" label = gtk.Label( - _("Congratulations, your %s installation is " - "complete.\n\n" - "Remove any floppy diskettes you used during the " - "installation process and press <Enter> to reboot your system. " + _("Congratulations, the installation is complete.\n\n" + "Remove any installation media (diskettes or CD-ROMs) used during the " + "installation." "\n\n" "%s" - "For information on errata (updates and bug fixes), visit " - "http://www.redhat.com/errata.\n\n" - "Information on using and configuring your " - "system is available in the %s manuals " - "at http://www.redhat.com/docs.") % (productName, - bootstr, productName), - ) + "For information on Errata (updates and bug fixes), visit:\n" + "\thttp://www.redhat.com/errata/\n\n" + "For information on automatic updates through Red Hat " + "Network, visit:\n" + "\thttp://rhn.redhat.com/\n\n" + "For information on using and configuring the system, visit:\n" + "\thttp://www.redhat.com/docs/\n" + "\thttp://www.redhat.com/apps/support/\n\n" + "To register the product for support, visit:\n" + "\thttp://www.redhat.com/apps/activate/\n\n" + "Click 'Exit' to reboot the system.") % (bootstr,)) label.set_line_wrap (gtk.TRUE) + label.set_size_request(500, -1) label.set_alignment (0.0, 0.5) box = gtk.VBox (gtk.FALSE, 10) box.pack_start (label, gtk.TRUE, gtk.TRUE, 0) - hbox.pack_start (box) + hbox.pack_start (box, gtk.TRUE, gtk.TRUE) return hbox diff --git a/iw/fdisk_gui.py b/iw/fdisk_gui.py index 22a33ffab..e6a46c1a8 100644 --- a/iw/fdisk_gui.py +++ b/iw/fdisk_gui.py @@ -23,7 +23,7 @@ import os class FDiskWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) - ics.setTitle (_("fdisk")) + ics.setTitle (_("Partitioning with fdisk")) ics.readHTML ("fdisk") def getNext(self): @@ -97,7 +97,7 @@ class FDiskWindow (InstallWindow): self.buttonBox.set_border_width (5) box = gtk.VButtonBox () box.set_layout("start") - label = gtk.Label (_("Select drive to run fdisk on")) + label = gtk.Label (_("Select a drive to partition with fdisk:")) drives = self.diskset.driveList() diff --git a/iw/firewall_gui.py b/iw/firewall_gui.py index bbc2ee3f0..3df419851 100644 --- a/iw/firewall_gui.py +++ b/iw/firewall_gui.py @@ -177,7 +177,7 @@ class FirewallWindow (InstallWindow): box = gtk.VBox (gtk.FALSE, 5) box.set_border_width (5) - label = gtk.Label (_("Please choose your security level: ")) + label = gtk.Label (_("Select a security level for the system: ")) label.set_alignment (0.0, 0.5) label.set_line_wrap (gtk.TRUE) diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py index e6601192b..65ca1847e 100644 --- a/iw/language_support_gui.py +++ b/iw/language_support_gui.py @@ -144,7 +144,7 @@ class LanguageSupportWindow (InstallWindow): self.combo = gtk.Combo () - label = gui.MnemonicLabel(_("_Choose the default language for this system: ")) + label = gui.MnemonicLabel(_("Select the _default language for the system: ")) label.set_mnemonic_widget(self.combo.entry) hbox.pack_start (label, gtk.FALSE, 20) @@ -154,8 +154,8 @@ class LanguageSupportWindow (InstallWindow): sep = gtk.HSeparator () vbox.pack_start (sep, gtk.FALSE, 15) - label = gui.MnemonicLabel(_("Choose _additional languages you would " - "like to use on this system:")) + label = gui.MnemonicLabel(_("Select _additional languages to install " + "on the system:")) label.set_alignment (0.0, 0.5) label.set_line_wrap (gtk.TRUE) @@ -203,13 +203,13 @@ class LanguageSupportWindow (InstallWindow): vbox2 = gtk.VBox (gtk.FALSE, 12) - all_button = gtk.Button (_("_Select all")) + all_button = gtk.Button (_("_Select All")) all_button.set_size_request(160, -1) all_button.connect ('clicked', self.select_all) a1 = gtk.Alignment (0.5, 0.5) a1.add (all_button) - default_button = gtk.Button (_("Select _Default Only")) + default_button = gtk.Button (_("Select Default _Only")) default_button.set_size_request(160, -1) default_button.connect ('clicked', self.select_default) a2 = gtk.Alignment (0.5, 0.5) diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index f76a123fb..61162a14b 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -349,7 +349,7 @@ class VolumeGroupEditor: row = row + 1 if not logrequest or not logrequest.getPreExisting(): - lbl = createAlignedLabel(_("_Filesystem Type:")) + lbl = createAlignedLabel(_("_File System Type:")) maintable.attach(lbl, 0, 1, row, row + 1) (newfstype, newfstypeMenu) = createFSTypeMenu(logrequest.fstype, fstypechangeCB, @@ -357,7 +357,7 @@ class VolumeGroupEditor: ignorefs = ["software RAID", "physical volume (LVM)", "vfat"]) lbl.set_mnemonic_widget(newfstype) else: - maintable.attach(createAlignedLabel(_("Original Filesystem Type:")), + maintable.attach(createAlignedLabel(_("Original File System Type:")), 0, 1, row, row + 1) if logrequest.origfstype and logrequest.origfstype.getName(): newfstype = gtk.Label(logrequest.origfstype.getName()) diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py index 45d64a837..911f1d6af 100644 --- a/iw/mouse_gui.py +++ b/iw/mouse_gui.py @@ -132,8 +132,8 @@ class MouseWindow(InstallWindow): self.mousestore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.mouseview = gtk.TreeView(self.mousestore) - self.mouseview.set_property("headers-visible", gtk.FALSE) - col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) + self.mouseview.set_property("headers-visible", gtk.TRUE) + col = gtk.TreeViewColumn(_("_Model"), gtk.CellRendererText(), text=0) self.mouseview.append_column(col) selection = self.mouseview.get_selection() selection.connect("changed", self.selectMouseType) @@ -217,7 +217,7 @@ class MouseWindow(InstallWindow): # populate the big widgets with the available selections self.setupMice() self.setupDeviceList() - self.emulate3 = gtk.CheckButton(_("_Emulate 3 Buttons")) + self.emulate3 = gtk.CheckButton(_("_Emulate 3 buttons")) self.setCurrent(currentDev, currentMouse, emulate3) # set up the box for this screen @@ -231,7 +231,7 @@ class MouseWindow(InstallWindow): a.add(pix) a.set(0.0, 0.0, 0.0, 0.0) hbox.pack_start(a, gtk.FALSE) - label = gui.MnemonicLabel(_("Which _model mouse is attached to the computer?")) + label = gui.MnemonicLabel(_("Select the appropriate mouse for the system.")) label.set_line_wrap(gtk.TRUE) label.set_size_request(350, -1) hbox.pack_start(label, gtk.FALSE) diff --git a/iw/network_gui.py b/iw/network_gui.py index 3f8233e97..abc95276a 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -468,7 +468,7 @@ class NetworkWindow(InstallWindow): # show hostname and dns/misc network info and offer chance to modify hostbox = gtk.HBox() hostbox=gtk.VBox() - label=gtk.Label(_("I would like the hostname to be set:")) + label=gtk.Label(_("Set the hostname:")) label.set_alignment(0.0, 0.0) hostbox.pack_start(label, gtk.FALSE, gtk.FALSE) tmphbox=gtk.HBox() diff --git a/iw/osbootwidget.py b/iw/osbootwidget.py index 4210d5571..ee7c6278f 100644 --- a/iw/osbootwidget.py +++ b/iw/osbootwidget.py @@ -38,7 +38,12 @@ class OSBootWidget: self.setIllegalChars() self.vbox = gtk.VBox(gtk.FALSE, 5) - label = gui.WrappingLabel(_("You can configure the boot loader to boot other operating systems. Additional operating systems can be added to the below list to choose between them on boot.")) + label = gui.WrappingLabel(_("You can configure the boot loader to boot other operating systems. " + "It will allow you to select an operating system to boot from the list. " + "To add additional operating systems, which are not automatically " + "detected, click 'Add.' To change the operating system booted by default, " + "select 'Default' by the desired operating system.")) + label.set_alignment(0.0, 0.0) self.vbox.pack_start(label, gtk.FALSE) spacer = gtk.Label("") @@ -129,9 +134,9 @@ class OSBootWidget: gui.addFrame(dialog) dialog.vbox.pack_start(gui.WrappingLabel( - _("The label is what is displayed in the boot loader to " - "choose to boot this operating system. The device " - "is the device which it boots from."))) + _("Enter a label to be displayed in the boot loader menu. The " + "device (or hard drive and partition number) is the device " + "from which it boots."))) spacer = gtk.Label("") spacer.set_size_request(10, 1) diff --git a/iw/package_gui.py b/iw/package_gui.py index 7b14b0314..639bc6d75 100644 --- a/iw/package_gui.py +++ b/iw/package_gui.py @@ -32,7 +32,7 @@ from comps import orderPackageGroups def queryUpgradeContinue(intf): rc = intf.messageWindow(_("Proceed with upgrade?"), - _("The filesystems of the Linux installation " + _("The file systems of the Linux installation " "you have chosen to upgrade have already been " "mounted. You cannot go back past this point. " "\n\n") + diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index ff4c71e0c..cb4f1a34a 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -285,7 +285,7 @@ class PartitionEditor: # Partition Type if self.origrequest.type == REQUEST_NEW: - lbl = createAlignedLabel(_("Filesystem _Type:")) + lbl = createAlignedLabel(_("File System _Type:")) maintable.attach(lbl, 0, 1, row, row + 1) (self.newfstype, self.newfstypeMenu) = createFSTypeMenu(self.origrequest.fstype, @@ -294,7 +294,7 @@ class PartitionEditor: lbl.set_mnemonic_widget(self.newfstype) maintable.attach(self.newfstype, 1, 2, row, row + 1) else: - maintable.attach(createAlignedLabel(_("Original Filesystem " + maintable.attach(createAlignedLabel(_("Original File System " "Type:")), 0, 1, row, row + 1) @@ -339,7 +339,7 @@ class PartitionEditor: # original fs label if self.origrequest.type != REQUEST_NEW and self.origrequest.fslabel: - maintable.attach(createAlignedLabel(_("Original Filesystem " + maintable.attach(createAlignedLabel(_("Original File System " "Label:")), 0, 1, row, row + 1) fslabel = gtk.Label(self.origrequest.fslabel) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index ec78449b1..8ce141f8f 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -517,7 +517,7 @@ class DiskTreeModel(gtk.TreeStore): class PartitionWindow(InstallWindow): def __init__(self, ics): InstallWindow.__init__(self, ics) - ics.setTitle(_("Disk Setup")) + ics.setTitle(_("Partitioning")) ics.setNextEnabled(gtk.TRUE) ics.readHTML("partition") self.parent = ics.getICW().window @@ -1459,8 +1459,8 @@ class AutoPartitionWindow(InstallWindow): # which drives to use? drivesbox = gtk.VBox(gtk.FALSE) - label = gui.WrappingLabel(_("Which drive(s) do you want to use for " - "this installation?")) + label = gui.WrappingLabel(_("Select the drive(s) to use for " + "this installation:")) label.set_alignment(0.0, 0.0) drivesbox.pack_start(label, gtk.FALSE, gtk.FALSE, 10) self.drivelist = createAllowedDrivesList(diskset.disks, cleardrives) @@ -1483,8 +1483,8 @@ class AutoPartitionWindow(InstallWindow): self.inspect = gtk.CheckButton() gui.widgetExpander(self.inspect) - label = gui.MnemonicLabel(_("Re_view (allows you to see and change " - "the automatic partitioning results)")) + label = gui.MnemonicLabel(_("Re_view (and modify if needed) " + "the partitions created")) label.set_mnemonic_widget(self.inspect) label.set_line_wrap(gtk.TRUE) gui.widgetExpander(label, self.inspect) diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index 784a855b5..99bae9997 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -238,7 +238,7 @@ def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo, maintable.attach(gtk.HSeparator(), 0, 2, row, row + 1) row = row + 1 - label = gtk.Label(_("How would you like to prepare the filesystem " + label = gtk.Label(_("How would you like to prepare the file system " "on this partition?")) label.set_line_wrap(1) label.set_alignment(0.0, 0.0) diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py index e3a0c581c..e4242e19a 100644 --- a/iw/partmethod_gui.py +++ b/iw/partmethod_gui.py @@ -55,13 +55,13 @@ class PartitionMethodWindow(InstallWindow): radioBox = gtk.VBox (gtk.FALSE) self.useAuto = gtk.RadioButton( - None, _("Have the installer _automatically partition for you")) + None, _("_Automatically partition")) radioBox.pack_start(self.useAuto, gtk.FALSE, gtk.FALSE) self.useDS = gtk.RadioButton( self.useAuto, _("Manually partition with _Disk Druid")) radioBox.pack_start(self.useDS, gtk.FALSE, gtk.FALSE) self.useFdisk = gtk.RadioButton( - self.useAuto, _("Manually partition with _fdisk [experts only]")) + self.useAuto, _("Manually partition with _fdisk (experts only)")) radioBox.pack_start(self.useFdisk, gtk.FALSE, gtk.FALSE) if partitions.useAutopartitioning: diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 731f1b150..63062272f 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -297,7 +297,7 @@ class RaidEditor: row = row + 1 # Filesystem Type - lbl = createAlignedLabel(_("Filesystem _Type:")) + lbl = createAlignedLabel(_("File System _Type:")) maintable.attach(lbl, 0, 1, row, row + 1) if not origrequest.getPreExisting(): diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index 588cc6983..77814349c 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -215,7 +215,7 @@ class TimezoneWindow(InstallWindow): tzBox.pack_start(sw) box = gtk.HBox(gtk.FALSE) align = gtk.Alignment(0.5, 0.5) - self.daylightCB = gtk.CheckButton(_("Use _Daylight Saving Time (US only)")) + self.daylightCB = gtk.CheckButton(_("Use _daylight saving time (US only)")) self.daylightCB.set_active(self.old_use_dst) align.add(self.daylightCB) box.pack_start(align, gtk.FALSE) diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 7d45a0aec..f7cb3ea9d 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -27,7 +27,7 @@ import gtk from rhpl.log import log class UpgradeMigrateFSWindow (InstallWindow): - windowTitle = N_("Migrate Filesystems") + windowTitle = N_("Migrate File Systems") htmlTag = "upmigfs" def getNext (self): @@ -53,8 +53,8 @@ class UpgradeMigrateFSWindow (InstallWindow): box.set_border_width (5) text = N_("This release of %s supports " - "the ext3 journalling filesystem. It has several " - "benefits over the ext2 filesystem traditionally shipped " + "the ext3 journalling file system. It has several " + "benefits over the ext2 file system traditionally shipped " "in %s. It is possible to migrate the ext2 " "formatted partitions to ext3 without data loss.\n\n" "Which of these partitions would you like to migrate?" % diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index b0373c876..e0f34e91e 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -34,10 +34,20 @@ ddc_monitor_string = _("DDC Probed Monitor") unprobed_monitor_string = _("Unprobed Monitor") +### why is this here??? +def makeFormattedLabel(text): + label = gtk.Label (text) + label.set_justify (gtk.JUSTIFY_LEFT) + label.set_line_wrap (gtk.TRUE) + label.set_alignment (0.0, 0.5) + label.set_size_request (400, -1) + return label + + class XCustomWindow (InstallWindow): htmlTag = "xcustom" - windowTitle = N_("Customize Graphics Configuration") + windowTitle = N_("Customize Graphical Configuration") def __init__ (self, ics): InstallWindow.__init__ (self, ics) @@ -587,6 +597,13 @@ class MonitorWindow (InstallWindow): box = gtk.VBox (gtk.FALSE, 5) + label = makeFormattedLabel (_("In most cases, the monitor can be " + "automatically detected. If the " + "detected settings are not correct " + "for the monitor, select the right " + "settings.")) + box.pack_start (label, gtk.FALSE) + # Monitor selection tree self.monitorstore = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING) @@ -894,14 +911,6 @@ class XConfigWindow (InstallWindow): def getScreen (self, dispatch, xconfig, videocard, intf): self.ics.setHelpEnabled (gtk.TRUE) - def makeFormattedLabel(text): - label = gtk.Label (text) - label.set_justify (gtk.JUSTIFY_LEFT) - label.set_line_wrap (gtk.TRUE) - label.set_alignment (0.0, 0.5) - label.set_size_request (400, -1) - return label - self.dispatch = dispatch self.videocard = videocard self.xconfig = xconfig @@ -922,15 +931,11 @@ class XConfigWindow (InstallWindow): # but we can on everything else self.autoBox = gtk.VBox (gtk.FALSE, 5) - label = makeFormattedLabel (_("In most cases your video hardware " - "can be probed to automatically " - "determine the best settings for " - "your display.")) - self.autoBox.pack_start (label, gtk.FALSE) - - label = makeFormattedLabel (_("If the probed settings do not " - "match your hardware, select the " - "correct hardware settings below:")) + label = makeFormattedLabel (_("In most cases, the video hardware " + "can be automatically detected. " + "If the detected settings are not " + "correct for the hardware, select " + "the right settings.")) self.autoBox.pack_start (label, gtk.FALSE) box.pack_start (self.autoBox, gtk.FALSE) @@ -1045,7 +1050,7 @@ class XConfigWindow (InstallWindow): restore.connect ("clicked", self.restorePressed) hbox.pack_start(restore, gtk.FALSE, 25) - self.skip = gtk.CheckButton (_("_Skip X Configuration")) + self.skip = gtk.CheckButton (_("_Skip X configuration")) self.skip.connect ("toggled", self.skipToggled) hbox = gtk.HBox (gtk.TRUE, 5) diff --git a/packages.py b/packages.py index fc3fe0063..96a01df2c 100644 --- a/packages.py +++ b/packages.py @@ -37,7 +37,7 @@ def queryUpgradeContinue(intf, dir): return rc = intf.messageWindow(_("Proceed with upgrade?"), - _("The filesystems of the Linux installation " + _("The file systems of the Linux installation " "you have chosen to upgrade have already been " "mounted. You cannot go back past this point. " "\n\n") + @@ -664,7 +664,7 @@ def doInstall(method, id, intf, instPath): probs = probs + _("You don't appear to have enough disk space " "to install the packages you've selected. " "You need more space on the following " - "filesystems:\n\n") + "file systems:\n\n") probs = probs + ("%-15s %s\n") % (_("Mount Point"), _("Space Needed")) @@ -684,7 +684,7 @@ def doInstall(method, id, intf, instPath): probs = probs + _("You don't appear to have enough file nodes " "to install the packages you've selected. " "You need more file nodes on the following " - "filesystems:\n\n") + "file systems:\n\n") probs = probs + ("%-15s %s\n") % (_("Mount Point"), _("Nodes Needed")) diff --git a/partRequests.py b/partRequests.py index 51de2e70c..eb9237111 100644 --- a/partRequests.py +++ b/partRequests.py @@ -212,11 +212,11 @@ class RequestSpec: if self.fstype.isMountable(): if self.mountpoint in mustbeonroot: return _("This mount point is invalid. This directory must " - "be on the / filesystem.") + "be on the / file system.") if not self.fstype.isLinuxNativeFS(): if self.mountpoint in mustbeonlinuxfs: - return _("This mount point must be on a linux filesystem.") + return _("This mount point must be on a linux file system.") return None diff --git a/partedUtils.py b/partedUtils.py index cfbaff948..79d14885b 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -449,7 +449,7 @@ class DiskSet: isys.mount(node, mountpoint, part.fs_type.name) except SystemError, (errno, msg): intf.messageWindow(_("Error"), - _("Error mounting filesystem on " + _("Error mounting file system on " "%s: %s") % (node, msg)) part = disk.next_partition(part) continue @@ -462,7 +462,7 @@ class DiskSet: isys.mount(node, mountpoint, fstype = "vfat", readOnly = 1) except: - log("failed to mount vfat filesystem on %s\n" + log("failed to mount vfat file system on %s\n" % node) part = disk.next_partition(part) continue @@ -768,7 +768,7 @@ class DiskSet: if len(self.disks.keys()) == 0: intf.messageWindow(_("No Drives Found"), _("An error has occurred - no valid devices were " - "found on which to create new filesystems. " + "found on which to create new file systems. " "Please check your hardware for the cause " "of this problem.")) sys.exit(0) @@ -99,7 +99,7 @@ def runRescue(instPath, mountroot, id): "Linux installation and mount it under the directory " "%s. You can then make any changes required to your " "system. If you want to proceed with this step choose " - "'Continue'. You can also choose to mount your filesystems " + "'Continue'. You can also choose to mount your file systems " "read-only instead of read-write by choosing 'Read-Only'." "\n\n" "If for some reason this process fails you can choose 'Skip' " @@ -159,7 +159,7 @@ def runRescue(instPath, mountroot, id): if rc == -1: ButtonChoiceWindow(screen, _("Rescue"), - _("Your system had dirty filesystems which you chose not " + _("Your system had dirty file systems which you chose not " "to mount. Press return to get a shell from which " "you can fsck and mount your partitions. The system " "will reboot automatically when you exit from the " diff --git a/textw/partition_text.py b/textw/partition_text.py index 18d2b9d52..f54d892a5 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -258,7 +258,7 @@ class PartitionWindow: row = 0 # filesystem type selection if uselabel: - typeLbl = Label(_("Filesystem type:")) + typeLbl = Label(_("File System type:")) subgrid.setField(typeLbl, 0, row) row = row + 1 @@ -465,7 +465,7 @@ class PartitionWindow: subgrid = Grid(2, 4) # filesystem type selection srow = 0 - typeLbl = Label(_("Filesystem Type:")) + typeLbl = Label(_("File System Type:")) subgrid.setField(typeLbl, 0, srow, (0,0,0,1), anchorLeft = 1) ptype = origrequest.fstype.getName() if ptype == "foreign": @@ -475,7 +475,7 @@ class PartitionWindow: subgrid.setField(type, 1, srow, (0,0,0,1), anchorRight = 1) srow = srow +1 if origrequest.type != REQUEST_NEW and origrequest.fslabel: - fsLbl = Label(_("Filesystem Label:")) + fsLbl = Label(_("File System Label:")) subgrid.setField(fsLbl, 0, srow, (0,0,0,1), anchorLeft = 1) label = Label(origrequest.fslabel) subgrid.setField(label, 1, srow, (0,0,0,1), anchorRight = 1) @@ -486,7 +486,7 @@ class PartitionWindow: size = Label("%s" %(int(origrequest.size))) subgrid.setField(size, 1, srow, (0,0,0,1), anchorRight = 1) srow = srow + 1 - tmpLbl = Label(_("Filesystem Option:")) + tmpLbl = Label(_("File System Option:")) subgrid.setField(tmpLbl, 0, srow, (0,0,0,1), anchorLeft = 1) if origrequest.format: fsoptLbl = Label(_("Format as %s") % (newfstype.getName())) @@ -509,11 +509,11 @@ class PartitionWindow: if badblocksCB: badblocksCB.setFlags(FLAG_DISABLED, flag) - poplevel = GridFormHelp(self.screen, _("Filesystem Options"), + poplevel = GridFormHelp(self.screen, _("File System Options"), "fsoption", 1, 6) row = 0 poplevel.add(TextboxReflowed(40, _("Please choose how you would " - "like to prepare the filesystem " + "like to prepare the file system " "on this partition.")), 0, 0) row = row + 1 subgrid = Grid(2, 5) @@ -698,7 +698,7 @@ class PartitionWindow: popbb = ButtonBar(self.screen, (TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON)) else: popbb = ButtonBar(self.screen, (TEXT_OK_BUTTON, - (_("Filesystem Options"), "fsopts"), + (_("File System Options"), "fsopts"), TEXT_CANCEL_BUTTON)) poplevel.add(popbb, 0, row, (0,1,0,0), growx = 1) @@ -930,7 +930,7 @@ class PartitionWindow: row = row + 1 if preexist: popbb = ButtonBar(self.screen, (TEXT_OK_BUTTON, - (_("Filesystem Options"), "fsopts"), + (_("File System Options"), "fsopts"), TEXT_CANCEL_BUTTON)) else: popbb = ButtonBar(self.screen, (TEXT_OK_BUTTON,TEXT_CANCEL_BUTTON)) diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index a125d296f..be5846e4a 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -29,11 +29,11 @@ class UpgradeMigrateFSWindow: migent = thefsset.getMigratableEntries() - g = GridFormHelp(screen, _("Migrate Filesystems"), "upmigfs", 1, 4) + g = GridFormHelp(screen, _("Migrate File Systems"), "upmigfs", 1, 4) text = _("This release of %s supports " - "the ext3 journalling filesystem. It has several " - "benefits over the ext2 filesystem traditionally shipped " + "the ext3 journalling file system. It has several " + "benefits over the ext2 file system traditionally shipped " "in %s. It is possible to migrate the ext2 " "formatted partitions to ext3 without data loss.\n\n" "Which of these partitions would you like to migrate?" diff --git a/upgrade.py b/upgrade.py index b3b8ff9b2..7e978ca1a 100644 --- a/upgrade.py +++ b/upgrade.py @@ -85,16 +85,16 @@ def mountRootPartition(intf, rootInfo, oldfsset, instPath, allowDirty = 0, import sys diskset.stopAllRaid() lvm.vgdeactivate() - intf.messageWindow(_("Dirty Filesystems"), - _("The following filesystems for your Linux system " + intf.messageWindow(_("Dirty File Systems"), + _("The following file systems for your Linux system " "were not unmounted cleanly. Please boot your " - "Linux installation, let the filesystems be " + "Linux installation, let the file systems be " "checked and shut down cleanly to upgrade.\n" "%s" %(getDirtyDevString(dirtyDevs),))) sys.exit(0) elif warnDirty and dirtyDevs != []: - rc = intf.messageWindow(_("Dirty Filesystems"), - _("The following filesystems for your Linux " + rc = intf.messageWindow(_("Dirty File Systems"), + _("The following file systems for your Linux " "system were not unmounted cleanly. Would " "you like to mount them anyway?\n" "%s" % (getDirtyDevString(dirtyDevs,))), @@ -224,13 +224,13 @@ def upgradeMountFilesystems(intf, rootInfo, oldfsset, instPath): allowDirty = 0) except SystemError, msg: intf.messageWindow(_("Mount failed"), - _("One or more of the filesystems listed in the " + _("One or more of the file systems listed in the " "/etc/fstab on your Linux system cannot be mounted. " "Please fix this problem and try to upgrade again.")) sys.exit(0) except RuntimeError, msg: intf.messageWindow(_("Mount failed"), - _("One or more of the filesystems listed in the " + _("One or more of the file systems listed in the " "/etc/fstab of your Linux system are inconsistent and " "cannot be mounted. Please fix this problem and try to " "upgrade again.")) |