[master] Change strings per stylistic advice from ECS

David Shea dshea at redhat.com
Tue Aug 5 18:41:14 UTC 2014


Searched and replaced as follows:
  bootloader -> boot loader
  filesystem -> file system
  username -> user name
  [Vv]lan -> VLAN
  hostname -> host name
  ZFCP -> zFCP
  BTRFS -> Btrfs
  can not -> cannot
  mountpoint -> mount point

Also made the capitalization in the iSCSI dialog more consistent and
changed an iSCSI discovery string from past tense to some kind of
perfect tense.
---
 pyanaconda/bootloader.py                           | 44 +++++++++---------
 pyanaconda/errors.py                               |  4 +-
 pyanaconda/exception.py                            |  2 +-
 pyanaconda/install.py                              |  2 +-
 pyanaconda/kickstart.py                            | 18 ++++----
 pyanaconda/network.py                              | 14 +++---
 pyanaconda/storage_utils.py                        |  8 ++--
 pyanaconda/ui/gui/spokes/advstorage/fcoe.glade     |  2 +-
 pyanaconda/ui/gui/spokes/advstorage/iscsi.glade    | 16 +++----
 pyanaconda/ui/gui/spokes/custom.glade              |  8 ++--
 pyanaconda/ui/gui/spokes/custom.py                 |  4 +-
 pyanaconda/ui/gui/spokes/datetime_spoke.glade      |  2 +-
 pyanaconda/ui/gui/spokes/filter.glade              |  2 +-
 pyanaconda/ui/gui/spokes/lib/cart.py               |  6 +--
 .../ui/gui/spokes/lib/custom_storage_helpers.py    | 52 +++++++++++-----------
 pyanaconda/ui/gui/spokes/lib/dasdfmt.glade         |  2 +-
 pyanaconda/ui/gui/spokes/lib/resize.glade          |  4 +-
 pyanaconda/ui/gui/spokes/lib/resize.py             | 10 ++---
 pyanaconda/ui/gui/spokes/lib/summary.glade         |  2 +-
 pyanaconda/ui/gui/spokes/network.glade             | 16 +++----
 pyanaconda/ui/gui/spokes/network.py                |  8 ++--
 pyanaconda/ui/gui/spokes/source.glade              |  6 +--
 pyanaconda/ui/gui/spokes/storage.glade             |  2 +-
 pyanaconda/ui/gui/spokes/storage.py                |  2 +-
 pyanaconda/ui/gui/spokes/user.glade                |  6 +--
 pyanaconda/ui/gui/spokes/user.py                   |  2 +-
 pyanaconda/ui/lib/space.py                         |  4 +-
 pyanaconda/ui/tui/spokes/__init__.py               |  4 +-
 pyanaconda/ui/tui/spokes/network.py                |  8 ++--
 pyanaconda/ui/tui/spokes/storage.py                |  2 +-
 30 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 509796e..fa0a310 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -244,7 +244,7 @@ class BootLoader(object):
     stage2_mountpoints = ["/boot", "/"]
     stage2_bootable = False
     stage2_must_be_primary = True
-    stage2_description = N_("/boot filesystem")
+    stage2_description = N_("/boot file system")
     stage2_max_end = Size("2 TiB")
 
     @property
@@ -781,7 +781,7 @@ class BootLoader(object):
     @update_only.setter
     def update_only(self, value):
         if value and not self.can_update:
-            raise ValueError("this bootloader does not support updates")
+            raise ValueError("this boot loader does not support updates")
         elif self.can_update:
             self._update_only = value
 
@@ -942,7 +942,7 @@ class BootLoader(object):
     def write_config(self):
         """ Write the bootloader configuration. """
         if not self.config_file:
-            raise BootLoaderError("no config file defined for this bootloader")
+            raise BootLoaderError("no config file defined for this boot loader")
 
         self.add_crash_args()
 
@@ -1307,7 +1307,7 @@ class GRUB(BootLoader):
     def install(self, args=None):
         rc = iutil.execInSysroot("grub-install", ["--just-copy"])
         if rc:
-            raise BootLoaderError("bootloader install failed")
+            raise BootLoaderError("boot loader install failed")
 
         for (stage1dev, stage2dev) in self.install_targets:
             cmd = ("root %(stage2dev)s\n"
@@ -1328,7 +1328,7 @@ class GRUB(BootLoader):
             rc = iutil.execInSysroot("grub", args, stdin=pread)
             os.close(pread)
             if rc:
-                raise BootLoaderError("bootloader install failed")
+                raise BootLoaderError("boot loader install failed")
 
     def update(self):
         self.install()
@@ -1359,14 +1359,14 @@ class GRUB(BootLoader):
                 self.stage2_device.level == raid.RAID1 and \
                 self.stage1_device.type != "mdarray":
             if not self.stage1_device.isDisk:
-                msg = _("bootloader stage2 device %(stage2dev)s is on a multi-disk array, but bootloader stage1 device %(stage1dev)s is not. " \
+                msg = _("boot loader stage2 device %(stage2dev)s is on a multi-disk array, but boot loader stage1 device %(stage1dev)s is not. " \
                         "A drive failure in %(stage2dev)s could render the system unbootable.") % \
                         {"stage1dev" : self.stage1_device.name,
                          "stage2dev" : self.stage2_device.name}
                 self.warnings.append(msg)
             elif not self.stage2_device.dependsOn(self.stage1_device):
-                msg = _("bootloader stage2 device %(stage2dev)s is on a multi-disk array, but bootloader stage1 device %(stage1dev)s is not part of this array. " \
-                        "The stage1 bootloader will only be installed to a single drive.") % \
+                msg = _("boot loader stage2 device %(stage2dev)s is on a multi-disk array, but boot loader stage1 device %(stage1dev)s is not part of this array. " \
+                        "The stage1 boot loader will only be installed to a single drive.") % \
                         {"stage1dev" : self.stage1_device.name,
                          "stage2dev" : self.stage2_device.name}
                 self.warnings.append(msg)
@@ -1390,7 +1390,7 @@ class GRUB2(GRUB):
 
         - BIOS boot partition (GPT)
             - parted /dev/sda set <partition_number> bios_grub on
-            - can't contain a filesystem
+            - can't contain a file system
             - 31KiB min, 1MiB recommended
 
     """
@@ -1524,7 +1524,7 @@ class GRUB2(GRUB):
         os.close(pread)
         self.encrypted_password = buf.split()[-1].strip()
         if not self.encrypted_password.startswith("grub.pbkdf2."):
-            raise BootLoaderError("failed to encrypt bootloader password")
+            raise BootLoaderError("failed to encrypt boot loader password")
 
     def write_password_config(self):
         if not self.password and not self.encrypted_password:
@@ -1559,7 +1559,7 @@ class GRUB2(GRUB):
         try:
             self.write_password_config()
         except (BootLoaderError, OSError, RuntimeError) as e:
-            log.error("bootloader password setup failed: %s", e)
+            log.error("boot loader password setup failed: %s", e)
 
         # make sure the default entry is the OS we are installing
         entry_title = "0"
@@ -1571,7 +1571,7 @@ class GRUB2(GRUB):
         rc = iutil.execInSysroot("grub2-mkconfig",
                                  ["-o", self.config_file])
         if rc:
-            raise BootLoaderError("failed to write bootloader configuration")
+            raise BootLoaderError("failed to write boot loader configuration")
 
     #
     # installation
@@ -1593,7 +1593,7 @@ class GRUB2(GRUB):
                                         root=iutil.getSysroot(),
                                         env_prune=['MALLOC_PERTURB_'])
             if rc:
-                raise BootLoaderError("bootloader install failed")
+                raise BootLoaderError("boot loader install failed")
 
     def write(self):
         """ Write the bootloader configuration and install the bootloader. """
@@ -1647,7 +1647,7 @@ class GRUB2(GRUB):
             start = p.geometry.start * p.disk.device.sectorSize
             if not p.getFlag(PARTITION_BIOS_GRUB) and start < min_start:
                 msg = _("%(deviceName)s may not have enough space for grub2 to embed "
-                        "core.img when using the %(fsType)s filesystem on %(deviceType)s") \
+                        "core.img when using the %(fsType)s file system on %(deviceType)s") \
                         % {"deviceName": self.stage1_device.name, "fsType": self.stage2_device.format.type,
                            "deviceType": self.stage2_device.type}
                 log.error(msg)
@@ -1778,7 +1778,7 @@ class MacEFIGRUB(EFIGRUB):
         if os.path.exists(iutil.getSysroot() + "/usr/libexec/mactel-boot-setup"):
             rc = iutil.execInSysroot("/usr/libexec/mactel-boot-setup", [])
             if rc:
-                log.error("failed to configure Mac bootloader")
+                log.error("failed to configure Mac boot loader")
 
     def install(self, args=None):
         super(MacEFIGRUB, self).install()
@@ -1927,7 +1927,7 @@ class Yaboot(YabootBase):
         args = ["-f", "-C", self.config_file]
         rc = iutil.execInSysroot(self.prog, args)
         if rc:
-            raise BootLoaderError("bootloader installation failed")
+            raise BootLoaderError("boot loader installation failed")
 
 
 class IPSeriesYaboot(Yaboot):
@@ -2280,7 +2280,7 @@ class EXTLINUX(BootLoader):
         rc = iutil.execInSysroot("extlinux", args)
 
         if rc:
-            raise BootLoaderError("bootloader install failed")
+            raise BootLoaderError("boot loader install failed")
 
 
 # every platform that wants a bootloader needs to be in this dict
@@ -2375,13 +2375,13 @@ def writeBootLoader(storage, payload, instClass, ksdata):
     """
     if not storage.bootloader.skip_bootloader:
         stage1_device = storage.bootloader.stage1_device
-        log.info("bootloader stage1 target device is %s", stage1_device.name)
+        log.info("boot loader stage1 target device is %s", stage1_device.name)
         stage2_device = storage.bootloader.stage2_device
-        log.info("bootloader stage2 target device is %s", stage2_device.name)
+        log.info("boot loader stage2 target device is %s", stage2_device.name)
 
     if isinstance(payload, RPMOSTreePayload):
         if storage.bootloader.skip_bootloader:
-            log.info("skipping bootloader install per user request")
+            log.info("skipping boot loader install per user request")
             return
         writeBootLoaderFinal(storage, payload, instClass, ksdata)
         return
@@ -2389,7 +2389,7 @@ def writeBootLoader(storage, payload, instClass, ksdata):
     # get a list of installed kernel packages
     kernel_versions = payload.kernelVersionList + payload.rescueKernelList
     if not kernel_versions:
-        log.warning("no kernel was installed -- bootloader config unchanged")
+        log.warning("no kernel was installed -- boot loader config unchanged")
         return
 
     # all the linux images' labels are based on the default image's
@@ -2412,7 +2412,7 @@ def writeBootLoader(storage, payload, instClass, ksdata):
     writeSysconfigKernel(storage, version, instClass)
 
     if storage.bootloader.skip_bootloader:
-        log.info("skipping bootloader install per user request")
+        log.info("skipping boot loader install per user request")
         return
 
     # now add an image for each of the other kernels
diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py
index e434141..ab354a6 100644
--- a/pyanaconda/errors.py
+++ b/pyanaconda/errors.py
@@ -132,7 +132,7 @@ class ErrorHandler(object):
         # FIXME: include the two types in the message instead of including
         #        the raw exception text
         message = _("There is an entry in your /etc/fstab file that contains "
-                    "an invalid or incorrect filesystem type:\n\n")
+                    "an invalid or incorrect file system type:\n\n")
         message += " " + str(exn)
         self.ui.showError(message)
 
@@ -242,7 +242,7 @@ class ErrorHandler(object):
         return ERROR_RAISE
 
     def _bootLoaderErrorHandler(self, exn):
-        message = _("The following error occurred while installing the bootloader. "
+        message = _("The following error occurred while installing the boot loader. "
                     "The system will not be bootable. "
                     "Would you like to ignore this and continue with "
                     "installation?")
diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py
index 61f6ded..fcc6c9b 100644
--- a/pyanaconda/exception.py
+++ b/pyanaconda/exception.py
@@ -132,7 +132,7 @@ class AnacondaExceptionHandler(ExceptionHandler):
                         cmdline_error_msg = _("\nThe installation was stopped due to "
                                               "incomplete spokes detected while running "
                                               "in non-interactive cmdline mode. Since there "
-                                              "can not be any questions in cmdline mode, "
+                                              "cannot be any questions in cmdline mode, "
                                               "edit your kickstart file and retry "
                                               "installation.\nThe exact error message is: "
                                               "\n\n%s.\n\nThe installer will now terminate.") % str(value)
diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index d1097df..345b67f 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -231,7 +231,7 @@ def doInstall(storage, payload, ksdata, instClass):
 
     # Do bootloader.
     if willInstallBootloader:
-        with progress_report(_("Installing bootloader")):
+        with progress_report(_("Installing boot loader")):
             writeBootLoader(storage, payload, instClass, ksdata)
 
     with progress_report(_("Performing post-installation setup tasks")):
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index fcbfa72..b038f6e 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -401,12 +401,12 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
 
             if dev and dev.format.type != "btrfs":
                 raise KickstartValueError(formatErrorMsg(self.lineno,
-                        msg=_("BTRFS partition \"%(device)s\" has a format of \"%(format)s\", but should have a format of \"btrfs\".") %
+                        msg=_("Btrfs partition \"%(device)s\" has a format of \"%(format)s\", but should have a format of \"btrfs\".") %
                              {"device": member, "format": dev.format.type}))
 
             if not dev:
                 raise KickstartValueError(formatErrorMsg(self.lineno,
-                        msg=_("Tried to use undefined partition \"%s\" in BTRFS volume specification.") % member))
+                        msg=_("Tried to use undefined partition \"%s\" in Btrfs volume specification.") % member))
 
             members.append(dev)
 
@@ -419,7 +419,7 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
 
         if len(members) == 0 and not self.preexist:
             raise KickstartValueError(formatErrorMsg(self.lineno,
-                    msg=_("BTRFS volume defined without any member devices.  Either specify member devices or use --useexisting.")))
+                    msg=_("Btrfs volume defined without any member devices.  Either specify member devices or use --useexisting.")))
 
         # allow creating btrfs vols/subvols without specifying mountpoint
         if self.mountpoint in ("none", "None"):
@@ -443,7 +443,7 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
             device = devicetree.resolveDevice(self.name)
             if not device:
                 raise KickstartValueError(formatErrorMsg(self.lineno,
-                        msg=_("BTRFS volume \"%s\" specified with --useexisting does not exist.") % self.name))
+                        msg=_("Btrfs volume \"%s\" specified with --useexisting does not exist.") % self.name))
 
             device.format.mountpoint = self.mountpoint
         else:
@@ -868,7 +868,7 @@ class LogVolData(commands.logvol.F20_LogVolData):
                         mountopts=self.fsopts)
         if not fmt.type and not self.thin_pool:
             raise KickstartValueError(formatErrorMsg(self.lineno,
-                    msg=_("The \"%s\" filesystem type is not supported.") % ty))
+                    msg=_("The \"%s\" file system type is not supported.") % ty))
 
         # If we were given a pre-existing LV to create a filesystem on, we need
         # to verify it and its VG exists and then schedule a new format action
@@ -1079,7 +1079,7 @@ class PartitionData(commands.partition.F18_PartData):
 
             if devicetree.getDeviceByName(kwargs["name"]):
                 raise KickstartValueError(formatErrorMsg(self.lineno,
-                        msg=_("BTRFS partition \"%s\" is defined multiple times.") % kwargs["name"]))
+                        msg=_("Btrfs partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             if self.onPart:
                 ksdata.onPart[kwargs["name"]] = self.onPart
@@ -1144,7 +1144,7 @@ class PartitionData(commands.partition.F18_PartData):
            size=size)
         if not kwargs["fmt"].type:
             raise KickstartValueError(formatErrorMsg(self.lineno,
-                    msg=_("The \"%s\" filesystem type is not supported.") % ty))
+                    msg=_("The \"%s\" file system type is not supported.") % ty))
 
         # If we were given a specific disk to create the partition on, verify
         # that it exists first.  If it doesn't exist, see if it exists with
@@ -1298,7 +1298,7 @@ class RaidData(commands.raid.F18_RaidData):
 
             if devicetree.getDeviceByName(kwargs["name"]):
                 raise KickstartValueError(formatErrorMsg(self.lineno,
-                        msg=_("BTRFS partition \"%s\" is defined multiple times.") % kwargs["name"]))
+                        msg=_("Btrfs partition \"%s\" is defined multiple times.") % kwargs["name"]))
 
             self.mountpoint = ""
         else:
@@ -1363,7 +1363,7 @@ class RaidData(commands.raid.F18_RaidData):
            mountopts=self.fsopts)
         if not kwargs["fmt"].type:
             raise KickstartValueError(formatErrorMsg(self.lineno,
-                    msg=_("The \"%s\" filesystem type is not supported.") % ty))
+                    msg=_("The \"%s\" file system type is not supported.") % ty))
 
         kwargs["name"] = devicename
         kwargs["level"] = self.level
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 9d589bd..9a887c2 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -100,13 +100,13 @@ def sanityCheckHostname(hostname):
     """
 
     if not hostname:
-        return (False, _("Hostname cannot be None or an empty string."))
+        return (False, _("Host name cannot be None or an empty string."))
 
     if len(hostname) > 255:
-        return (False, _("Hostname must be 255 or fewer characters in length."))
+        return (False, _("Host name must be 255 or fewer characters in length."))
 
     if not (re.match('^' + HOSTNAME_PATTERN_WITHOUT_ANCHORS + '$', hostname)):
-        return (False, _("Hostnames can only contain the characters 'a-z', "
+        return (False, _("Host names can only contain the characters 'a-z', "
                          "'A-Z', '0-9', '-', or '.', parts between periods "
                          "must contain something and cannot start or end with "
                          "'-'."))
@@ -936,7 +936,7 @@ def ks_spec_to_device_name(ksspec=""):
 
 def set_hostname(hn):
     if can_touch_runtime_system("set hostname", touch_live=True):
-        log.info("setting installation environment hostname to %s", hn)
+        log.info("setting installation environment host name to %s", hn)
         iutil.execWithRedirect("hostnamectl", ["set-hostname", hn])
 
 def write_hostname(rootpath, ksdata, overwrite=False):
@@ -1040,7 +1040,7 @@ def write_network_config(storage, ksdata, instClass, rootpath):
     autostartFCoEDevices(rootpath, storage, ksdata)
 
 def update_hostname_data(ksdata, hostname):
-    log.debug("updating hostname %s", hostname)
+    log.debug("updating host name %s", hostname)
     hostname_found = False
     for nd in ksdata.network.network:
         if nd.hostname:
@@ -1180,7 +1180,7 @@ def _get_ntp_servers_from_dhcp(ksdata):
             hostname = socket.gethostbyaddr(server_address)[0]
         except socket.error:
             # getting hostname failed, just use the address returned from DHCP
-            log.debug("getting NTP server hostname failed for address: %s",
+            log.debug("getting NTP server host name failed for address: %s",
                       server_address)
             hostname = server_address
         hostnames.append(hostname)
@@ -1303,7 +1303,7 @@ def status_message():
                 elif nm.nm_device_type_is_vlan(devname):
                     parent = nm.nm_device_setting_value(devname, "vlan", "parent")
                     vlanid = nm.nm_device_setting_value(devname, "vlan", "id")
-                    msg = _("Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected") \
+                    msg = _("VLAN %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected") \
                           % {"interface_name": devname, "parent_device": parent, "vlanid": vlanid}
             elif len(nonslaves) > 1:
                 devlist = []
diff --git a/pyanaconda/storage_utils.py b/pyanaconda/storage_utils.py
index 329976e..0c5ab56 100644
--- a/pyanaconda/storage_utils.py
+++ b/pyanaconda/storage_utils.py
@@ -51,7 +51,7 @@ DEVICE_TEXT_LVM = N_("LVM")
 DEVICE_TEXT_LVM_THINP = N_("LVM Thin Provisioning")
 DEVICE_TEXT_MD = N_("RAID")
 DEVICE_TEXT_PARTITION = N_("Standard Partition")
-DEVICE_TEXT_BTRFS = N_("BTRFS")
+DEVICE_TEXT_BTRFS = N_("Btrfs")
 DEVICE_TEXT_DISK = N_("Disk")
 
 DEVICE_TEXT_MAP = {DEVICE_TYPE_LVM: DEVICE_TEXT_LVM,
@@ -74,11 +74,11 @@ MOUNTPOINT_DESCRIPTIONS = {"Swap": N_("The 'swap' area on your computer is used
                            "BIOS Boot": N_("The BIOS boot partition is required to enable booting\n"
                                            "from GPT-partitioned disks on BIOS hardware."),
                            "PReP Boot": N_("The PReP boot partition is required as part of the\n"
-                                           "bootloader configuration on some PPC platforms.")
+                                           "boot loader configuration on some PPC platforms.")
                             }
 
 AUTOPART_CHOICES = ((N_("Standard Partition"), AUTOPART_TYPE_PLAIN),
-                    (N_("BTRFS"), AUTOPART_TYPE_BTRFS),
+                    (N_("Btrfs"), AUTOPART_TYPE_BTRFS),
                     (N_("LVM"), AUTOPART_TYPE_LVM),
                     (N_("LVM Thin Provisioning"), AUTOPART_TYPE_LVM_THINP))
 
@@ -232,7 +232,7 @@ def sanity_check(storage, min_ram=isys.MIN_RAM):
         stage1 = storage.bootloader.stage1_device
         if not stage1:
             exns.append(
-               SanityError(_("No valid bootloader target device found. "
+               SanityError(_("No valid boot loader target device found. "
                             "See below for details.")))
             pe = _platform.stage1MissingError
             if pe:
diff --git a/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade b/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
index 90221ab..cec4717 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
@@ -105,7 +105,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="autoCheckbox">
-                <property name="label" translatable="yes" context="GUI|Advanced Storage|FCoE">Use auto _vlan</property>
+                <property name="label" translatable="yes" context="GUI|Advanced Storage|FCoE">Use auto _VLAN</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
index 1fb2f08..07c24cb 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
@@ -259,7 +259,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|CHAP">CHAP _Username:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|CHAP">CHAP _User name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">chapUsernameEntry</property>
                               </object>
@@ -382,7 +382,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">CHAP _Username:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">CHAP _User name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapUsernameEntry</property>
                               </object>
@@ -410,7 +410,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">Reverse CHAP User_name:</property>
+                                <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">Reverse CHAP User _name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapReverseUsername</property>
                               </object>
@@ -646,7 +646,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label">The following nodes were discovered using the iSCSI initiator &lt;b&gt;%(initiatorName)s&lt;/b&gt; using the target IP address &lt;b&gt;%(targetAddress)s&lt;/b&gt;.  Please select which nodes you wish to log into:</property>
+                        <property name="label">The following nodes have been discovered using the iSCSI initiator &lt;b&gt;%(initiatorName)s&lt;/b&gt; using the target IP address &lt;b&gt;%(targetAddress)s&lt;/b&gt;.  Please select which nodes you wish to log into:</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
                       </object>
@@ -726,7 +726,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login">_Node login authentication type:</property>
+                            <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login">_Node Login Authentication Type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">loginAuthTypeCombo</property>
                           </object>
@@ -778,7 +778,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|CHAP">CHAP _Username:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|CHAP">CHAP _User name:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginChapUsernameEntry</property>
                                   </object>
@@ -901,7 +901,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">CHAP _Username:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">CHAP _User name:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapUsernameEntry</property>
                                   </object>
@@ -929,7 +929,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">_Reverse CHAP Username:</property>
+                                    <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">_Reverse CHAP User name:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapReverseUsername</property>
                                   </object>
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index a8004a7..9143b1d 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -24,7 +24,7 @@
         <col id="1">DEVICE_TYPE_PARTITION</col>
       </row>
       <row>
-        <col id="0" translatable="yes">BTRFS</col>
+        <col id="0" translatable="yes">Btrfs</col>
         <col id="1">DEVICE_TYPE_BTRFS</col>
       </row>
       <row>
@@ -977,7 +977,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Add a new mountpoint.</property>
+                            <property name="tooltip_text" translatable="yes">Add a new mount point.</property>
                             <property name="label" translatable="yes" context="GUI|Custom Partitioning">_Add</property>
                             <property name="use_underline">True</property>
                             <property name="icon_name">list-add-symbolic</property>
@@ -994,7 +994,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Remove the selected mountpoint(s).</property>
+                            <property name="tooltip_text" translatable="yes">Remove the selected mount point(s).</property>
                             <property name="label" translatable="yes" context="GUI|Custom Partitioning">Remo_ve</property>
                             <property name="use_underline">True</property>
                             <property name="icon_name">list-remove-symbolic</property>
@@ -1011,7 +1011,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Configure selected mountpoint.</property>
+                            <property name="tooltip_text" translatable="yes">Configure selected mount point.</property>
                             <property name="label" translatable="yes" context="GUI|Custom Partitioning">_Configure</property>
                             <property name="use_underline">True</property>
                             <property name="icon_name">preferences-system-symbolic</property>
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 659668c..3fa212e 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -630,7 +630,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         elif encrypted and new_fs_type in PARTITION_ONLY_FORMAT_TYPES:
             error = _("%s cannot be encrypted") % new_fs_type
         elif mountpoint == "/" and device.format.exists and not reformat:
-            error = _("You must create a new filesystem on the root device.")
+            error = _("You must create a new file system on the root device.")
 
         if not error and \
            (raid_level is not None or requiresRaidSelection(device_type)) and \
@@ -1415,7 +1415,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         if self._sizeEntry.get_sensitive():
             self._sizeEntry.props.has_tooltip = False
         elif device.format.type == "btrfs":
-            self._sizeEntry.set_tooltip_text(_("The space available to this mountpoint can be changed by modifying the volume below."))
+            self._sizeEntry.set_tooltip_text(_("The space available to this mount point can be changed by modifying the volume below."))
         else:
             self._sizeEntry.set_tooltip_text(_("This file system may not be resized."))
 
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
index d58e2e7..0d38bd8 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
@@ -178,7 +178,7 @@
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="hostnameColumn">
-                    <property name="title" translatable="yes">Hostname</property>
+                    <property name="title" translatable="yes">Host Name</property>
                     <property name="expand">True</property>
                     <child>
                       <object class="GtkCellRendererText" id="hostnameRenderer">
diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade
index 36bc432..16320c9 100644
--- a/pyanaconda/ui/gui/spokes/filter.glade
+++ b/pyanaconda/ui/gui/spokes/filter.glade
@@ -1431,7 +1431,7 @@
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="addZFCPButton">
-                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">_Add ZFCP LUN...</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">_Add zFCP LUN...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
index fe0499d..6c70db7 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -129,9 +129,9 @@ class SelectedDisksDialog(GUIObject):
 
         # pylint: disable=unescaped-markup
         text = P_("<b>%(count)d disk; %(size)s capacity; %(free)s free space</b> "
-                   "(unpartitioned and in filesystems)",
+                   "(unpartitioned and in file systems)",
                   "<b>%(count)d disks; %(size)s capacity; %(free)s free space</b> "
-                   "(unpartitioned and in filesystems)",
+                   "(unpartitioned and in file systems)",
                    count) % {"count" : count,
                              "size" : escape_markup(size),
                              "free" : escape_markup(free)}
@@ -187,7 +187,7 @@ class SelectedDisksDialog(GUIObject):
     def _toggle_button_text(self, row):
         if row[IS_BOOT_COL]:
             self._set_button.set_label(C_("GUI|Selected Disks Dialog",
-                "_Do not install bootloader"))
+                "_Do not install boot loader"))
         else:
             self._set_button.set_label(C_("GUI|Selected Disks Dialog",
                 "_Set as Boot Device"))
diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
index 6cb7340..6f6a1e9 100644
--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
@@ -99,9 +99,9 @@ def populate_mountpoint_store(store, used_mountpoints):
 
 def validate_label(label, fmt):
     """Returns a code indicating either that the given label can be set for
-       this filesystem or the reason why it can not.
+       this filesystem or the reason why it cannot.
 
-       In the case where the format can not assign a label, the empty string
+       In the case where the format cannot assign a label, the empty string
        stands for accept the default, but in the case where the format can
        assign a label the empty string represents itself.
 
@@ -110,14 +110,14 @@ def validate_label(label, fmt):
 
     """
     if fmt.exists:
-        return _("Can not relabel already existing filesystem.")
+        return _("Cannot relabel already existing file system.")
     if not fmt.labeling():
         if label == "":
             return ""
         else:
-            return _("Can not set label on filesystem.")
+            return _("Cannot set label on file system.")
     if not fmt.labelFormatOK(label):
-        return _("Unacceptable label format for filesystem.")
+        return _("Unacceptable label format for file system.")
     return ""
 
 def validate_mountpoint(mountpoint, used_mountpoints, strict=True):
@@ -129,7 +129,7 @@ def validate_mountpoint(mountpoint, used_mountpoints, strict=True):
     if mountpoint in used_mountpoints:
         return _("That mount point is already in use. Try something else?")
     elif not mountpoint:
-        return _("Please enter a valid mountpoint.")
+        return _("Please enter a valid mount point.")
     elif mountpoint in system_mountpoints:
         return _("That mount point is invalid. Try something else?")
     elif (lowerASCII(mountpoint) not in fake_mountpoints and
@@ -356,7 +356,7 @@ class ConfirmDeleteDialog(GUIObject):
             rootName = rootName.replace("_", "__")
         self._removeAll.set_label(
                 C_("GUI|Custom Partitioning|Confirm Delete Dialog",
-                    "Delete _all other filesystems in the %s root as well.")
+                    "Delete _all other file systems in the %s root as well.")
                 % rootName)
         self._removeAll.set_sensitive(rootName is not None)
 
@@ -670,47 +670,47 @@ class HelpDialog(GUIObject):
     def on_close(self, button):
         self.window.destroy()
 
-help_text_template = N_("""You have chosen to manually set up the filesystems for your new %(productName)s installation. Before you begin, you might want to take a minute to learn the lay of the land. Quite a bit has changed.
+help_text_template = N_("""You have chosen to manually set up the file systems for your new %(productName)s installation. Before you begin, you might want to take a minute to learn the lay of the land. Quite a bit has changed.
 
-The most important change is that creation of new filesystems has been streamlined. You no longer have to build complex devices like LVM logical volumes in stages (physical volume, then volume group, then logical volume) -- now you just create a logical volume and we'll handle the legwork of setting up the physical volumes and volume group to contain it. We'll also handle adjusting the volume group as you add, remove, and resize logical volumes so you don't have to worry about the mundane details.
+The most important change is that creation of new file systems has been streamlined. You no longer have to build complex devices like LVM logical volumes in stages (physical volume, then volume group, then logical volume) -- now you just create a logical volume and we'll handle the legwork of setting up the physical volumes and volume group to contain it. We'll also handle adjusting the volume group as you add, remove, and resize logical volumes so you don't have to worry about the mundane details.
 
 
 Screen Layout
 
-The left-hand side of the screen shows the OS installations we were able to find on this computer. The new %(productName)s installation is at the top of the list. You can click on the names of the installations to see what filesystems they contain.
+The left-hand side of the screen shows the OS installations we were able to find on this computer. The new %(productName)s installation is at the top of the list. You can click on the names of the installations to see what file systems they contain.
 
-Below the various installations and mountpoints on the left-hand side there are buttons to add a new filesystem, remove the selected filesystem, or configure the selected filesystem.
+Below the various installations and mount points on the left-hand side there are buttons to add a new file system, remove the selected file system, or configure the selected file system.
 
-The right-hand side of the screen is where you can customize the currently-selected mountpoint.
+The right-hand side of the screen is where you can customize the currently-selected mount point.
 
 On the bottom-left you will see a summary of the disks you have chosen to use for the installation. You can click on the blue text to see more detailed information about your selected disks.
 
 
-How to create a new filesystem on a new device
+How to create a new file system on a new device
 
 1. Click on the + button.
-2. Enter the mountpoint and size. (Hint: Hover the mouse pointer over either of the text entry areas for help.)
-3. Select the new mountpoint under "New %(productName)s Installation" on the left-hand side of the screen and customize it to suit your needs.
+2. Enter the mount point and size. (Hint: Hover the mouse pointer over either of the text entry areas for help.)
+3. Select the new mount point under "New %(productName)s Installation" on the left-hand side of the screen and customize it to suit your needs.
 
 
-How to reformat a device/filesystem that already exists on your disk
+How to reformat a device/file system that already exists on your disk
 
-1. Select the filesystem from the left-hand side of the screen.
-2. Click on the "Customize" expander in the mountpoint customization area on the right-hand side of the screen.
-3. Activate the "Reformat" checkbutton, select a filesystem type and, if applicable, enter a mountpoint above in the "Mountpoint" text entry area.
+1. Select the file system from the left-hand side of the screen.
+2. Click on the "Customize" expander in the mount point customization area on the right-hand side of the screen.
+3. Activate the "Reformat" checkbutton, select a file system type and, if applicable, enter a mount point above in the "Mount Point" text entry area.
 4. Click on "Apply changes"
 
 
-How to set a mountpoint for a filesystem that already exists on your disk
+How to set a mount point for a file system that already exists on your disk
 
-1. Select the filesystem from the left-hand side of the screen.
-2. Enter a mountpoint in the "Mountpoint" text entry area in the mountpoint customization area.
+1. Select the file system from the left-hand side of the screen.
+2. Enter a mount point in the "Mount Point" text entry area in the mount point customization area.
 3. Click on "Apply changes"
 
 
-How to remove a filesystem that already exists on your disk
+How to remove a file system that already exists on your disk
 
-1. Select the filesystem you wish to remove on the left-hand side of the screen.
+1. Select the file system you wish to remove on the left-hand side of the screen.
 2. Click the - button.
 
 Hint: Removing a device that already exists on your disk from the "New %(productName)s Installation" does not remove it from the disk. It only resets that device to its original state. To remove a device that already exists on your disk, you must select it from under any of the other detected installations (or "Unknown") and hit the - button.
@@ -718,13 +718,13 @@ Hint: Removing a device that already exists on your disk from the "New %(product
 
 Tips and hints
 
-You can enter sizes for new filesystems that are greater than the total available free space. The installer will come as close as possible to the size you request.
+You can enter sizes for new file systems that are greater than the total available free space. The installer will come as close as possible to the size you request.
 
 By default, new devices use any/all of your selected disks.
 
 You can change which disks a new device may be allocated from by clicking the configure button (the one with a tools graphic) while that device is selected.
 
-When adding a new mountpoint by clicking the + button, leave the size entry blank to make the new device use all available free space.
+When adding a new mount point by clicking the + button, leave the size entry blank to make the new device use all available free space.
 
 When you remove the last device from a container device like an LVM volume group, we will automatically remove that container device to make room for new devices.
 
diff --git a/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade b/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
index d5280c3..06b0edf 100644
--- a/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
+++ b/pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
-                <property name="label" translatable="yes">The following unformatted DASDs have been detected on your system. You can choose to format them now with dasdfmt or cancel to leave them unformatted. Unformatted DASDs can not be used during installation.</property>
+                <property name="label" translatable="yes">The following unformatted DASDs have been detected on your system. You can choose to format them now with dasdfmt or cancel to leave them unformatted. Unformatted DASDs cannot be used during installation.</property>
                 <property name="wrap">True</property>
                 <attributes>
                   <attribute name="font-desc" value="Cantarell 12"/>
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.glade b/pyanaconda/ui/gui/spokes/lib/resize.glade
index 147f22e..de1f800 100644
--- a/pyanaconda/ui/gui/spokes/lib/resize.glade
+++ b/pyanaconda/ui/gui/spokes/lib/resize.glade
@@ -171,7 +171,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="fsColumn">
-                        <property name="title" translatable="yes">Filesystem</property>
+                        <property name="title" translatable="yes">File System</property>
                         <child>
                           <object class="GtkCellRendererText" id="fsRenderer"/>
                           <attributes>
@@ -310,7 +310,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="margin_bottom">6</property>
-                <property name="label">&lt;b&gt;%s disks; %s reclaimable space&lt;/b&gt; (in filesystems)</property>
+                <property name="label">&lt;b&gt;%s disks; %s reclaimable space&lt;/b&gt; (in file systems)</property>
                 <property name="use_markup">True</property>
               </object>
               <packing>
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py
index 5756e62..ffcc63c 100644
--- a/pyanaconda/ui/gui/spokes/lib/resize.py
+++ b/pyanaconda/ui/gui/spokes/lib/resize.py
@@ -210,13 +210,13 @@ class ResizeDialog(GUIObject):
 
         self._update_labels(totalDisks, totalReclaimableSpace, 0)
 
-        description = _("You can remove existing filesystems you no longer need to free up space "
-                        "for this installation.  Removing a filesystem will permanently delete all "
+        description = _("You can remove existing file systems you no longer need to free up space "
+                        "for this installation.  Removing a file system will permanently delete all "
                         "of the data it contains.")
 
         if canShrinkSomething:
             description += "\n\n"
-            description += _("There is also free space available in pre-existing filesystems.  "
+            description += _("There is also free space available in pre-existing file systems.  "
                              "While it's risky and we recommend you back up your data first, you "
                              "can recover that free disk space and make it available for this "
                              "installation below.")
@@ -226,8 +226,8 @@ class ResizeDialog(GUIObject):
 
     def _update_labels(self, nDisks=None, totalReclaimable=None, selectedReclaimable=None):
         if nDisks is not None and totalReclaimable is not None:
-            text = P_("<b>%(count)s disk; %(size)s reclaimable space</b> (in filesystems)",
-                      "<b>%(count)s disks; %(size)s reclaimable space</b> (in filesystems)",
+            text = P_("<b>%(count)s disk; %(size)s reclaimable space</b> (in file systems)",
+                      "<b>%(count)s disks; %(size)s reclaimable space</b> (in file systems)",
                       nDisks) % {"count" : escape_markup(str(nDisks)),
                                  "size" : escape_markup(totalReclaimable)}
             self._reclaimable_label.set_markup(text)
diff --git a/pyanaconda/ui/gui/spokes/lib/summary.glade b/pyanaconda/ui/gui/spokes/lib/summary.glade
index e1584f6..88c3123 100644
--- a/pyanaconda/ui/gui/spokes/lib/summary.glade
+++ b/pyanaconda/ui/gui/spokes/lib/summary.glade
@@ -171,7 +171,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="mountpointColumn">
-                        <property name="title" translatable="yes">Mountpoint</property>
+                        <property name="title" translatable="yes">Mount point</property>
                         <child>
                           <object class="GtkCellRendererText" id="mountpointRenderer"/>
                           <attributes>
diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade
index 16a9220..edbfe08 100644
--- a/pyanaconda/ui/gui/spokes/network.glade
+++ b/pyanaconda/ui/gui/spokes/network.glade
@@ -20,7 +20,7 @@
         <col id="1">team</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Vlan</col>
+        <col id="0" translatable="yes">VLAN</col>
         <col id="1">vlan</col>
       </row>
     </data>
@@ -158,7 +158,7 @@
   </object>
   <object class="AnacondaSpokeWindow" id="networkWindow">
     <property name="can_focus">False</property>
-    <property name="window_name" translatable="yes">NETWORK &amp; HOSTNAME</property>
+    <property name="window_name" translatable="yes">NETWORK &amp; HOST NAME</property>
     <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
     <child internal-child="main_box">
       <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
@@ -197,7 +197,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Please use the live desktop environment's tools for customizing your network configuration.  You can set the hostname here.</property>
+                    <property name="label" translatable="yes">Please use the live desktop environment's tools for customizing your network configuration.  You can set the host name here.</property>
                     <property name="ellipsize">start</property>
                   </object>
                   <packing>
@@ -617,7 +617,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Vlan ID</property>
+                                            <property name="label" translatable="yes">VLAN ID</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -1623,7 +1623,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Username</property>
+                                            <property name="label" translatable="yes">User Name</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -2215,7 +2215,7 @@
                           <object class="GtkLabel" id="label_hostname">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="GUI|Network">_Hostname:</property>
+                            <property name="label" translatable="yes" context="GUI|Network">_Host Name:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">entry_hostname</property>
                           </object>
@@ -2233,7 +2233,7 @@
                             <property name="width_chars">35</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="entry_hostname-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Hostname</property>
+                                <property name="AtkObject::accessible-name" translatable="yes">Host Name</property>
                               </object>
                             </child>
                           </object>
@@ -2270,7 +2270,7 @@
     </child>
     <child internal-child="accessible">
       <object class="AtkObject" id="networkWindow-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">NETWORK &amp; HOSTNAME</property>
+        <property name="AtkObject::accessible-name" translatable="yes">NETWORK &amp; HOST NAME</property>
       </object>
     </child>
   </object>
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 49cd897..0c6cce5 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -298,7 +298,7 @@ class NetworkControlBox(GObject.GObject):
         NetworkManager.DeviceType.ETHERNET: N_("Ethernet"),
         NetworkManager.DeviceType.WIFI: N_("Wireless"),
         NetworkManager.DeviceType.BOND: N_("Bond"),
-        NetworkManager.DeviceType.VLAN: N_("Vlan"),
+        NetworkManager.DeviceType.VLAN: N_("VLAN"),
         NetworkManager.DeviceType.TEAM: N_("Team"),
     }
 
@@ -1297,7 +1297,7 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalSpoke):
     mainWidgetName = "networkWindow"
     uiFile = "spokes/network.glade"
 
-    title = CN_("GUI|Spoke", "_NETWORK & HOSTNAME")
+    title = CN_("GUI|Spoke", "_NETWORK & HOST NAME")
     icon = "network-transmit-receive-symbolic"
 
     category = SystemCategory
@@ -1377,7 +1377,7 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalSpoke):
         (valid, error) = network.sanityCheckHostname(hostname)
         if not valid:
             self.clear_info()
-            msg = _("Hostname is not valid: %s") % error
+            msg = _("Host name is not valid: %s") % error
             self.set_warning(msg)
             self.network_control_box.entry_hostname.grab_focus()
             self.window.show_all()
@@ -1451,7 +1451,7 @@ class NetworkStandaloneSpoke(StandaloneSpoke):
         (valid, error) = network.sanityCheckHostname(hostname)
         if not valid:
             self.clear_info()
-            msg = _("Hostname is not valid: %s") % error
+            msg = _("Host name is not valid: %s") % error
             self.set_warning(msg)
             self.network_control_box.entry_hostname.grab_focus()
             self.window.show_all()
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade
index 966c378..248cff6 100644
--- a/pyanaconda/ui/gui/spokes/source.glade
+++ b/pyanaconda/ui/gui/spokes/source.glade
@@ -375,7 +375,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">User_name</property>
+                        <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">User _name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">proxyUsernameEntry</property>
                         <attributes>
@@ -1101,8 +1101,8 @@
                           <object class="GtkEntry" id="repoProxyUsernameEntry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_markup" translatable="yes">Optional proxy username.</property>
-                            <property name="tooltip_text" translatable="yes">Optional proxy username.</property>
+                            <property name="tooltip_markup" translatable="yes">Optional proxy user name.</property>
+                            <property name="tooltip_text" translatable="yes">Optional proxy user name.</property>
                             <property name="invisible_char">●</property>
                             <signal name="changed" handler="on_repoProxy_changed" swapped="no"/>
                           </object>
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index 6074750..37dfa44 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -987,7 +987,7 @@
                               <object class="GtkLabel" id="label5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="GUI|Storage">_Full disk summary and bootloader...</property>
+                                <property name="label" translatable="yes" context="GUI|Storage">_Full disk summary and boot loader...</property>
                                 <property name="use_underline">True</property>
                                 <attributes>
                                   <attribute name="underline" value="True"/>
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 479537b..33e15b3 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -676,7 +676,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         self.data.bootloader.seen = True
 
         if self.data.bootloader.location == "none":
-            self.set_warning(_("You have chosen to skip bootloader installation.  Your system may not be bootable."))
+            self.set_warning(_("You have chosen to skip boot loader installation.  Your system may not be bootable."))
             self.window.show_all()
         else:
             self.clear_info()
diff --git a/pyanaconda/ui/gui/spokes/user.glade b/pyanaconda/ui/gui/spokes/user.glade
index cecbdd1..3a19de8 100644
--- a/pyanaconda/ui/gui/spokes/user.glade
+++ b/pyanaconda/ui/gui/spokes/user.glade
@@ -77,7 +77,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes" context="GUI|User">_Username</property>
+                        <property name="label" translatable="yes" context="GUI|User">_User name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">t_username</property>
                         <attributes>
@@ -115,7 +115,7 @@
                         <signal name="changed" handler="username_changed" swapped="no"/>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="t_username-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Username</property>
+                            <property name="AtkObject::accessible-name" translatable="yes">User Name</property>
                           </object>
                         </child>
                       </object>
@@ -200,7 +200,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Tip:&lt;/b&gt; Keep your username shorter than 32 characters and do not use spaces.</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Tip:&lt;/b&gt; Keep your user name shorter than 32 characters and do not use spaces.</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
index 91a4da4..75c200b 100644
--- a/pyanaconda/ui/gui/spokes/user.py
+++ b/pyanaconda/ui/gui/spokes/user.py
@@ -310,7 +310,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
 
         # Allow empty usernames so the spoke can be exited without creating a user
         self.add_re_check(self.username, re.compile(USERNAME_VALID.pattern + r'|^$'),
-                _("Invalid username"))
+                _("Invalid user name"))
 
         self.add_re_check(self.fullname, GECOS_VALID, _("Full name cannot contain colon characters"))
 
diff --git a/pyanaconda/ui/lib/space.py b/pyanaconda/ui/lib/space.py
index 0622dbd..3251ba6 100644
--- a/pyanaconda/ui/lib/space.py
+++ b/pyanaconda/ui/lib/space.py
@@ -29,12 +29,12 @@ log = logging.getLogger("anaconda")
 
 class FileSystemSpaceChecker(object):
     """This object provides for a way to verify that enough space is available
-       on configured filesystems to support the current software selections.
+       on configured file systems to support the current software selections.
        It is run as part of completeness checking every time a spoke changes,
        therefore moving this step up out of both the storage and software
        spokes.
     """
-    error_template = N_("Not enough space in filesystems for the current "
+    error_template = N_("Not enough space in file systems for the current "
                         "software selection. An additional %s is needed.")
 
     def __init__(self, storage, payload):
diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py
index dd27350..1f5bb12 100644
--- a/pyanaconda/ui/tui/spokes/__init__.py
+++ b/pyanaconda/ui/tui/spokes/__init__.py
@@ -163,8 +163,8 @@ class EditTUIDialog(NormalTUISpoke):
             self.close()
             return True
         else:
-            print(_("You have provided an invalid username: %s\n"
-                    "Tip: Keep your username shorter than 32 characters and do not use spaces.\n") % key)
+            print(_("You have provided an invalid user name: %s\n"
+                    "Tip: Keep your user name shorter than 32 characters and do not use spaces.\n") % key)
             return NormalTUISpoke.input(self, entry, key)
 
 class OneShotEditTUIDialog(EditTUIDialog):
diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py
index 9bd47b9..6c71dee 100644
--- a/pyanaconda/ui/tui/spokes/network.py
+++ b/pyanaconda/ui/tui/spokes/network.py
@@ -137,7 +137,7 @@ class NetworkSpoke(EditTUISpoke):
 
         summary = self._summary_text()
         self._window += [TextWidget(summary), ""]
-        hostname = _("Hostname: %s\n") % self.data.network.hostname
+        hostname = _("Host Name: %s\n") % self.data.network.hostname
         self._window += [TextWidget(hostname), ""]
 
         # if we have any errors, display them
@@ -149,7 +149,7 @@ class NetworkSpoke(EditTUISpoke):
             number = TextWidget("%2d)" % (i + 1))
             return ColumnWidget([(4, [number]), (None, [w])], 1)
 
-        _opts = [_("Set hostname")]
+        _opts = [_("Set host name")]
         for devname in self.supported_devices:
             _opts.append(_("Configure device %s") % devname)
         text = [TextWidget(o) for o in _opts]
@@ -170,7 +170,7 @@ class NetworkSpoke(EditTUISpoke):
 
         if num == 1:
             # set hostname
-            self.app.switch_screen_modal(self.hostname_dialog, Entry(_("Hostname"),
+            self.app.switch_screen_modal(self.hostname_dialog, Entry(_("Host Name"),
                                 "hostname", re.compile(".*$"), True))
             self.apply()
             return INPUT_PROCESSED
@@ -231,7 +231,7 @@ class NetworkSpoke(EditTUISpoke):
         if valid:
             hostname = self.hostname_dialog.value
         else:
-            self.errors.append(_("Hostname is not valid: %s") % error)
+            self.errors.append(_("Host name is not valid: %s") % error)
             self.hostname_dialog.value = hostname
         network.update_hostname_data(self.data, hostname)
 
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index e86f0bb..cfe323f 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -302,7 +302,7 @@ class StorageSpoke(NormalTUISpoke):
         # ask user to verify they want to format if zerombr not in ks file
         if not self.data.zerombr.zerombr:
             # prepare our msg strings; copied directly from dasdfmt.glade
-            summary = _("The following unformatted DASDs have been detected on your system. You can choose to format them now with dasdfmt or cancel to leave them unformatted. Unformatted DASDs can not be used during installation.\n\n")
+            summary = _("The following unformatted DASDs have been detected on your system. You can choose to format them now with dasdfmt or cancel to leave them unformatted. Unformatted DASDs cannot be used during installation.\n\n")
 
             warntext = _("Warning: All storage changes made using the installer will be lost when you choose to format.\n\nProceed to run dasdfmt?\n")
 
-- 
2.0.0



More information about the anaconda-patches mailing list