diff options
author | Chris Lumens <clumens@redhat.com> | 2007-02-27 21:17:26 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2007-02-27 21:17:26 +0000 |
commit | 2ed15c8e880336ab539ad3b491426f9399cc860c (patch) | |
tree | 3e618fa932ae8a8481540a0918fa2f9d6fdeff54 /iw | |
parent | 2d4d0344b9028b16dcbf7dda13ce77b7300443a0 (diff) | |
download | anaconda-2ed15c8e880336ab539ad3b491426f9399cc860c.tar.gz anaconda-2ed15c8e880336ab539ad3b491426f9399cc860c.tar.xz anaconda-2ed15c8e880336ab539ad3b491426f9399cc860c.zip |
Apply a patch to clean up strings (Paul W. Frields <stickster@gmail.com>,
#204564).
Diffstat (limited to 'iw')
-rw-r--r-- | iw/account_gui.py | 4 | ||||
-rw-r--r-- | iw/blpasswidget.py | 2 | ||||
-rw-r--r-- | iw/bootloader_advanced_gui.py | 8 | ||||
-rw-r--r-- | iw/examine_gui.py | 2 | ||||
-rw-r--r-- | iw/lvm_dialog_gui.py | 12 | ||||
-rw-r--r-- | iw/osbootwidget.py | 10 | ||||
-rw-r--r-- | iw/partition_gui.py | 15 | ||||
-rw-r--r-- | iw/partition_ui_helpers_gui.py | 2 | ||||
-rw-r--r-- | iw/pixmapRadioButtonGroup_gui.py | 2 | ||||
-rw-r--r-- | iw/raid_dialog_gui.py | 28 | ||||
-rw-r--r-- | iw/task_gui.py | 4 | ||||
-rw-r--r-- | iw/upgrade_bootloader_gui.py | 4 | ||||
-rw-r--r-- | iw/upgrade_migratefs_gui.py | 4 | ||||
-rw-r--r-- | iw/upgrade_swap_gui.py | 16 |
14 files changed, 56 insertions, 57 deletions
diff --git a/iw/account_gui.py b/iw/account_gui.py index 0b5a9ec57..2198c62cb 100644 --- a/iw/account_gui.py +++ b/iw/account_gui.py @@ -63,8 +63,8 @@ class AccountWindow (InstallWindow): if letter not in allowed: self.intf.messageWindow(_("Error with Password"), _("Requested password contains " - "non-ascii characters which are " - "not allowed for use in password."), + "non-ASCII characters, which are " + "not allowed."), custom_icon="error") passwordError() diff --git a/iw/blpasswidget.py b/iw/blpasswidget.py index 1e49cfbc8..c4eff1ec8 100644 --- a/iw/blpasswidget.py +++ b/iw/blpasswidget.py @@ -143,7 +143,7 @@ class BootloaderPasswordWidget: continue if len(thePass) < 6: ret = self.intf.messageWindow(_("Warning"), - _("Your boot loader password is less than " + _("Your boot loader password is shorter than " "six characters. We recommend a longer " "boot loader password." "\n\n" diff --git a/iw/bootloader_advanced_gui.py b/iw/bootloader_advanced_gui.py index 1ad5362dd..e12353bf9 100644 --- a/iw/bootloader_advanced_gui.py +++ b/iw/bootloader_advanced_gui.py @@ -39,10 +39,10 @@ class AdvancedBootloaderWindow(InstallWindow): # forcing lba32 can be a bad idea.. make sure they really want to if (self.forceLBA.get_active() and not self.bl.forceLBA32): rc = self.intf.messageWindow(_("Warning"), - _("Forcing the use of LBA32 for your bootloader when " - "not supported by the BIOS can cause your machine " - "to be unable to boot.\n\n" - "Would you like to continue and force LBA32 mode?"), + _("If LBA32 is not supported by your system's BIOS, " + "forcing its use can prevent your machine from " + "booting.\n\n" + "Would you like to continue and force LBA32 mode?"), type = "custom", custom_buttons = [_("Cancel"), _("Force LBA32")]) diff --git a/iw/examine_gui.py b/iw/examine_gui.py index 9bb9c740b..7dd57d871 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -57,7 +57,7 @@ class UpgradeExamineWindow (InstallWindow): pixmap=gui.readImageFromFile("upgrade.png"), descr=_("Choose this option if you would like " "to upgrade your existing %s system. " - "This option will preserve the " + "This option preserves the " "existing data on your drives.") %(productName,)) return r diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 8465faeda..dc5fdd195 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -130,7 +130,7 @@ class VolumeGroupEditor: "up in size to an integer multiple " "of the " "physical extent.\n\nThis change " - "will take affect immediately."), + "will take effect immediately."), type="custom", custom_icon="question", custom_buttons=["gtk-cancel", _("C_ontinue")]) if not rc: @@ -555,7 +555,7 @@ class VolumeGroupEditor: if used: self.intf.messageWindow(_("Mount point in use"), _("The mount point \"%s\" is in " - "use, please pick another.") % + "use. Please pick another.") % (mntpt,), custom_icon="error") continue @@ -600,7 +600,7 @@ class VolumeGroupEditor: if size > maxlv: self.intf.messageWindow(_("Not enough space"), _("The current requested size " - "(%10.2f MB) is larger than maximum " + "(%10.2f MB) is larger than the maximum " "logical volume size (%10.2f MB). " "To increase this limit you can " "create more Physical Volumes from " @@ -728,8 +728,8 @@ class VolumeGroupEditor: _("There is no room left in the " "volume group to create new logical " "volumes. " - "To add a logical volume you will need " - "to reduce the size of one or more of " + "To add a logical volume you must " + "reduce the size of one or more of " "the currently existing " "logical volumes"), custom_icon="error") return @@ -753,7 +753,7 @@ class VolumeGroupEditor: return rc = self.intf.messageWindow(_("Confirm Delete"), - _("Are you sure you want to Delete the " + _("Are you sure you want to delete the " "logical volume \"%s\"?") % (logvolname,), type = "custom", custom_buttons=["gtk-cancel", _("_Delete")], custom_icon="warning") if not rc: diff --git a/iw/osbootwidget.py b/iw/osbootwidget.py index 02d33503f..838bd7cd3 100644 --- a/iw/osbootwidget.py +++ b/iw/osbootwidget.py @@ -40,11 +40,11 @@ class OSBootWidget: self.setIllegalChars() self.vbox = gtk.VBox(False, 5) - 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 " + label = gui.WrappingLabel(_("You can configure the boot loader to boot other operating systems " + "by selecting from the list. " + "To add an operating systems that was not automatically " "detected, click 'Add.' To change the operating system booted by default, " - "select 'Default' by the desired operating system.")) + "select 'Default' next to the desired operating system.")) label.set_alignment(0.0, 0.0) label.set_size_request(350, -1) self.vbox.pack_start(label, False) @@ -134,7 +134,7 @@ class OSBootWidget: gui.addFrame(dialog) dialog.vbox.pack_start(gui.WrappingLabel( - _("Enter a label to be displayed in the boot loader menu. The " + _("Enter a label for the boot loader menu to display. The " "device (or hard drive and partition number) is the device " "from which it boots."))) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index d221dc8e6..84d25cb86 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -630,11 +630,10 @@ class PartitionWindow(InstallWindow): (errors, warnings) = self.partitions.sanityCheckAllRequests(self.diskset) if errors: - labelstr1 = _("The following critical errors exist " - "with your requested partitioning " - "scheme.") - labelstr2 = _("These errors must be corrected prior " - "to continuing with your install of " + labelstr1 = _("The partitioning scheme you requested " + "caused the following critical errors.") + labelstr2 = _("You must correct these errors before " + "you continue your installation of " "%s.") % (productName,) commentstr = string.join(errors, "\n\n") @@ -645,8 +644,8 @@ class PartitionWindow(InstallWindow): raise gui.StayOnScreen if warnings: - labelstr1 = _("The following warnings exist with " - "your requested partition scheme.") + labelstr1 = _("The partitioning scheme you requested" + "generated the following warnings.") labelstr2 = _("Would you like to continue with " "your requested partitioning " "scheme?") @@ -1249,7 +1248,7 @@ class PartitionWindow(InstallWindow): lbltxt = lbltxt + _("To use RAID you must first " "create at least two partitions of type " "'software RAID'. Then you can " - "create a RAID device which can " + "create a RAID device that can " "be formatted and mounted.\n\n") lbltxt = lbltxt + _("What do you want to do now?") diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index 9d9ab80d8..42541e903 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -343,7 +343,7 @@ def doUIRAIDLVMChecks(request, diskset): if fstype and fstype.getName() in ["physical volume (LVM)", "software RAID"]: if numdrives > 1 and (request.drive is None or len(request.drive) > 1): return (_("Partitions of type '%s' must be constrained to " - "a single drive. This is done by selecting the " + "a single drive. To do this, select the " "drive in the 'Allowable Drives' checklist.")) % (fstype.getName(),) return None diff --git a/iw/pixmapRadioButtonGroup_gui.py b/iw/pixmapRadioButtonGroup_gui.py index a62d6dca0..4ddbacd79 100644 --- a/iw/pixmapRadioButtonGroup_gui.py +++ b/iw/pixmapRadioButtonGroup_gui.py @@ -224,7 +224,7 @@ if __name__ == "__main__": r.addEntry("upgrade", "_Upgrade Existing Installation", pixmap=readPixmap("/usr/share/anaconda/pixmaps/upgrade.png"), descr="Choose this option if you would like to upgrade your existing %s system. This option will preserve the data on your drive" % (productName,), userdata="data") r.addEntry("install", "_Reinstall %s" %(productName,), pixmap=readPixmap("../pixmaps/install.png"), - descr="Choose this option to reinstall your system. Depending on how you partition your system your previous data may or may not be lost.", userdata="data2") + descr="Choose this option to reinstall your system. Depending on how you partition your system, your previous data may be lost.", userdata="data2") b = r.render() r.setCurrent("Don't Upgrade") diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 96b158006..c97fe9f15 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -495,11 +495,11 @@ class RaidCloneDialog: for req in requests: if not req.fstype or req.fstype.getName() != "software RAID": self.intf.messageWindow(_("Source Drive Error"), - _("The source drive selected has " - "partitions on it which are not of " + _("The source drive you selected has " + "partitions which are not of " "type 'software RAID'.\n\n" - "These " - "partitions will have to be removed " + "You must remove these " + "partitions " "before this drive can be cloned. "), custom_icon="error") return 1 @@ -507,11 +507,11 @@ class RaidCloneDialog: for req in requests: if not req.drive or req.drive[0] != self.sourceDrive or len(req.drive) > 1: self.intf.messageWindow(_("Source Drive Error"), - _("The source drive selected has " + _("The source drive you selected has " "partitions which are not " "constrained to the drive /dev/%s.\n\n" - "These partitions will have to be " - "removed or restricted to this " + "You must remove these partitions " + "or restrict them to this " "drive " "before this drive can be cloned. ") %(self.sourceDrive,), custom_icon="error") @@ -520,12 +520,12 @@ class RaidCloneDialog: for req in requests: if self.partitions.isRaidMember(req): self.intf.messageWindow(_("Source Drive Error"), - _("The source drive selected has " + _("The source drive you selected has " "software RAID partition(s) which " "are members of an active " "software RAID device.\n\n" - "These partitions will have to be " - "removed before this drive " + "You must remove these partitions " + "before this drive " "can be cloned."), custom_icon="error") return 1 @@ -563,7 +563,7 @@ class RaidCloneDialog: "has a partition which cannot " "be removed for the following " "reason:\n\n\"%s\"\n\n" - "This partition must be removed " + "You must remove this partition " "before " "this drive can be a target.") % (drive, rc), custom_icon="error") @@ -696,10 +696,10 @@ class RaidCloneDialog: lbl = gui.WrappingLabel(_("Clone Drive Tool\n\n" "This tool allows you to significantly " "reduce the amount of effort required " - "to setup RAID arrays. The idea is to " - "take a source drive which has been " + "to setup RAID arrays. This tool " + "uses a source drive which has been " "prepared with the desired partitioning " - "layout, and clone this layout onto other " + "layout, and clones this layout onto other " "similar sized drives. Then a RAID device " "can be created.\n\n" "NOTE: The source drive must have " diff --git a/iw/task_gui.py b/iw/task_gui.py index 90b542486..3071172b8 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -88,8 +88,8 @@ class TaskWindow(InstallWindow): if not repo.groups_added: self.intf.messageWindow(_("Warning"), _("Unable to find a group file for %s. " - "This will make manual selection of packages " - "from the repository not work") %(repo.id,), + "This will prevent manual selection of packages " + "from the repository from working") %(repo.id,), type="warning") return True diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py index ae0ff569a..380148ec7 100644 --- a/iw/upgrade_bootloader_gui.py +++ b/iw/upgrade_bootloader_gui.py @@ -86,7 +86,7 @@ class UpgradeBootloaderWindow (InstallWindow): self.newbl_radio = gtk.RadioButton(self.update_radio, _("_Create new boot loader " "configuration")) - self.newbl_label = gtk.Label(_("This will let you create a " + self.newbl_label = gtk.Label(_("This option creates a " "new boot loader configuration. If " "you wish to switch boot loaders, you " "should choose this.")) @@ -94,7 +94,7 @@ class UpgradeBootloaderWindow (InstallWindow): self.newbl_radio.set_active(False) self.nobl_radio = gtk.RadioButton(self.update_radio, _("_Skip boot loader updating")) - self.nobl_label = gtk.Label(_("This will make no changes to boot " + self.nobl_label = gtk.Label(_("This option makes no changes to boot " "loader configuration. If you are " "using a third party boot loader, you " "should choose this.")) diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 00c31d698..c7f66c91a 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -50,9 +50,9 @@ class UpgradeMigrateFSWindow (InstallWindow): box.set_border_width (5) text = N_("This release of %s supports " - "the ext3 journalling file system. It has several " + "the ext3 journaling file system, which has several " "benefits over the ext2 file system traditionally shipped " - "in %s. It is possible to migrate the ext2 " + "in %s. This installation program can migrate the ext2 " "formatted partitions to ext3 without data loss.\n\n" "Which of these partitions would you like to migrate?" % (productName, productName)) diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index ca53464f6..c22276afe 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -86,9 +86,9 @@ class UpgradeSwapWindow (InstallWindow): box = gtk.VBox (False, 5) box.set_border_width (5) - label = gtk.Label (_("The 2.4 kernel needs significantly more " - "swap than older kernels, as much as twice " - "as much swap space as RAM on the system. " + label = gtk.Label (_("Recent kernels (2.4 or newer) need significantly more " + "swap than older kernels, up to twice " + "the amount of RAM on the system. " "You currently have %dMB of swap configured, but " "you may create additional swap space on one of " "your file systems now.") @@ -151,8 +151,8 @@ class UpgradeSwapWindow (InstallWindow): sel = self.view.get_selection() sel.select_iter(rootiter) - label = gtk.Label (_("It is recommended that your swap file be at " - "least %d MB. Please enter a size for the swap " + label = gtk.Label (_("A minimum swap file size of " + "%d MB is recommended. Please enter a size for the swap " "file:") % suggSize) label.set_size_request(400, 40) label.set_line_wrap (True) @@ -186,9 +186,9 @@ class UpgradeSwapWindow (InstallWindow): def warning(self): rc = self.intf.messageWindow(_("Warning"), - _("It is stongly recommended that you create a swap " - "file. Failure to do so could cause the installer " - "to abort abnormally. Are you sure that you wish " + _("A swap file is stongly recommended. " + "Failure to create one could cause the installer " + "to abort abnormally. Are you sure you wish " "to continue?"), type = "yesno") return rc |